Changeset 571 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp

Timestamp:

May 6, 2008, 9:10:21 PM (17 years ago)

Author:

dai_9181

Message:

・LexicalAnalyzer::AnalyzeParameterの第二パラメータをstringからStringsに変更した。
・UserProc::SetParamsAndReturnTypeメソッド内で行っているパラメータ解析処理をLexicalAnalyzer::AnalyzeParameterメソッドを使用したコードに書き直した。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp (modified) (8 diffs)

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

@@ -3 +3 @@
 using namespace ActiveBasic::Compiler;
 
-bool LexicalAnalyzer::AnalyzeParameter( Parameters &params, const char *sourceOfParams, int nowLine )
+bool LexicalAnalyzer::AnalyzeParameter( Parameters &params, const Jenga::Common::Strings &parameterStrings, int nowLine )
 {
     int i2,i3,sw;
@@ -9 +9 @@
 
     //パラメータ
-    int i = 0;
-    while(1){
-        if( sourceOfParams[i] == '\0' )
+    BOOST_FOREACH( const std::string &paramStr, parameterStrings )
+    {
+        int i = 0;
+
+        if( paramStr[i] == '\0' )
         {
             break;
@@ -18 +20 @@
         //ByRef
         bool isRef;
-        if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_BYVAL){
+        if(paramStr[i]==1&&paramStr[i+1]==ESC_BYVAL){
             isRef = false;
             i+=2;
         }
-        else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_BYREF){
+        else if(paramStr[i]==1&&paramStr[i+1]==ESC_BYREF){
             isRef = true;
             i+=2;
@@ -34 +36 @@
         sw=0;
         for(i2=0;;i++,i2++){
-            if(sourceOfParams[i]=='('){
+            if(paramStr[i]=='('){
                 if(!sw) sw=1;
 
-                i3=GetStringInPare(name+i2,sourceOfParams+i);
+                i3=GetStringInPare(name+i2,paramStr.c_str()+i);
                 i2+=i3-1;
                 i+=i3-1;
                 continue;
             }
-            if(sourceOfParams[i]=='['){
+            if(paramStr[i]=='['){
                 if(!sw) sw=1;
 
-                i3=GetStringInBracket(name+i2,sourceOfParams+i);
+                i3=GetStringInBracket(name+i2,paramStr.c_str()+i);
                 i2+=i3-1;
                 i+=i3-1;
                 continue;
             }
-            if(!IsVariableChar(sourceOfParams[i])){
+            if(!IsVariableChar(paramStr[i])){
                 name[i2]=0;
                 break;
             }
-            name[i2]=sourceOfParams[i];
+            name[i2]=paramStr[i];
         }
         if(sw){
@@ -81 +83 @@
         Type type( DEF_NON );
         char initValue[8192] = "";
-        if( sourceOfParams[i] == '=' ){
+        if( paramStr[i] == '=' ){
             i++;
-            i = GetOneParameter( sourceOfParams, i, initValue );
+            i = GetOneParameter( paramStr.c_str(), i, initValue );
 
             // TODO: エラー用 fix me!!!
@@ -95 +97 @@
             }
         }
-        else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_AS){
+        else if(paramStr[i]==1&&paramStr[i+1]==ESC_AS){
             // As指定
             i+=2;
 
             i2=0;
-            while(sourceOfParams[i]=='*'){
-                temporary[i2]=sourceOfParams[i];
+            while(paramStr[i]=='*'){
+                temporary[i2]=paramStr[i];
                 i++;
                 i2++;
             }
             for(;;i++,i2++){
-                if(!IsVariableChar(sourceOfParams[i])){
-                    if(sourceOfParams[i]==1&&(sourceOfParams[i+1]==ESC_FUNCTION||sourceOfParams[i+1]==ESC_SUB)){
-                        temporary[i2++]=sourceOfParams[i++];
-                        temporary[i2]=sourceOfParams[i];
+                if(!IsVariableChar(paramStr[i])){
+                    if(paramStr[i]==1&&(paramStr[i+1]==ESC_FUNCTION||paramStr[i+1]==ESC_SUB)){
+                        temporary[i2++]=paramStr[i++];
+                        temporary[i2]=paramStr[i];
                         continue;
                     }
@@ -115 +117 @@
                     break;
                 }
-                temporary[i2]=sourceOfParams[i];
+                temporary[i2]=paramStr[i];
             }
 
@@ -144 +146 @@
         //パラメータを追加
         params.push_back( pParam );
-
-        if( sourceOfParams[i] == ',' )
-        {
-            i++;
-            continue;
-        }
-        else if( sourceOfParams[i] == '\0' )
-        {
-            break;
-        }
-        else{
-            compiler.errorMessenger.Output(1,NULL,nowLine);
-            break;
-        }
     }