Changeset 431 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Mar 11, 2008, 4:02:38 PM (16 years ago)

Author:

dai_9181

Message:

_System_Newに対応（32bit版のみ）。

Location:

trunk/abdev/BasicCompiler_Common

Files:

• common.h (modified) (1 diff)
• src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/common.h

@@ -11 +11 @@
 #include "../BasicCompiler64/resource.h"
 #include "../BasicCompiler64/CommandValue.h"
-#include "../BasicCompiler64/FunctionValue.h"
 #define OPCODE_H_PATH "../BasicCompiler64/opcode.h"
 #else
 #include "../BasicCompiler32/resource.h"
 #include "../BasicCompiler32/CommandValue.h"
-#include "../BasicCompiler32/FunctionValue.h"
 #define OPCODE_H_PATH "../BasicCompiler32/opcode.h"
 #endif

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1326 +1326 @@
 
     char temporary[8192];
-    sprintf(temporary, "%c%ctempType=Nothing%c%cTypeBaseImpl"
+    sprintf(temporary, "%c%ctempType=Nothing%c%c_System_TypeForClass"
         , HIBYTE( COM_DIM )
         , LOBYTE( COM_DIM )
@@ -1347 +1347 @@
         if( objClass.HasSuperClass() || objClass.GetDynamicMembers().size() ){
             sprintf( temporary
-                , "tempType=Search(\"%s\")"
+                , "tempType=Search(\"%s\") As ActiveBasic.Core._System_TypeForClass"
                 , objClass.GetFullName().c_str()
+            );
+
+            // コンパイル
+            MakeMiddleCode( temporary );
+            ChangeOpcode( temporary );
+
+            sprintf( temporary
+                , "tempType.SetClassInfo(%d,_System_GetComVtbl(%s),_System_GetVtblList(%s),_System_GetDefaultConstructor(%s),_System_GetDestructor(%s))"
+                , objClass.GetSize()
+                , objClass.GetFullName().c_str()
+                , objClass.GetFullName().c_str()
+                , objClass.GetFullName().c_str()
+                , objClass.GetFullName().c_str()
+                , objClass.GetName().c_str()
             );