Changeset 106 in dev for BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (2 diffs)
• VariableOpe.cpp (modified) (4 diffs)
• VariableOpe.h (modified) (1 diff)

BasicCompiler_Common/Class.cpp

@@ -91 +91 @@
 
     while(pobj_DBClass->Iterator_HasNext()){
-        CClass *pobj_c;
-        pobj_c=pobj_DBClass->Iterator_GetNext();
+        CClass &objClass = *pobj_DBClass->Iterator_GetNext();
+
+        // 名前空間をセット
+        Smoothie::Lexical::liveingNamespaceScopes = objClass.GetNamespaceScopes();
 
         int i=0;
-        foreach( CMember *member, pobj_c->staticMembers ){
+        foreach( CMember *member, objClass.staticMembers ){
             char temporary[VN_SIZE];
-            sprintf(temporary,"%s.%s",pobj_c->name,member->name);
+            sprintf(temporary,"%s.%s",objClass.name,member->name);
             dim(
                 temporary,
@@ -112 +114 @@
         }
     }
+
+    Smoothie::Lexical::liveingNamespaceScopes.clear();
 
     cp=back_cp;

BasicCompiler_Common/VariableOpe.cpp

@@ -249 +249 @@
 }
 
+/*TODO: 消す
 bool FormatUseProcReturnObject( const char *term, char *procName, char *parameter, CClass::RefType &refType, char *member ){
     int p1 = 0, p2 = 0;
@@ -294 +295 @@
 
     return true;
-}
+}*/
 
 BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,CClass::RefType &refType){
@@ -632 +633 @@
 bool GetVarType( const char *nameBuffer, Type &resultType, bool isErrorEnabled){
     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]=='.'){
@@ -640 +641 @@
     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 *pProc;
-        int idProc=GetProc(VarName,(void **)&pProc);
-
-        if(idProc){
-            Type type;
-            if( !CallProc( idProc, pProc, VarName, array,type, false) ){
-                return false;
-            }
-
-            return GetMemberType( type.GetClass() ,member,resultType,1,isErrorEnabled);
-        }
-    }
-
-
-
-    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 Variable *pVar = NULL;

BasicCompiler_Common/VariableOpe.h

@@ -15 +15 @@
 BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name);
 void GetWithName(char *buffer);
-bool FormatUseProcReturnObject( const char *term, char *procName, char *parameter, CClass::RefType &refType, char *member );
 BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, CClass::RefType &refType );
 void GetArrayElement( const char *buffer,char *variable,char *array_element);