Changeset 193 in dev for trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

Timestamp:

Jun 26, 2007, 5:04:50 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp (modified) (8 diffs)

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -1 +1 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Compiler.h>
 
 #include "common.h"
@@ -284 +286 @@
     }
 
-    if( !Type::StringToType( TypeName, resultType ) ){
+    if( !Compiler::StringToType( TypeName, resultType ) ){
         return false;
     }
@@ -326 +328 @@
         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型のとき
 
@@ -332 +334 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    compiler.GetMeta().GetBlittableTypes().Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
 
@@ -396 +398 @@
 
     if( pIsClassName ){
-        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
+        if( compiler.GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -635 +637 @@
                     // As演算子の右辺値
                     //型名
-                    if( Type::StringToType( term, resultType ) ){
+                    if( Compiler::StringToType( term, resultType ) ){
 
                         if( resultType.IsObject() ){
@@ -673 +675 @@
                         //要求タイプがオブジェクト、または未定のとき
                         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;
 
@@ -718 +720 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)compiler.GetMeta().GetClasses().GetObjectClassPtr();
                         }
                         bLiteralCalculation = 0;