Changeset 372 in dev for trunk/abdev

Timestamp:

Nov 23, 2007, 1:44:13 PM (17 years ago)

Author:

dai_9181

Message:

Foreachステートメントを実装中…

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler32/Opcode.h (modified) (2 diffs)
• BasicCompiler32/commandvalue.h (modified) (1 diff)
• BasicCompiler64/CommandValue.h (modified) (1 diff)
• BasicCompiler64/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler64/Opcode.h (modified) (2 diffs)
• BasicCompiler_Common/Compile.cpp (modified) (2 diffs)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -568 +568 @@
     //レキシカルスコープをレベルアップ
     compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+
+    //For内をコンパイル
+    CompileBuffer(0,COM_NEXT);
+
+    compiler.codeGenerator.lexicalScopes.CallDestructorsOfScopeEnd();
+
+    if(szNextVariable[0]){
+        if(lstrcmp(szNextVariable,variable)!=0){
+            SetError(55,szNextVariable,cp);
+        }
+    }
+
+    //jmp ...
+    compiler.codeGenerator.op_jmp_continue();
+
+    //レキシカルスコープをレベルダウン
+    compiler.codeGenerator.lexicalScopes.End();
+
+    //jeジャンプ先のオフセット値
+    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule );
+
+    //Continueアドレスを復元
+    compiler.codeGenerator.ContinueAreaEnd();
+}
+
+void OpcodeForeach( const char *Parameter )
+{
+    Type resultType;
+    int i;
+    char temporary[VN_SIZE],variable[VN_SIZE],collectionVar[VN_SIZE];
+    bool isError = false;
+
+    //第１パラメータを取得
+    i=GetOneParameter(Parameter,0,temporary);
+    if(!Parameter[i]){
+        SetError(12,"Foreach",cp);
+        isError = true;
+        goto ErrorStep;
+    }
+
+    lstrcpy( variable, temporary );
+
+    //第２パラメータを取得（in～）
+    i=GetOneParameter(Parameter,i,collectionVar);
+
+    // Resetメソッドを呼び出す
+    sprintf( temporary, "%s.Reset()", collectionVar );
+    Compile( temporary );
+
+    //Continueアドレスのバックアップとセット
+    compiler.codeGenerator.ContinueAreaBegin();
+
+    // MoveNextメソッドを呼び出す
+    sprintf( temporary, "%s.MoveNext()", collectionVar );
+    NumOpe(temporary,Type(),Type());
+
+    //pop eax
+    compiler.codeGenerator.op_pop(REG_EAX);
+
+    //cmp eax,0
+    compiler.codeGenerator.op_cmp_value( sizeof(long), REG_EAX, 0 );
+
+ErrorStep:
+
+    //je ...
+    const PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_je( 0, sizeof(long), true );
+
+    //レキシカルスコープをレベルアップ
+    compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+
+    // Currentプロパティから現在の値を取得
+    // TODO: 型指定が未完成
+    sprintf( temporary, "%s=%s.Current As String", variable, collectionVar );
+    Compile( temporary );
 
     //For内をコンパイル

trunk/abdev/BasicCompiler32/Opcode.h

@@ -41 +41 @@
 
 //Compile.cpp
+void Compile( const char *source );
 void ChangeOpcode(char *Command);
 void GetGlobalDataForDll(void);
@@ -230 +231 @@
 void OpcodeWhile(char *Parameter);
 void OpcodeFor(char *Parameter);
+void OpcodeForeach( const char *Parameter );
 void OpcodeDo(char *Parameter);
 void OpcodeContinue(void);

trunk/abdev/BasicCompiler32/commandvalue.h

@@ -14 +14 @@
 #define COM_WHILE   0x1036
 #define COM_WEND    0x1037
+#define COM_FOREACH 0x1038
 
 //データ操作

trunk/abdev/BasicCompiler64/CommandValue.h

@@ -14 +14 @@
 #define COM_WHILE   0x1036
 #define COM_WEND    0x1037
+#define COM_FOREACH 0x1038
 
 //データ操作

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -445 +445 @@
     //レキシカルスコープをレベルアップ
     compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+
+    //For内をコンパイル
+    CompileBuffer(0,COM_NEXT);
+
+    compiler.codeGenerator.lexicalScopes.CallDestructorsOfScopeEnd();
+
+    if(szNextVariable[0]){
+        if(lstrcmp(szNextVariable,variable)!=0){
+            SetError(55,szNextVariable,cp);
+        }
+    }
+
+    //jmp ...
+    compiler.codeGenerator.op_jmp_continue();
+
+    //レキシカルスコープをレベルダウン
+    compiler.codeGenerator.lexicalScopes.End();
+
+    //jeジャンプ先のオフセット値
+    compiler.codeGenerator.opfix_JmpPertialSchedule( pTempPertialSchedule );
+
+    //Continueアドレスを復元
+    compiler.codeGenerator.ContinueAreaEnd();
+}
+
+void OpcodeForeach( const char *Parameter )
+{
+    Type resultType;
+    int i;
+    char temporary[VN_SIZE],variable[VN_SIZE],collectionVar[VN_SIZE];
+    bool isError = false;
+
+    //第１パラメータを取得
+    i=GetOneParameter(Parameter,0,temporary);
+    if(!Parameter[i]){
+        SetError(12,"Foreach",cp);
+        isError = true;
+        goto ErrorStep;
+    }
+
+    lstrcpy( variable, temporary );
+
+    //第２パラメータを取得（in～）
+    i=GetOneParameter(Parameter,i,collectionVar);
+
+    // Resetメソッドを呼び出す
+    sprintf( temporary, "%s.Reset()", collectionVar );
+    Compile( temporary );
+
+    //Continueアドレスのバックアップとセット
+    compiler.codeGenerator.ContinueAreaBegin();
+
+    // MoveNextメソッドを呼び出す
+    sprintf( temporary, "%s.MoveNext()", collectionVar );
+    int reg = REG_RAX;
+    NumOpe(&reg,temporary,Type(),resultType);
+
+    //cmp rax,0
+    compiler.codeGenerator.op_cmp_value(resultType.GetSize(),REG_RAX,0);
+
+ErrorStep:
+
+    //je ...
+    const PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_je( 0, sizeof(long), true );
+
+    //レキシカルスコープをレベルアップ
+    compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );
+
+    // Currentプロパティから現在の値を取得
+    // TODO: 型指定が未完成
+    sprintf( temporary, "%s=%s.Current As String", variable, collectionVar );
+    Compile( temporary );
 
     //For内をコンパイル

