Changeset 381 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Dec 19, 2007, 3:31:03 AM (16 years ago)

Author:

dai_9181

Message:

Foreach文のパラメータをInで区切るようにした。

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (1 diff)
• Intermediate_Step2.cpp (modified) (1 diff)
• common.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -49 +49 @@
         }
         token[i] = source[pos];
+    }
+}
+void GetCustomToken( char *token, const char *source, int &pos, char delimitation, bool isEscapeSequence )
+{
+    for( int i=0; ; i++, pos++ ){
+        if( isEscapeSequence )
+        {
+            if( source[pos] == 1 && source[pos+1] == delimitation )
+            {
+                token[i] = 0;
+                pos++;
+                break;
+            }
+        }
+        else
+        {
+            if( source[pos] == delimitation )
+            {
+                token[i] = 0;
+                break;
+            }
+        }
+
+        token[i] = source[pos];
+
+        if( source[pos] == '\0' )
+        {
+            break;
+        }
     }
 }

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -451 +451 @@
         ComNum=COM_FOR;
     }
-    else if(lstrcmpi(com,"Foreach")==0){
-        KillSpaces(Command+i,pam);
+    else if(lstrcmpi(com,"Foreach")==0)
+    {
+        for(i2=0,IsStr=0;;i++,i2++)
+        {
+            while(Command[i]==' '||Command[i]=='\t') i++;
+            if(Command[i]=='\"') IsStr^=1;
+            if((Command[i-1]==' '||Command[i-1]=='\t')&&(Command[i]=='i'||Command[i]=='I')&&(Command[i+1]=='n'||Command[i+1]=='N')&&(Command[i+2]==' '||Command[i+2]=='\t')&&IsStr==0){
+                pam[i2++] = 1;
+                pam[i2] = ESC_IN;
+                break;
+            }
+            pam[i2]=Command[i];
+            if(Command[i]=='\0') break;
+        }
+        if(Command[i])
+        {
+            lstrcpy( pam + i2 + 1, Command + i + 3 );
+        }
         ComNum=COM_FOREACH;
     }

trunk/abdev/BasicCompiler_Common/common.h

@@ -377 +377 @@
 void GetIdentifierToken( char *token, const char *source, int &pos );
 void GetCommandToken( char *token, const char *source, int &pos );
+void GetCustomToken( char *token, const char *source, int &pos, char delimitation, bool isEscapeSequence );
 void SplitGenericClassInstance( const char *fullName, char *className, Jenga::Common::Strings &typeParameters );
 int JumpStatement(const char *source, int &pos);