Changeset 676 in dev for trunk/ab5.0/abdev/compiler_x64

Timestamp:

Jun 29, 2008, 3:20:40 PM (16 years ago)

Author:

dai_9181

Message:

If/While/Doなどのステートメントに引き渡す式の戻り値がクラス型の場合はBoolean型へのキャストを試みるようにした。

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• Compile_Statement.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (1 diff)

trunk/ab5.0/abdev/compiler_x64/Compile_Statement.cpp

@@ -124 +124 @@
     int reg=REG_RAX;
     Type resultType;
-    if( !NumOpe(&reg,buffer,Type(DEF_BOOLEAN),resultType) ){
-        return;
+    bool isNeedHeapFreeStructure;
+    if( !NumOpe(&reg,buffer,Type(DEF_BOOLEAN),resultType, &isNeedHeapFreeStructure) ){
+        return;
+    }
+
+    if( resultType.IsObject() )
+    {
+        // Boolean型にキャストする
+        Type booleanType( DEF_BOOLEAN );
+        CallCastOperatorProc( reg, resultType, isNeedHeapFreeStructure, booleanType );
+        resultType = booleanType;
     }
 

trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp

@@ -921 +921 @@
 
         if(idCalc){
-            if(type_stack[sp-2]==DEF_OBJECT){
+            if( sp>=2 && type_stack[sp-2]==DEF_OBJECT )
+            {
                 if( idCalc == CALC_AS
                     && type_stack[sp-1] == ( DEF_OBJECT | FLAG_CAST )