Changeset 580 in dev for trunk/ab5.0/abdev

Timestamp:

May 8, 2008, 3:36:08 PM (17 years ago)

Author:

dai_9181

Message:

VariableクラスのLexicalAnalyzerクラスへの依存性をなくした。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/include/Variable.h (modified) (1 diff)
• BasicCompiler_Common/src/Variable.cpp (modified) (1 diff)
• compiler_x86/Compile_ProcOp.cpp (modified) (1 diff)
• compiler_x86/Compile_Var.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Variable.h

@@ -52 +52 @@
 
 public:
-    Variable( const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
+    Variable( const Symbol &symbol, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
     Variable( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
     Variable( const Variable &var );

trunk/ab5.0/abdev/BasicCompiler_Common/src/Variable.cpp

@@ -4 +4 @@
 #include <Variable.h>
 
-Variable::Variable( const std::string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
-    : Symbol( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( name ) )
+Variable::Variable( const Symbol &symbol, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
+    : Symbol( symbol )
     , type( type )
     , isConst( isConst )

trunk/ab5.0/abdev/compiler_x86/Compile_ProcOp.cpp

@@ -352 +352 @@
         Parameter &param = *pUserProc->RealParams()[i3];
 
-        Variable *pVar = new Variable( param.GetVarName(), param, false, param.IsRef(), "", false );
+        Variable *pVar = new Variable(
+            ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( param.GetVarName().c_str() ),
+            param,
+            false,
+            param.IsRef(),
+            "",
+            false
+        );
 
         if( param.IsArray() ){

trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp

@@ -1118 +1118 @@
         bool isConst = ( dwFlags & DIMFLAG_CONST ) ? true:false;
 
-        Variable *pVar = new Variable( VarName, type, isConst, false, ConstractParameter, false );
+        Variable *pVar = new Variable(
+            ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( VarName ),
+            type,
+            isConst,
+            false,
+            ConstractParameter,
+            false
+        );
 
         if( subscripts.size() > 0 ){