Changeset 543 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Const.cpp

Timestamp:

May 4, 2008, 2:00:36 AM (16 years ago)

Author:

dai_9181

Message:

・GetConstInfo関数を廃止し、LexicalAnalyzer::CollectConstsメソッドを追加。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Const.cpp (modified) (1 diff)

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

@@ -11 +11 @@
 }
 
-void AddConst( const NamespaceScopes &namespaceScopes, char *buffer ){
-    int i;
-
-    //名前を取得
-    char name[VN_SIZE];
-    for(i=0;;i++){
-        if(buffer[i]=='\0'){
-            compiler.errorMessenger.Output(10,"Const",cp);
-            return;
-        }
-        if(buffer[i]=='='||buffer[i]=='('){
-            name[i]=0;
-            break;
-        }
-        name[i]=buffer[i];
-    }
-
-    //重複チェック
-    if( compiler.GetObjectModule().meta.GetGlobalConstMacros().IsExist( name )
-        || compiler.GetObjectModule().meta.GetGlobalConsts().IsExist( name ) )
-    {
-        compiler.errorMessenger.Output(15,name,cp);
-        return;
-    }
-
-    if(buffer[i] == '('){
-        //定数マクロ
-
-        compiler.GetObjectModule().meta.GetGlobalConstMacros().Add( namespaceScopes, name, buffer + i );
-    }
-    else{
-        //一般の定数
-        char *expression = buffer + i + 1;
-
-        compiler.GetObjectModule().meta.GetGlobalConsts().Add( namespaceScopes, name, expression );
-    }
-}
-
-void Consts::Add( const NamespaceScopes &namespaceScopes, const std::string &name , char *Expression)
+void Consts::Add( const NamespaceScopes &namespaceScopes, const std::string &name , const char *Expression)
 {
     _int64 i64data;