trunk/abdev/BasicCompiler64/Opcode.h

@@ -169 +169 @@
 
 //Compile.cpp
+void Compile( const char *source );
 void ChangeOpcode(char *Command);
 void GetGlobalDataForDll(void);
@@ -345 +346 @@
 void OpcodeWhile(char *Parameter);
 void OpcodeFor(char *Parameter);
+void OpcodeForeach(const char *Parameter);
 void OpcodeDo(char *Parameter);
 void OpcodeContinue(void);

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -139 +139 @@
 }
 
+void Compile( const char *source )
+{
+    char *temporary = (char *)malloc( lstrlen( source ) + 8192 );
+    lstrcpy( temporary, source );
+    int backCp = cp;
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+    cp = backCp;
+    free( temporary );
+}
+
 void ChangeOpcode(char *Command){
     extern HANDLE hHeap;
@@ -337 +348 @@
         case COM_FOR:
             OpcodeFor(Command+2);
+            break;
+        case COM_FOREACH:
+            OpcodeForeach(Command+2);
             break;
         case COM_DO:

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -451 +451 @@
         ComNum=COM_FOR;
     }
+    else if(lstrcmpi(com,"Foreach")==0){
+        KillSpaces(Command+i,pam);
+        ComNum=COM_FOREACH;
+    }
     else if(lstrcmpi(com,"Next")==0){
         KillSpaces(Command+i,pam);