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

Timestamp:

May 8, 2008, 3:27:32 PM (17 years ago)

Author:

dai_9181

Message:

Consts/ConstMacrosクラスのLexicalAnalyzerクラスへの依存性をなくした。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/src

Files:

• Const.cpp (modified) (10 diffs)
• LexicalAnalyzer_Const.cpp (modified) (1 diff)

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

@@ -36 +36 @@
 }
 
-CConst *Consts::GetObjectPtr( const std::string &name ){
-    char ObjName[VN_SIZE];      //オブジェクト変数
-    char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = SplitMemberName( name.c_str(), ObjName, NestMember );
-
-    CConst *pConst = GetHashArrayElement( NestMember );
+CConst *Consts::GetObjectPtr( const Symbol &symbol )
+{
+    CConst *pConst = GetHashArrayElement( symbol.GetName().c_str() );
     while( pConst )
     {
-        if( pConst->IsEqualSymbol( LexicalAnalyzer::FullNameToSymbol( name ) ) )
+        if( pConst->IsEqualSymbol( symbol ) )
         {
             break;
@@ -55 +52 @@
 
 
-int Consts::GetBasicType(const char *Name){
-    CConst *pConst = GetObjectPtr(Name);
+int Consts::GetBasicType( const Symbol &symbol ){
+    CConst *pConst = GetObjectPtr( symbol );
 
     if(!pConst) return 0;
@@ -62 +59 @@
     return pConst->GetType().GetBasicType();
 }
-_int64 Consts::GetWholeData(const char *Name){
-    CConst *pConst = GetObjectPtr(Name);
+_int64 Consts::GetWholeData( const Symbol &symbol ){
+    CConst *pConst = GetObjectPtr( symbol );
 
     if(!pConst) return 0;
@@ -69 +66 @@
     return pConst->GetWholeData();
 }
-double Consts::GetDoubleData(const char *Name){
-    CConst *pConst = GetObjectPtr(Name);
+double Consts::GetDoubleData( const Symbol &symbol ){
+    CConst *pConst = GetObjectPtr( symbol );
 
     if(!pConst) return 0;
@@ -76 +73 @@
     return pConst->GetDoubleData();
 }
-bool Consts::IsStringPtr( const char *Name ){
-    CConst *pConst = GetObjectPtr(Name);
+bool Consts::IsStringPtr( const Symbol &symbol ){
+    CConst *pConst = GetObjectPtr( symbol );
 
     if(!pConst) return false;
@@ -87 +84 @@
 
 // マクロ定数を追加するための関数
-void ConstMacros::Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr )
+bool ConstMacros::Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr )
 {
     std::vector<std::string> parameters;
@@ -94 +91 @@
     if(parameterStr[i]!='(')
     {
-        compiler.errorMessenger.OutputFatalError();
-        return;
+        return false;
     }
 
@@ -101 +97 @@
     int i2;
     for(i++,i2=0;;i++,i2++){
-        if(parameterStr[i]=='\0'){
-            compiler.errorMessenger.Output(1,NULL,cp);
-            return;
+        if(parameterStr[i]=='\0')
+        {
+            return false;
         }
         if(parameterStr[i]==','||parameterStr[i]==')'){
@@ -112 +108 @@
             if(parameterStr[i]==')'){
                 i++;
-                if(parameterStr[i]!='='){
-                    extern int cp;
-                    compiler.errorMessenger.Output(1,NULL,cp);
-                    return;
+                if(parameterStr[i]!='=')
+                {
+                    return false;
                 }
                 break;
@@ -129 +124 @@
     lstrcpy(temporary,parameterStr+i+1);
 
-    Put( new ConstMacro( namespaceScopes, name, parameters, temporary ) );
+    this->Put( new ConstMacro( namespaceScopes, name, parameters, temporary ) );
+
+    return true;
 }
-ConstMacro *ConstMacros::Find( const std::string &name ){
-    char ObjName[VN_SIZE];      //オブジェクト変数
-    char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = SplitMemberName( name.c_str(), ObjName, NestMember );
-
-    ConstMacro *pConstMacro = GetHashArrayElement( NestMember );
+ConstMacro *ConstMacros::Find( const Symbol &symbol )
+{
+    ConstMacro *pConstMacro = GetHashArrayElement( symbol.GetName().c_str() );
     while( pConstMacro )
     {
-        if( pConstMacro->IsEqualSymbol( LexicalAnalyzer::FullNameToSymbol( name ) ) )
+        if( pConstMacro->IsEqualSymbol( symbol ) )
         {
             break;

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

@@ -179 +179 @@
                     // 定数マクロ
                     const char *params = temporary + i2;
-                    constMacros.Add( namespaceScopes, name, params );
+                    if( !constMacros.Add( namespaceScopes, name, params ) )
+                    {
+                        compiler.errorMessenger.Output( 1, NULL, i );
+                    }
                 }