Changeset 327 in dev for trunk/abdev

Timestamp:

Sep 25, 2007, 9:23:38 PM (17 years ago)

Author:

dai_9181

Message:

デリゲートのベースがほぼ実装できた

Location:

trunk/abdev

Files:

• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/Enum.cpp (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/Delegate.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -333 +333 @@
         int idProc=GetProc(procName,(void **)&pInfo);
 
-        if(idProc){
-            //閉じカッコ")"に続く文字がNULLでないとき
-            if(termFull[i2+1+i4+1]!='\0'){
+        if(idProc)
+        {
+            if(termFull[i2+1+i4+1]!='\0')
+            {
+                //閉じカッコ")"に続く文字がNULLでないとき
                 SetError(42,NULL,cp);
             }

trunk/abdev/BasicCompiler32/Opcode.h

@@ -19 +19 @@
 #define breakpoint compiler.codeGenerator.PutOld( (char)0xCC );
 
-
-//プロシージャの種類
-#define PROC_DEFAULT    1   //ユーザー定義関数
-#define PROC_DLL        2   //DLL関数
-#define PROC_BUILTIN    3   //コンパイラ埋め込み型
-#define PROC_PTR        4   //関数ポインタ
 
 //プロシージャ

trunk/abdev/BasicCompiler64/Opcode.h

@@ -19 +19 @@
 #define breakpoint compiler.codeGenerator.PutOld( (char)0xCC );
 
-
-//プロシージャの種類
-#define PROC_DEFAULT    1   //ユーザー定義関数
-#define PROC_DLL        2   //DLL関数
-#define PROC_BUILTIN    3   //コンパイラ埋め込み型
-#define PROC_PTR        4   //関数ポインタ
 
 //プロシージャ

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ -225 +225 @@
         }
 
+        sprintf(buffer+length,"\tFunction Operator or (enumBase As %s) As %s\n",parent->GetName().c_str(),parent->GetName().c_str());
+        length+=lstrlen(buffer+length);
+        sprintf(buffer+length,"\t\tReturn New %s(This.value or enumBase.value, \"custom\")\n",parent->GetName().c_str());
+        length+=lstrlen(buffer+length);
+        lstrcpy(buffer+length,"\tEnd Function\n");
+        length+=lstrlen(buffer+length);
+
+        sprintf(buffer+length,"\tFunction Operator and (enumBase As %s) As %s\n",parent->GetName().c_str(),parent->GetName().c_str());
+        length+=lstrlen(buffer+length);
+        sprintf(buffer+length,"\t\tReturn New %s(This.value and enumBase.value, \"custom\")\n",parent->GetName().c_str());
+        length+=lstrlen(buffer+length);
+        lstrcpy(buffer+length,"\tEnd Function\n");
+        length+=lstrlen(buffer+length);
+
         /*
         sprintf(buffer+length,"\tOverride Function ToString() As String\n",parent->TypeName);

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -371 +371 @@
     char *temporary,temp2[VN_SIZE];
 
-    bool isBeforeCharDelimitation = false;
+    bool isBeforeCharDelimitation = true;
     temporary=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,(lstrlen(buffer)+255)*2);
     for(i=0,i2=0,IsStr=0;;i++,i2++){

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -61 +61 @@
     if(*ppInfo) return PROC_BUILTIN;
 
-    //関数ポインタ
+
+    /////////////////////////////////////////////////////////////////
+    //関数ポインタ、またはデリゲート
+    /////////////////////////////////////////////////////////////////
+
     Type type;
     if( !GetVarType( name, type, false ) ){
         return 0;
     }
-    if( type.IsProcPtr() ){
+
+    if( type.IsProcPtr() )
+    {
+        // 関数ポインタ
         return PROC_PTR;
+    }
+
+    if( type.IsObject() && type.GetClass().IsDelegate() )
+    {
+        // デリゲート
+        return PROC_DELEGATE;
     }
 
@@ -185 +198 @@
             }
         }
+    }
+    else if( kind == PROC_DELEGATE )
+    {
+        // デリゲート
+        char tempName[VN_SIZE];
+        lstrcpy( tempName, fullCallName );
+        lstrcat( tempName, ".Call" );
+
+        void *pInfo=(void *)GetSubHash( tempName );
+        if( !pInfo )
+        {
+            Jenga::Throw( "デリゲートの内部Callメソッドの取得に失敗" );
+        }
+
+        return CallProc( PROC_DEFAULT, pInfo, tempName, lpszParms, resultType, isCallOn );
     }
     else{

trunk/abdev/BasicCompiler_Common/src/Delegate.cpp

@@ -188 +188 @@
         destSource += sourceTemplate.GetResult( values );
     }
-
-    ts( destSource.c_str() );
 }