Changeset 290 in dev for trunk/abdev/BasicCompiler32/NumOpe_Arithmetic.cpp

Timestamp:

Aug 21, 2007, 11:00:25 PM (17 years ago)

Author:

dai_9181

Message:

ジェネリクスのベースを実装

File:

• trunk/abdev/BasicCompiler32/NumOpe_Arithmetic.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/NumOpe_Arithmetic.cpp

@@ -217 +217 @@
         }
 
-        if(GetTypeSize(type[sp-2],-1)==sizeof(_int64)){
+        if(Type(type[sp-2],-1).GetSize()==sizeof(_int64)){
             if(AnswerType==DEF_SINGLE){
                 //add esp,4
@@ -652 +652 @@
     }
                                                             //↓ここだけ例外DWord
-    if(GetTypeSize(type[sp-2],-1)==sizeof(_int64)||type[sp-2]==DEF_DWORD){
+    if(Type(type[sp-2],-1).GetSize()==sizeof(_int64)||type[sp-2]==DEF_DWORD){
         if(AnswerType==DEF_SINGLE){
             //add esp,4
@@ -997 +997 @@
     sp=*pStackPointer;
 
-    int CastType;
-    CastType=type[sp-1];
-    if((CastType&FLAG_CAST)==0){
+    int castBasicType = type[sp-1];
+    if((castBasicType&FLAG_CAST)==0){
         SetError(47,NULL,cp);
         return 0;
     }
-    CastType=CastType&(~FLAG_CAST);
-
-    if(IsPtrType(CastType)){
-        ChangeTypeToLong(type[sp-2]);
-    }
-    else if(IsRealNumberType(CastType)){
-        if(CastType==DEF_DOUBLE) ChangeTypeToDouble(type[sp-2]);
-        else if(CastType==DEF_SINGLE) ChangeTypeToSingle(type[sp-2]);
-    }
-    else ChangeTypeToWhole(type[sp-2],CastType);
-
-    type[sp-2]=CastType;
-    index_stack[sp-2]=index_stack[sp-1];
+    castBasicType = castBasicType&(~FLAG_CAST);
+
+    Type oldType( type[sp-2], index_stack[sp-2] );
+    Type castType( castBasicType, index_stack[sp-1] );
+
+    if( castType.IsPointer() )
+    {
+        ChangeTypeToLong( oldType.GetBasicType() );
+    }
+    else if( castType.IsReal() )
+    {
+        if( castType.IsDouble() )
+        {
+            ChangeTypeToDouble( oldType.GetBasicType() );
+        }
+        else if( castType.IsSingle() )
+        {
+            ChangeTypeToSingle( oldType.GetBasicType() );
+        }
+    }
+    else
+    {
+        ChangeTypeToWhole( oldType, castType );
+    }
+
+    type[sp-2] = castType.GetBasicType();
+    index_stack[sp-2] = castType.GetIndex();
 
     sp--;