Changeset 561 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp

Timestamp:

May 5, 2008, 1:09:21 PM (16 years ago)

Author:

dai_9181

Message:

・AddMember→AddDynamicMethod
・CMember→Member
・CreateMemberメソッドをCClassクラスからLexicalAnalyzerクラスへ移動した。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp

@@ -224 +224 @@
 
     bool result = true;
-    BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
+    BOOST_FOREACH( Member *pMember, objClass.GetDynamicMembers() ){
         if(pMember->GetType().IsStruct()){
             //循環参照でないかをチェック
@@ -268 +268 @@
 }
 
+Member *LexicalAnalyzer::CreateMember( const CClass &_class, Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine )
+{
+    extern int cp;
+
+    //構文を解析
+    char VarName[VN_SIZE];
+    char initBuffer[VN_SIZE];
+    char lpszConstructParameter[VN_SIZE];
+    Subscripts subscripts;
+    Type type;
+    GetDimentionFormat(buffer,VarName,subscripts,type,initBuffer,lpszConstructParameter);
+
+    //重複チェック
+    if( _class.DupliCheckAll( VarName ) ){
+        compiler.errorMessenger.Output(15,VarName,cp);
+    }
+
+    Member *pMember = new Member( accessibility, VarName, type, isConst, subscripts, initBuffer, lpszConstructParameter );
+    pMember->source_code_address = nowLine;
+    return pMember;
+}
+
 void LexicalAnalyzer::AddMethod(CClass *pobj_c, UserProc *pUserProc, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
     bool isVirtual, bool isOverride, const char *interfaceName, bool isAutoGeneration, int nowLine)
@@ -1160 +1182 @@
                         //静的メンバを追加
                         cp=i;   //エラー用
-                        pobj_c->AddStaticMember( accessibility, isConst, false, temporary, i);
+                        pobj_c->AddStaticMember(
+                            LexicalAnalyzer::CreateMember( *pobj_c, accessibility, isConst, false, temporary, i )
+                        );
                     }
                     else{
                         //メンバを追加
                         cp=i;   //エラー用
-                        pobj_c->AddMember( accessibility, isConst, false, temporary, i );
+                        pobj_c->AddDynamicMember(
+                            LexicalAnalyzer::CreateMember( *pobj_c, accessibility, isConst, false, temporary, i )
+                        );