Changeset 308 in dev for trunk/abdev/BasicCompiler64/NumOpe.cpp

Timestamp:

Aug 29, 2007, 9:05:22 AM (17 years ago)

Author:

dai_9181

Message:

静的リンクライブラリにより、複数のグローバル領域が存在することになったのでそれぞれを関数ベースに分けた

File:

• trunk/abdev/BasicCompiler64/NumOpe.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -112 +112 @@
     else if( resultType.IsWhole() || resultType.IsObject()){
         //整数型
-        SetReg_WholeVariable(resultType.GetBasicType(),&relativeVar,UseReg);
+        SetReg_WholeVariable(resultType,&relativeVar,UseReg);
     }
     else if( resultType.IsStruct() ){
@@ -132 +132 @@
     return true;
 }
-bool TermMemberOpe( const CClass &objClass, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member ){
+bool TermMemberOpe( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member )
+{
+    const CClass &objClass = leftType.GetClass();
 
     int UseReg=pobj_reg->GetNextReg();
@@ -138 +140 @@
 
 
-    if( GetMemberType( objClass, member, resultType, 0, false ) ){
+    if( GetMemberType( leftType, member, resultType, 0, false ) ){
         // メンバが見つかったとき
 
@@ -192 +194 @@
                 pobj_sf->push( UseReg );
 
-                if( !Opcode_CallProc(parameter,pUserProc,PROCFLAG_NEW,termLeft,0 ) ){
+                if( !Opcode_CallProc(parameter,pUserProc,PROCFLAG_NEW,termLeft ) ){
                     //レジスタ資源を復元
                     RESTORE_REGISTER_RESOURCE
@@ -284 +286 @@
         }
 
-        return TermMemberOpe( leftType.GetClass(), baseType, resultType, termFull, termLeft, member );
+        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member );
     }
 globalArea:
@@ -463 +465 @@
     ////////////////////////////////
 
-    if( Compiler::StringToType( termFull, resultType ) ){
+    if( compiler.StringToType( termFull, resultType ) ){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );
         return true;
@@ -767 +769 @@
                     // As演算子の右辺値
                     //型名
-                    if( Compiler::StringToType( term, resultType ) ){
+                    if( compiler.StringToType( term, resultType ) ){
                         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );
                     }