Changeset 193 in dev for trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

Timestamp:

Jun 26, 2007, 5:04:50 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/VariableOpe.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -2 +2 @@
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
+#include <Compiler.h>
 #include <LexicalScopingImpl.h>
+#include <VariableImpl.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -215 +217 @@
         if(lpIndex==-1) lstrcpy(name,"VoidPtr");
         else{
-            if( Smoothie::GetMeta().GetProcPointers()[lpIndex]->ReturnType().IsNull() )
+            if( compiler.GetMeta().GetProcPointers()[lpIndex]->ReturnType().IsNull() )
                 lstrcpy(name,"*Sub");
             else lstrcpy(name,"*Function");
@@ -230 +232 @@
 
 Type GetStringTypeInfo(){
-    Type type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() );
+    Type type( DEF_OBJECT, *compiler.GetMeta().GetClasses().GetStringClassPtr() );
     return type;
 }
@@ -567 +569 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    Smoothie::GetMeta().namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+    compiler.GetMeta().GetNamespaces().SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -660 +662 @@
         }
 
-        int typeDefIndex = Smoothie::GetMeta().typeDefs.GetIndex( VarName );
+        int typeDefIndex = compiler.GetMeta().GetTypeDefs().GetIndex( VarName );
         if( typeDefIndex != -1 ){
             // TypeDef後の型名だったとき
-            lstrcpy( VarName, Smoothie::GetMeta().typeDefs[typeDefIndex].GetBaseName().c_str() );
+            lstrcpy( VarName, compiler.GetMeta().GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
         }
 
@@ -870 +872 @@
         }
 
-        if( !Type::StringToType( temporary, type ) ){
+        if( !Compiler::StringToType( temporary, type ) ){
             SetError(3,temporary,cp);
             type.SetBasicType( DEF_LONG );
@@ -974 +976 @@
     bool isConst = ( dwFlag & DIMFLAG_CONST ) ? true:false;
 
-    Variable *pVar = new Variable( Smoothie::Temp::liveingNamespaceScopes, name, type, isConst );
+    Variable *pVar = new VariableImpl( Smoothie::Temp::liveingNamespaceScopes, name, type, isConst );
 
     if( SubScripts[0] != -1 ){