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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler32/Compile_Calc.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ -373 +373 @@
 }
 
-void SetVariableFromEax(int VarType,int CalcType,RELATIVE_VAR *pRelativeVar){
+void SetVariableFromEax( const Type &varType,int CalcType,RELATIVE_VAR *pRelativeVar){
     /////////////////////////////////////////////////
     // eaxの内容を変数にコピーするコードを抽出
     /////////////////////////////////////////////////
 
-    if(VarType==DEF_BOOLEAN){
+    if( varType.IsBoolean() )
+    {
         //bool
         SetBooleanVariable(CalcType,pRelativeVar);
     }
-    else if( IsRealNumberType( VarType ) ){
+    else if( varType.IsReal() )
+    {
         // Double/Single型変数へレジスタの値を代入
-        SetRealVariable(VarType, CalcType, pRelativeVar);
-    }
-    else if( IsWholeNumberType( VarType ) || VarType == DEF_OBJECT ){
-        int typeSize = GetTypeSize( VarType, -1 );
+        SetRealVariable(varType.GetBasicType(), CalcType, pRelativeVar);
+    }
+    else if( varType.IsWhole() || varType.IsObject() )
+    {
+        int typeSize = varType.GetSize();
 
         //整数変数へraxの値を格納する
@@ -640 +643 @@
     RestoreDefaultRegisterFromStackMemory( calcType.GetBasicType() );
 
-    SetVariableFromEax(varType.GetBasicType(),calcType.GetBasicType(),&VarRelativeVar);
-}
+    SetVariableFromEax(varType,calcType.GetBasicType(),&VarRelativeVar);
+}