Changeset 100 in dev for BasicCompiler_Common/Procedure.h

Timestamp:

Apr 24, 2007, 3:17:29 AM (17 years ago)

Author:

dai_9181

Message:

名前空間機能をグローバル関数に適用。

File:

• BasicCompiler_Common/Procedure.h (modified) (8 diffs)

BasicCompiler_Common/Procedure.h

@@ -1 +1 @@
 #pragma once
+
+#include <Namespace.h>
+#include "Parameter.h"
+#include "Variable.h"
+
+class CClass;
+class CMethod;
 
 class Procedure{
@@ -10 +17 @@
 
 private:
-    const string name;
+    const string name;                      // プロシージャ名
 
     Kind kind;
@@ -109 +116 @@
 
 public:
-    // ハッシュリスト用
-    UserProc *pNextData;
 
     UserProc( const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport ):
@@ -121 +126 @@
       isAutoGeneration( false ),
       isCompiled( false ),
-      pNextData( NULL ),
       beginOpAddress( 0 ),
       endOpAddress( 0 )
@@ -132 +136 @@
     }
 
-    string GetFullName() const
-    {
-        if( HasParentClass() ){
-            return (string)GetParentClass().name + "." + GetName();
-        }
-
-        return GetName();
-    }
+    string GetFullName() const;
 
     bool IsMacro() const
@@ -214 +211 @@
         return ( GetName()[0] == '~' );
     }
-    bool IsVirtual() const
-    {
-        if( pMethod == NULL ){
-            return false;
-        }
-        return ( pMethod->bVirtual != 0 );
-    }
-
+    bool IsVirtual() const;
 
     // バイナリコードの位置
@@ -259 +249 @@
         return *pCompilingUserProc;
     }
+
+    virtual bool EqualName( const string &name ) const;
+};
+
+class GlobalProc : public UserProc
+{
+    const NamespaceScopes namespaceScopes;
+public:
+    // ハッシュリスト用
+    GlobalProc *pNextData;
+
+    GlobalProc( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport ):
+      UserProc( name, kind, isMacro, isCdecl, isExport ),
+      namespaceScopes( namespaceScopes ),
+      pNextData( NULL )
+    {}
+    ~GlobalProc(){}
+
+    GlobalProc *Create( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine );
+    bool AddGlobalProc( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine );
+
+    const NamespaceScopes &GetNamespaceScopes() const
+    {
+        return namespaceScopes;
+    }
+
+    virtual bool EqualName( const string &name ) const;
 };
 
 class DllProc : public Procedure
 {
+    const NamespaceScopes namespaceScopes;
+
     const string dllFileName;
     const string alias;
@@ -271 +290 @@
     DllProc *pNextData;
 
-    DllProc( const string &name, Kind kind, bool isCdecl, const string &dllFileName, const string &alias ):
+    DllProc( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl, const string &dllFileName, const string &alias ):
       Procedure( name, kind, isCdecl ),
+      namespaceScopes( namespaceScopes ),
       dllFileName( dllFileName ),
       alias( alias ),