Changeset 183 in dev for trunk/abdev/BasicCompiler32/NumOpe.cpp

Timestamp:

Jun 24, 2007, 6:50:40 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler32/NumOpe.cpp (modified) (13 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -39 +44 @@
         op_push(REG_EAX);
     }
-    else if(type==DEF_INTEGER || (isUnicode&&type==DEF_CHAR)){
+    else if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
         //movsx ebx,ax
         OpBuffer[obp++]=(char)0x0F;
@@ -48 +53 @@
         op_push(REG_EBX);
     }
-    else if(type==DEF_SBYTE || (isUnicode==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
         //movsx ebx,al
         OpBuffer[obp++]=(char)0x0F;
@@ -77 +82 @@
     SetStringQuotes( parameter );
 
-    Operator_New( *pobj_DBClass->GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() ) );
+    Operator_New( *Smoothie::GetMeta().GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() ) );
 
     free( parameter );
@@ -244 +249 @@
     char member[VN_SIZE];
     CClass::RefType refType;
-    if( SplitMemberName( termFull, termLeft, member, refType ) ){
+    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -256 +261 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){
+            if( isClassName == false && Smoothie::GetMeta().blittableTypes.IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -262 +267 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
             }
@@ -291 +296 @@
 
     if( pIsClassName ){
-        if( pobj_DBClass->Find( termFull ) ){
+        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -307 +312 @@
     if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
 
         SetThisPtrToReg( useReg );
@@ -588 +593 @@
         }
 
-        i2 = dataTable.AddBinary( binary, num * tempBaseType.GetSize() );
+        i2 = Compiler::GetNativeCode().GetDataTable().AddBinary( binary, num * tempBaseType.GetSize() );
 
         //mov eax,i2
@@ -735 +740 @@
 
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)Smoothie::GetMeta().GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -746 +751 @@
                     bLiteralCalculation=0;
 
-                    i2=dataTable.AddString(term,i3);
+                    i2=Compiler::GetNativeCode().GetDataTable().AddString(term,i3);
 
                     //push DataSize
@@ -833 +838 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
                         }