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

Timestamp:

Jun 27, 2007, 2:41:17 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -23 +23 @@
         SetStringQuotes( parameter );
 
-        Operator_New( *Smoothie::GetMeta().GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() ) );
+        Operator_New( *compiler.GetMeta().GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *compiler.GetMeta().GetClasses().GetStringClassPtr() ) );
 
         free( parameter );
@@ -258 +258 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && Smoothie::GetMeta().blittableTypes.IsExist( leftType ) ){
+            if( isClassName == false && compiler.GetMeta().GetBlittableTypes().IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -264 +264 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    compiler.GetMeta().GetBlittableTypes().Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
             }
@@ -292 +292 @@
 
     if( pIsClassName ){
-        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
+        if( compiler.GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -456 +456 @@
     ////////////////////////////////
 
-    if( Type::StringToType( termFull, resultType ) ){
+    if( Compiler::StringToType( termFull, resultType ) ){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );
         return true;
@@ -593 +593 @@
         }
 
-        i2 = Compiler::GetNativeCode().GetDataTable().AddBinary( binary, num * tempBaseType.GetSize() );
+        i2 = compiler.GetNativeCode().GetDataTable().AddBinary( binary, num * tempBaseType.GetSize() );
 
         //mov reg,i2
@@ -742 +742 @@
                     // As演算子の右辺値
                     //型名
-                    if( Type::StringToType( term, resultType ) ){
+                    if( Compiler::StringToType( term, resultType ) ){
                         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );
                     }
@@ -773 +773 @@
 
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)Smoothie::GetMeta().GetClasses().GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)compiler.GetMeta().GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -786 +786 @@
                     bLiteralCalculation=0;
 
-                    i2 = Compiler::GetNativeCode().GetDataTable().AddString( term, i3 );
+                    i2 = compiler.GetNativeCode().GetDataTable().AddString( term, i3 );
 
                     //mov reg,i2
@@ -882 +882 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)compiler.GetMeta().GetClasses().GetObjectClassPtr();
                         }
 
@@ -971 +971 @@
                         }
                         else{
-                            i3 = Compiler::GetNativeCode().GetDataTable().Add( i64data );
+                            i3 = compiler.GetNativeCode().GetDataTable().Add( i64data );
 
                             //movlpd xmm_reg,qword ptr[data table offset]
@@ -1000 +1000 @@
                         }
                         else{
-                            i3=Compiler::GetNativeCode().GetDataTable().Add( i32data );
+                            i3=compiler.GetNativeCode().GetDataTable().Add( i32data );
 
                             //movss xmm_reg,dword ptr[data table offset]
@@ -1139 +1139 @@
 
             if(resultType.IsDouble()){
-                i3 = Compiler::GetNativeCode().GetDataTable().Add( i64data );
+                i3 = compiler.GetNativeCode().GetDataTable().Add( i64data );
 
                 //movlpd xmm_reg,qword ptr[data table offset]
@@ -1159 +1159 @@
                 memcpy(&i32data,&flt,sizeof(long));
 
-                i3 = Compiler::GetNativeCode().GetDataTable().Add( i32data );
+                i3 = compiler.GetNativeCode().GetDataTable().Add( i32data );
 
                 //movss xmm_reg,dword ptr[data table offset]