Changeset 181 in dev for trunk/jenga/include/smoothie/Procedure.h

Timestamp:

Jun 24, 2007, 2:05:40 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/jenga/include/smoothie/Procedure.h (modified) (7 diffs)

trunk/jenga/include/smoothie/Procedure.h

@@ -94 +94 @@
     string _paramStr;
 
-private:
+protected:
     bool isMacro;
 
@@ -113 +113 @@
 
 public:
+
+    void Serialize( bool isRead )
+    {
+
+    }
 
     UserProc( const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport ):
@@ -127 +132 @@
     {
     }
-    ~UserProc();
+    ~UserProc()
+    {
+        BOOST_FOREACH( Parameter *pParam, realParams ){
+            delete pParam;
+        }
+    }
 
     string GetFullName() const;
@@ -136 +146 @@
     }
 
-    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic );
+    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic ) = 0;
 
     int GetSecondParmNum() const
@@ -246 +256 @@
         return *pCompilingUserProc;
     }
-};
-
-class GlobalProc : public UserProc
-{
-    const NamespaceScopes namespaceScopes;
-    const NamespaceScopesCollection importedNamespaces;
-public:
-    // ハッシュリスト用
-    GlobalProc *pNextData;
-
-    GlobalProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport ):
-      UserProc( name, kind, isMacro, isCdecl, isExport ),
-      namespaceScopes( namespaceScopes ),
-      importedNamespaces( importedNamespaces ),
-      pNextData( NULL )
-    {}
-    ~GlobalProc(){}
-/*
-    GlobalProc *Create( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine );
-    bool AddGlobalProc( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine );
-*/
-    virtual const NamespaceScopes &GetNamespaceScopes() const;
-    virtual const NamespaceScopesCollection &GetImportedNamespaces() const
-    {
-        return importedNamespaces;
-    }
-
-    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    virtual bool IsEqualSymbol( const GlobalProc &globalProc ) const;
-    virtual bool IsEqualSymbol( const string &name ) const;
 };
 
@@ -309 +289 @@
     }
 
-    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
+    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine ) = 0;
 
     const string &GetDllFileName() const
@@ -339 +319 @@
     ~ProcPointer(){}
 
-    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
-};
+    virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine ) = 0;
+};
+class ProcPointers : public vector<ProcPointer *>
+{
+public:
+    ProcPointers()
+    {
+    }
+    ~ProcPointers()
+    {
+    }
+
+    virtual int Add( const string &typeExpression ) = 0;
+};