Changeset 47 in dev for BasicCompiler_Common

Timestamp:

Feb 10, 2007, 3:12:04 AM (18 years ago)

Author:

dai_9181

Message:

列挙子の比較演算が正常に行えないバグを修正。
クラス名と同名のグローバル関数を定義できないバグを修正

Location:

BasicCompiler_Common

Files:

• Enum.cpp (modified) (2 diffs)
• hash.cpp (modified) (1 diff)

BasicCompiler_Common/Enum.cpp

@@ -161 +161 @@
         lstrcpy(buffer+length,"\tEnd Sub\n");
         length+=lstrlen(buffer+length);
+        sprintf(buffer+length,"\tSub %s(ByRef e As %s)\n",parent->TypeName,parent->TypeName);
+        length+=lstrlen(buffer+length);
+        lstrcpy(buffer+length,"\t\tEnumBase(e.m_Value)\n");
+        length+=lstrlen(buffer+length);
+        lstrcpy(buffer+length,"\tEnd Sub\n");
+        length+=lstrlen(buffer+length);
         sprintf(buffer+length,"\tSub %s(value As Long)\n",parent->TypeName);
         length+=lstrlen(buffer+length);
@@ -233 +239 @@
         length+=lstrlen(buffer+length);
 
+        sprintf(buffer+length,"\tFunction Operator== (ByRef e As %s) As Boolean\n",parent->TypeName);
+        length+=lstrlen(buffer+length);
+        lstrcpy(buffer+length,"\t\tReturn ( e.m_Value = m_Value )\n");
+        length+=lstrlen(buffer+length);
+        lstrcpy(buffer+length,"\tEnd Function\n");
+        length+=lstrlen(buffer+length);
+
         lstrcpy(buffer+length,"End Class\n");
         length+=lstrlen(buffer+length);

BasicCompiler_Common/hash.cpp

@@ -114 +114 @@
         }
         else{
-            pobj_c=pobj_DBClass->check(ObjName);
-            if( pobj_c ){
-                isStatic = true;
-            }
-            else{
-                //"->"によってオブジェクトを指定する通常のメンバ関数呼び出し
-                int type = GetVarType(ObjName,(LONG_PTR *)&pobj_c,0);
-                if(!(NATURAL_TYPE(type)==DEF_OBJECT)) goto finish;
+            //"->"によってオブジェクトを指定する通常のメンバ関数呼び出し
+            int type = GetVarType(ObjName,(LONG_PTR *)&pobj_c,0);
+            if(!(NATURAL_TYPE(type)==DEF_OBJECT)){
+                pobj_c=pobj_DBClass->check(ObjName);
+                if( pobj_c ){
+                    isStatic = true;
+                }
+                else{
+                    goto finish;
+                }
             }
         }