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

Timestamp:

Jun 24, 2007, 6:49:13 PM (18 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 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "common.h"
 
@@ -311 +314 @@
     char member[VN_SIZE];
     CClass::RefType refType;
-    if( SplitMemberName( termFull, termLeft, member, refType ) ){
+    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -323 +326 @@
         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型のとき
 
@@ -329 +332 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
 
@@ -393 +396 @@
 
     if( pIsClassName ){
-        if( pobj_DBClass->Find( termFull ) ){
+        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -408 +411 @@
     if(lstrcmpi(termFull,"This")==0){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
         isLiteral = false;
         return true;
@@ -670 +673 @@
                         //要求タイプがオブジェクト、または未定のとき
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)Smoothie::GetMeta().GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -715 +718 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
                         }
                         bLiteralCalculation = 0;