Changeset 106 in dev for BasicCompiler32

Timestamp:

May 4, 2007, 5:04:50 PM (18 years ago)

Author:

dai_9181

Message:

名前空間機能をクラスの静的メンバに適用。

Location:

BasicCompiler32

Files:

• Compile_Var.cpp (modified) (2 diffs)
• NumOpe.cpp (modified) (2 diffs)

BasicCompiler32/Compile_Var.cpp

@@ -352 +352 @@
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss){
     int i;
-    char variable[VN_SIZE],member[VN_SIZE],VarName[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
+    char variable[VN_SIZE];
 
     if(NameBuffer[0]=='.'){
@@ -360 +360 @@
     else lstrcpy(variable,NameBuffer);
 
+    // 名前空間を分離
+    char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
+    Smoothie::Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+
+    // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
     CClass::RefType refType;
-    if( FormatUseProcReturnObject( variable, VarName, array, refType, member ) ){
-        // 戻り値オブジェクトのメンバを直接参照しているとき
-        //例: func().member
-
-        void *pInfo;
-        int idProc=GetProc(VarName,(void **)&pInfo);
-
-        if(idProc){
-            pRelativeVar->dwKind=VAR_DIRECTMEM;
-
-            Type type;
-
-
-            ////////////////
-            // 呼び出し
-            ////////////////
-
-            CallProc(idProc,pInfo,VarName,array,type);
-
-            //戻り値をecxにコピー
-            op_mov_RR( REG_ECX, REG_EAX );
-
-
-            if(!_member_offset(
-                isErrorEnabled,
-                isWriteAccess,
-                type.GetClass(),
-                member,pRelativeVar,resultType,0)) return false;
-
-            return true;
-        }
-    }
-
-
-    lstrcpy(VarName,variable);
-    GetVarFormatString(VarName,array,lpPtrOffset,member,refType);
+    char member[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
+    GetVarFormatString(simpleName,array,lpPtrOffset,member,refType);
+
+    // 名前空間を分離していた場合は結合
+    char VarName[VN_SIZE];
+    if( namespaceStr[0] ){
+        sprintf( VarName, "%s.%s", namespaceStr, simpleName );
+    }
+    else{
+        lstrcpy( VarName, simpleName );
+    }
 
     const int *pSubScripts;

BasicCompiler32/NumOpe.cpp

@@ -272 +272 @@
         return TermMemberOpe( leftType.GetClass(), baseType, resultType, termFull, termLeft, member );
     }
+globalArea:
 
 
@@ -289 +290 @@
     // グローバル属性エリア
     /////////////////////////////////////////////////////////////////
-globalArea:
 
     const int useReg = REG_EAX;