Changeset 381 in dev for trunk/abdev

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Statement.cpp (modified) (4 diffs)
• BasicCompiler64/Compile_Statement.cpp (modified) (4 diffs)
• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• ProjectEditor/SubOperation.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -596 +596 @@
 {
     Type resultType;
-    int i;
-    char temporary[VN_SIZE],collectionVar[VN_SIZE];
+    char temporary[VN_SIZE],variable[VN_SIZE],collectionVar[VN_SIZE];
     bool isError = false;
 
+    //レキシカルスコープをレベルアップ
+    compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+
     //第１パラメータを取得
-    char variable[VN_SIZE];
-    i=GetOneParameter(Parameter,0,variable);
+    int i = 0;
+    GetCustomToken( variable, Parameter, i, ESC_IN, true );
     if(!Parameter[i]){
         SetError(12,"Foreach",cp);
@@ -608 +610 @@
         goto ErrorStep;
     }
+    i++;
 
     //第２パラメータを取得（in～）
-    i=GetOneParameter(Parameter,i,collectionVar);
-
-    //レキシカルスコープをレベルアップ
-    compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+    lstrcpy( collectionVar, Parameter + i );
 
     if( !GetVarType( variable, resultType, false ) )
@@ -651 +651 @@
     const PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_je( 0, sizeof(long), true );
 
-    // Currentプロパティから現在の値を取得
-    sprintf( temporary, "%s=%s.Current", variable, collectionVar );
-    Compile( temporary );
+    if( !isError )
+    {
+        // Currentプロパティから現在の値を取得
+        sprintf( temporary, "%s=%s.Current", variable, collectionVar );
+        Compile( temporary );
+    }
 
     //For内をコンパイル
@@ -666 +669 @@
     }
 
-    //jmp ...
-    compiler.codeGenerator.op_jmp_continue();
+    if( !isError )
+    {
+        //jmp ...
+        compiler.codeGenerator.op_jmp_continue();
+    }
 
     //レキシカルスコープをレベルダウン

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -473 +473 @@
 {
     Type resultType;
-    int i;
     char temporary[VN_SIZE],variable[VN_SIZE],collectionVar[VN_SIZE];
     bool isError = false;
 
+    //レキシカルスコープをレベルアップ
+    compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+
     //第１パラメータを取得
-    i=GetOneParameter(Parameter,0,temporary);
+    int i = 0;
+    GetCustomToken( variable, Parameter, i, ESC_IN, true );
     if(!Parameter[i]){
         SetError(12,"Foreach",cp);
@@ -484 +487 @@
         goto ErrorStep;
     }
-
-    lstrcpy( variable, temporary );
+    i++;
 
     //第２パラメータを取得（in～）
-    i=GetOneParameter(Parameter,i,collectionVar);
-
-    //レキシカルスコープをレベルアップ
-    compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+    lstrcpy( collectionVar, Parameter + i );
 
     if( !GetVarType( variable, resultType, false ) )
@@ -527 +526 @@
     const PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_je( 0, sizeof(long), true );
 
-    // Currentプロパティから現在の値を取得
-    sprintf( temporary, "%s=%s.Current", variable, collectionVar );
-    Compile( temporary );
+    if( !isError )
+    {
+        // Currentプロパティから現在の値を取得
+        sprintf( temporary, "%s=%s.Current", variable, collectionVar );
+        Compile( temporary );
+    }
 
     //For内をコンパイル
@@ -542 +544 @@
     }
 
-    //jmp ...
-    compiler.codeGenerator.op_jmp_continue();
+    if( !isError )
+    {
+        //jmp ...
+        compiler.codeGenerator.op_jmp_continue();
+    }
 
     //レキシカルスコープをレベルダウン

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);

trunk/abdev/ProjectEditor/SubOperation.cpp

@@ -524 +524 @@
         if(lstrcmpi(str,"Imports")==0) return -1;
         if(lstrcmpi(str,"Implements")==0) return -1;
+        if(lstrcmpi(str,"In")==0) return -1;
         if(lstrcmpi(str,"Inherits")==0) return COM_INHERITS;
         if(lstrcmpi(str,"Input")==0) return COM_INPUT;
@@ -580 +581 @@
         if(lstrcmpi(str,"Sleep")==0) return COM_SLEEP;
         if(lstrcmp(str,"Static")==0) return -1;
+        if(lstrcmpi(str,"Step")==0) return -1;
         if(lstrcmp(str,"String")==0) return -1;
         if(lstrcmpi(str,"Sub")==0) return COM_SUB;
@@ -588 +590 @@
         if(lstrcmpi(str,"This")==0) return -1;
         if(lstrcmpi(str,"Throw")==0) return -1;
+        if(lstrcmpi(str,"To")==0) return -1;
         if(lstrcmp(str,"True")==0) return -1;
         if(lstrcmp(str,"Try")==0) return COM_TRY;