Changeset 637 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src

Timestamp:

Jun 11, 2008, 10:10:26 PM (16 years ago)

Author:

dai_9181

Message:

リンカの依存関係解決モジュールを製作中

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/src

Files:

• Compiler.cpp (modified) (1 diff)
• LexicalAnalyzer_Class.cpp (modified) (3 diffs)
• LexicalAnalyzer_Const.cpp (modified) (3 diffs)
• LexicalAnalyzer_Delegate.cpp (modified) (2 diffs)
• LexicalAnalyzer_Procedure.cpp (modified) (4 diffs)
• LexicalAnalyzer_TypeDef.cpp (modified) (2 diffs)
• ProcedureGenerator.cpp (modified) (1 diff)

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

@@ -50 +50 @@
 
         // メタ情報
-        this->GetObjectModule().StaticLink( *pStaticLibrary );
+        this->GetObjectModule().StaticLink( *pStaticLibrary, this->IsSll() );
     }
 }

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

@@ -117 +117 @@
 
             //クラスを追加
-            CClass *pClass = new CClass( namespaceScopes, importedNamespaces, temporary );
+            CClass *pClass = new CClass( Symbol( namespaceScopes, temporary ), importedNamespaces );
             if( classes.IsExist( pClass ) )
             {
@@ -575 +575 @@
         //関数ハッシュへ登録
         UserProc *pUserProc = new UserProc(
-            NamespaceScopes(),
+            Symbol( NamespaceScopes(), methodName ),
             NamespaceScopesCollection(),
-            methodName,
             Procedure::Function,
             false,
@@ -1434 +1433 @@
     // クラスをコピー
     CClass *pNewClass = new CClass(
-        _class.GetNamespaceScopes(),
+        _class,
         _class.GetImportedNamespaces(),
-        _class.GetName(),
         _class.GetClassType(),
         _class.GetFormalGenericTypes(),

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

@@ -74 +74 @@
 
         //定数を追加
-        consts.Add( namespaceScopes, temporary, NextValue);
+        consts.Add( Symbol( namespaceScopes, temporary ), NextValue);
     }
 }
@@ -178 +178 @@
                     if( StaticCalculation(false, expression, 0, &i64data, resultType) )
                     {
-                        consts.Add( namespaceScopes, name, i64data, resultType );
+                        consts.Add( Symbol( namespaceScopes, name ), i64data, resultType );
                     }
                 }
@@ -185 +185 @@
                     // 定数マクロ
                     const char *params = temporary + i2;
-                    if( !constMacros.Add( namespaceScopes, name, params ) )
+                    if( !constMacros.Add( Symbol( namespaceScopes, name ), params ) )
                     {
                         compiler.errorMessenger.Output( 1, NULL, i );

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

@@ -115 +115 @@
             }
 
-            delegates.Put( new Delegate( namespaceScopes, importedNamespaces, name, procKind, paramStr, returnTypeName, nowLine ) );
+            delegates.Put( new Delegate( Symbol( namespaceScopes, name ), importedNamespaces, procKind, paramStr, returnTypeName, nowLine ) );
         }
     }
@@ -131 +131 @@
         const Delegate &dg = *delegates.Iterator_GetNext();
 
-        if( !dg.isTargetObjectModule )
+        if( dg.IsExternal() )
         {
             // 静的リンクライブラリの場合は飛ばす（既にインスタンスが定義済みであるため）

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

@@ -156 +156 @@
 
     //ソースコードの位置
-    userProc.SetSourceCodePosition( SourceCodePosition( compiler.GetObjectModule().GetName(), nowLine ) );
+    userProc.SetSourceCodePosition( SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), nowLine ) );
 
     //パラメータ
@@ -286 +286 @@
 
     //ソースコードの位置
-    pProc->SetSourceCodePosition( SourceCodePosition( compiler.GetObjectModule().GetName(), nowLine ) );
+    pProc->SetSourceCodePosition( SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), nowLine ) );
 
     //パラメータ
@@ -615 +615 @@
     }
 
-    UserProc *pUserProc = new UserProc( namespaceScopes, importedNamespaces, temporary, kind, isMacro, isCdecl, isExport );
+    UserProc *pUserProc = new UserProc( Symbol( namespaceScopes, temporary ), importedNamespaces, kind, isMacro, isCdecl, isExport );
     pUserProc->SetParentClass( pobj_c );
 
@@ -737 +737 @@
 
     // オブジェクトを生成
-    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
+    DllProc *pDllProc = new DllProc( Symbol( namespaceScopes, procName ), kind, isCdecl, dllFileName, alias );
 
     // パラメータを解析

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

@@ -75 +75 @@
     typeDefs.push_back(
         TypeDef(
-            namespaceScopes,
-            temporary,
+            Symbol( namespaceScopes, temporary ),
             pTemp,
             baseType
@@ -176 +175 @@
                 typeDefs.push_back(
                     TypeDef(
-                        namespaceScopes,
-                        temporary,
+                        Symbol( namespaceScopes, temporary ),
                         "Long",
                         baseType

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

@@ -21 +21 @@
     while(classes.Iterator_HasNext()){
         CClass &objClass = *classes.Iterator_GetNext();
-        if( objClass.isTargetObjectModule == false )
+        if( objClass.IsExternal() )
         {
             // 静的リンクライブラリの場合は飛ばす（既にインスタンスが定義済みであるため）