Changeset 117 in dev

Timestamp:

May 12, 2007, 5:31:53 PM (18 years ago)

Author:

dai_9181

Message:

String/ObjectをSystem名前空間に依存しない特殊型として扱うようにした

Files:

• BasicCompiler32/Compile_Func.cpp (modified) (1 diff)
• BasicCompiler32/NumOpe.cpp (modified) (3 diffs)
• BasicCompiler64/Compile_Func.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (3 diffs)
• BasicCompiler_Common/Class.cpp (modified) (5 diffs)
• BasicCompiler_Common/Class.h (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (3 diffs)
• BasicCompiler_Common/Type.cpp (modified) (2 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• ProjectEditor/SubOperation.cpp (modified) (2 diffs)

BasicCompiler32/Compile_Func.cpp

@@ -176 +176 @@
         tempParm=temp2;
 
-        extern const CClass *pobj_StringClass;
-        type.SetType( DEF_OBJECT, pobj_StringClass );
+        type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
     }
 

BasicCompiler32/NumOpe.cpp

@@ -77 +77 @@
     SetStringQuotes( parameter );
 
-    extern const CClass *pobj_StringClass;
-    Operator_New( *pobj_StringClass, "", parameter, Type( DEF_OBJECT, *pobj_StringClass ) );
+    Operator_New( *pobj_DBClass->GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() ) );
 
     free( parameter );
@@ -719 +718 @@
                         NewStringObject(term);
 
-                        extern const CClass *pobj_StringClass;
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_StringClass;
+                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -819 +817 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClass();
+                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
                         }
 

BasicCompiler64/Compile_Func.cpp

@@ -30 +30 @@
         tempParm=temp2;
 
-        extern const CClass *pobj_StringClass;
-        type.SetType( DEF_OBJECT, pobj_StringClass );
+        type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
     }
 

BasicCompiler64/NumOpe.cpp

@@ -18 +18 @@
         SetStringQuotes( parameter );
 
-        extern const CClass *pobj_StringClass;
-        Operator_New( *pobj_StringClass, "", parameter, Type( DEF_OBJECT, *pobj_StringClass ) );
+        Operator_New( *pobj_DBClass->GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() ) );
 
         free( parameter );
@@ -731 +730 @@
                         NewStringObject(UseReg,term);
 
-                        extern const CClass *pobj_StringClass;
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_StringClass;
+                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -846 +844 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClass();
+                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
                         }
 

BasicCompiler_Common/Class.cpp

@@ -10 +10 @@
 
 const CClass *pobj_CompilingClass;
-const CClass *pobj_StringClass;
 
 CMember *pCompilingMethod;
@@ -819 +818 @@
     key=hash(name.c_str());
 
+    if( namespaceScopes.size() == 0 && name == "Object" ){
+        return GetObjectClassPtr();
+    }
+    else if( namespaceScopes.size() == 0 && name == "String" ){
+        return GetStringClassPtr();
+    }
+
     if(pobj_ClassHash[key]){
         CClass *pobj_c;
@@ -864 +870 @@
     if(lstrcmp(name,"String")==0){
         //Stringクラス
-        pobj_StringClass=pobj_c;
+        pStringClass=pobj_c;
     }
     if( lstrcmp( name, "Object" ) == 0 ){
@@ -1770 +1776 @@
 
 
-CClass *CDBClass::GetStringClass() const
+CClass *CDBClass::GetStringClassPtr() const
 {
     if( !pStringClass ){
@@ -1778 +1784 @@
     return pStringClass;
 }
-CClass *CDBClass::GetObjectClass() const
+CClass *CDBClass::GetObjectClassPtr() const
 {
     if( !pObjectClass ){

BasicCompiler_Common/Class.h

@@ -275 +275 @@
     CClass *pStringClass;
     CClass *pObjectClass;
-    CClass *GetStringClass() const;
-    CClass *GetObjectClass() const;
+    CClass *GetStringClassPtr() const;
+    CClass *GetObjectClassPtr() const;
 
 

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -614 +614 @@
                     // As演算子の右辺値
                     //型名
-                    if( (string)term=="Hoge"){
-                        int test=0;
-                    }
                     if( Type::StringToType( term, resultType ) ){
                         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );
@@ -637 +634 @@
                     if( baseType.IsObject() || baseType.IsNull() ){
                         //要求タイプがオブジェクト、または未定のとき
-                        extern const CClass *pobj_StringClass;
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_StringClass;
+                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -688 +684 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClass();
+                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
                         }
                         bLiteralCalculation = 0;

BasicCompiler_Common/Type.cpp

@@ -82 +82 @@
     if( StringToBasicType( typeName, type.basicType ) ){
         // 基本型だったとき
+        return true;
+    }
+
+
+    // Object型だったとき
+    if( typeName == "Object" ){
+        type.SetType( DEF_OBJECT, pobj_DBClass->GetObjectClassPtr() );
+        return true;
+    }
+
+    // String型だったとき
+    if( typeName == "String" ){
+        type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
         return true;
     }
@@ -507 +520 @@
 
 Type Type::String(){
-    extern const CClass *pobj_StringClass;
-    if( pobj_StringClass == NULL ){
-        SetError();
-    }
-    return Type( DEF_OBJECT, *pobj_StringClass );
-}
+    return Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() );
+}

BasicCompiler_Common/VariableOpe.cpp

@@ -235 +235 @@
 
 Type GetStringTypeInfo(){
-    extern const CClass *pobj_StringClass;
-    Type type( DEF_OBJECT, *pobj_StringClass );
+    Type type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() );
     return type;
 }

BasicCompiler_Common/common.h

@@ -47 +47 @@
 
 #ifdef _AMD64_
-#define VER_INFO        "(x64) β rev.243"
+#define VER_INFO        "(x64) β rev.245"
 #else
-#define VER_INFO        "β rev.243"
+#define VER_INFO        "β rev.245"
 #endif
 

ProjectEditor/SubOperation.cpp

@@ -545 +545 @@
     }
     else if(str[0]=='o'||str[0]=='O'){
+        if(lstrcmp(str,"Object")==0) return -1;
         if(lstrcmpi(str,"Open")==0) return COM_OPEN;
         if(lstrcmpi(str,"Operator")==0) return -1;
@@ -572 +573 @@
         if(lstrcmp(str,"Single")==0) return -1;
         if(lstrcmpi(str,"Sleep")==0) return COM_SLEEP;
-        if(lstrcmpi(str,"Static")==0) return -1;
+        if(lstrcmp(str,"String")==0) return -1;
         if(lstrcmpi(str,"Sub")==0) return COM_SUB;
         if(lstrcmpi(str,"Super")==0) return -1;