Changeset 128 in dev for BasicCompiler32

Timestamp:

May 18, 2007, 4:42:36 AM (18 years ago)

Author:

dai_9181

Message:

Blittable型を導入した。

Location:

BasicCompiler32

Files:

• Compile_Calc.cpp (modified) (1 diff)
• Compile_Statement.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler32/Compile_Calc.cpp

@@ -619 +619 @@
 
 
+    if( varType.IsObject() && Smoothie::Meta::blittableTypes.IsExist( calcType ) ){
+        // Blittable型をオブジェクトとして扱う
+        vector<UserProc *> userProcs;
+        Smoothie::Meta::blittableTypes.GetClass( calcType ).EnumStaticMethod( "_Create", userProcs );
+        if( userProcs.size() != 1 ){
+            SetError();
+            return;
+        }
+        UserProc *pUserProc = userProcs[0];
+
+        // call System.[TypeClass]._Create
+        op_call( pUserProc );
+
+        // push eax
+        op_push( REG_EAX );
+
+        calcType = pUserProc->ReturnType();
+    }
+
 
     /////////////////////////////////

BasicCompiler32/Compile_Statement.cpp

@@ -90 +90 @@
     bool isLiteral;
     BOOL bUseHeap;
-    bool result = TermOpe( leftTerm, Type(), resultType, isLiteral, &bUseHeap, NULL, true );
-
+    bool result = TermOpe( leftTerm, Type(), resultType, isLiteral, &bUseHeap, false, NULL, true );
     if( result ){
 

BasicCompiler32/NumOpe.cpp

@@ -227 +227 @@
     return false;
 }
-bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly ){
+bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool isWantObject, bool *pIsClassName, bool isProcedureCallOnly ){
     char parameter[VN_SIZE];
 
@@ -255 +255 @@
         bool isClassName = false;
         Type leftType;
-        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, &isClassName ) ){
+        if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+            if( isClassName == false && Smoothie::Meta::blittableTypes.IsExist( leftType ) ){
+                // 左側のオブジェクト部分がBlittable型のとき
+
+                char temporary[VN_SIZE];
+                lstrcpy( temporary, termLeft );
+                sprintf( termLeft, "%s(%s)",
+                    Smoothie::Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    temporary );
+            }
+        }
+
+        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, true, &isClassName ) ){
             goto globalArea;
         }

BasicCompiler32/Opcode.h

@@ -102 +102 @@
 //NumOpe.cpp
 void PushReturnValue(int type);
-bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName = NULL, bool isProcedureCallOnly = false );
+bool TermOpe(
+             const char *term,
+             const Type &baseType,
+             Type &resultType,
+             bool &isLiteral,
+             BOOL *pbUseHeap,
+             bool isWantObject = false,
+             bool *pIsClassName = NULL,
+             bool isProcedureCallOnly = false );
 bool NumOpe( int reg,
             const char *expression,