Changeset 543 in dev for trunk

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• BasicCompiler_Common/include/Const.h (modified) (2 diffs)
• BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (1 diff)
• BasicCompiler_Common/src/Const.cpp (modified) (1 diff)
• BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp (added)
• compiler_x86/MakePeHdr.cpp (modified) (1 diff)
• compiler_x86/compiler_x86.vcproj (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -5 +5 @@
 #include "../BasicCompiler_Common/common.h"
 
-
-void AddConstEnum( const NamespaceScopes &namespaceScopes, char *buffer){
-    extern int cp;
-    int i=0,i2;
-
-    if(!(buffer[i]==1&&buffer[i+1]==ESC_ENUM)) return;
-    i+=2;
-
-    //列挙体の名前を取得
-    char temporary[VN_SIZE];
-    for(i2=0;;i++,i2++){
-        if(IsCommandDelimitation(buffer[i])){
-            temporary[i2]=0;
-            break;
-        }
-        if(!IsVariableChar(buffer[i])){
-            compiler.errorMessenger.Output(1,NULL,i);
-            break;
-        }
-        temporary[i2]=buffer[i];
-    }
-
-    if(buffer[i]=='\0'){
-        compiler.errorMessenger.Output(22,"Enum",cp);
-        return;
-    }
-
-    int NextValue=0;
-    while(1){
-        i++;
-
-        if(buffer[i]==1&&buffer[i+1]==ESC_ENDENUM) break;
-
-        for(i2=0;;i2++,i++){
-            if(IsCommandDelimitation(buffer[i])){
-                temporary[i2]=0;
-                break;
-            }
-            if(buffer[i]=='='){
-                temporary[i2]=0;
-                break;
-            }
-            temporary[i2]=buffer[i];
-        }
-        if(temporary[0]=='\0'){
-            if(buffer[i]=='\0'){
-                compiler.errorMessenger.Output(22,"Enum",cp);
-                break;
-            }
-            continue;
-        }
-
-        if(buffer[i]!='='){
-            NextValue++;
-        }
-        else{
-            char temp2[VN_SIZE];
-            for(i++,i2=0;;i2++,i++){
-                if(IsCommandDelimitation(buffer[i])){
-                    temp2[i2]=0;
-                    break;
-                }
-                temp2[i2]=buffer[i];
-            }
-
-            _int64 i64data;
-            StaticCalculation(true, temp2,DEF_LONG,&i64data,Type());
-            NextValue=(int)i64data;
-        }
-
-        //定数を追加
-        compiler.GetObjectModule().meta.GetGlobalConsts().Add( namespaceScopes, temporary, NextValue);
-    }
-}
-bool GetConstInfo(void){
-    ////////////////////////////////////////////
-    // Const命令の情報を取得
-    ////////////////////////////////////////////
-
-    int i2;
-    char temporary[1024];
-
-    // 名前空間管理
-    NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
-    namespaceScopes.clear();
-
-    extern char *basbuf;
-    for(int i=0;;i++){
-        if( basbuf[i] == '\0' ) break;
-
-        if( basbuf[i] == 1 && basbuf[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( basbuf[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=basbuf[i];
-            }
-            namespaceScopes.push_back( temporary );
-
-            continue;
-        }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENDNAMESPACE ){
-            if( namespaceScopes.size() <= 0 ){
-                compiler.errorMessenger.Output(12, "End Namespace", i );
-            }
-            else{
-                namespaceScopes.pop_back();
-            }
-
-            i += 2;
-            continue;
-        }
-
-        if( basbuf[i] == 1 ){
-            if(basbuf[i]==1&&basbuf[i+1]==ESC_CONST){
-                i+=2;
-
-                extern int cp;
-                cp=i;   //エラー用
-
-
-                if(basbuf[i]==1&&basbuf[i+1]==ESC_ENUM){
-                    AddConstEnum( namespaceScopes, basbuf+i);
-                    continue;
-                }
-
-                for(i2=0;;i++,i2++){
-                    if(basbuf[i]=='\"'){
-                        temporary[i2]=basbuf[i];
-                        for(i++,i2++;;i++,i2++){
-                            temporary[i2]=basbuf[i];
-                            if(basbuf[i]=='\"') break;
-                        }
-                        continue;
-                    }
-                    if(IsCommandDelimitation(basbuf[i])){
-                        temporary[i2]=0;
-                        break;
-                    }
-                    temporary[i2]=basbuf[i];
-                }
-                AddConst( namespaceScopes, temporary);
-                if(basbuf[i]=='\0') break;
-            }
-            else{
-                int result = JumpStatement( basbuf, i );
-                if( result == -1 ){
-                    //エラー
-                    return false;
-                }
-                else if( result == 1 ){
-                    //ジャンプした場合
-                    i--;
-                }
-            }
-        }
-    }
-
-    // イテレータを初期化
-    compiler.GetObjectModule().meta.GetGlobalConsts().Iterator_Init();
-    compiler.GetObjectModule().meta.GetGlobalConstMacros().Iterator_Init();
-
-    return true;
-}
 
 char ConstructorDestructorSchedule[MAX_PATH];

trunk/ab5.0/abdev/BasicCompiler_Common/common.h

@@ -290 +290 @@
 
 //Intermediate_Step2.cpp
-bool GetConstInfo(void);
 void ChangeCommandToCode(char *buffer);
 

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

@@ -1 +1 @@
 #pragma once
-
-void AddConst( const NamespaceScopes &namespaceScopes, char *buffer );
 
 //定数
@@ -71 +69 @@
 public:
 
-    void Add( const NamespaceScopes &namespaceScopes, char *buffer);
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, char *Expression);
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *Expression);
     void Add( const NamespaceScopes &namespaceScopes, const std::string &name, int value);
 

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

@@ -34 +34 @@
     static void CollectTypeDefs( const char *source, TypeDefCollection &typeDefs );
 
+    // 定数を収集する
+    static void AddConstEnum( Consts &consts, const NamespaceScopes &namespaceScopes, const char *buffer );
+    static void CollectConsts( const char *source, Consts &consts, ConstMacros &constMacros );
+
     // クラスを収集する
     static void AddMethod(CClass *pobj_c, UserProc *pUserProc, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,

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;

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

@@ -190 +190 @@
 
     //定数情報を取得
-    GetConstInfo();
+    ActiveBasic::Compiler::LexicalAnalyzer::CollectConsts(
+        compiler.GetObjectModule().GetCurrentSource().GetBuffer(),
+        compiler.GetObjectModule().meta.GetGlobalConsts(),
+        compiler.GetObjectModule().meta.GetGlobalConstMacros()
+    );
 
     // サブルーチン（ユーザー定義、DLL関数）の識別子、アドレスを取得

trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj

@@ -1261 +1261 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer_Const.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer_Delegate.cpp"
                     >