Changeset 35 in dev

Timestamp:

Jan 19, 2007, 3:41:50 AM (18 years ago)

Author:

dai_9181

Message:

 

Files:

• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (1 diff)

BasicCompiler32/NumOpe.cpp

@@ -220 +220 @@
                         CClass *pobj_Class;
                         pobj_Class=(CClass *)lpBaseIndex;
-                        if(IsStringSubsituation(pobj_Class)){
+                        TYPEINFO BaseTypeInfo = {BaseType,lpBaseIndex};
+                        if(IsStringSubsituation(pobj_Class)
+                            || IsStringObjectType(&BaseTypeInfo)){
                             //要求タイプがオブジェクトであり、Stringの受け入れが可能な場合
 

BasicCompiler64/NumOpe.cpp

@@ -244 +244 @@
                         CClass *pobj_Class;
                         pobj_Class=(CClass *)lpBaseIndex;
-                        if(IsStringSubsituation(pobj_Class)){
+                        TYPEINFO BaseTypeInfo = {BaseType,lpBaseIndex};
+                        if(IsStringSubsituation(pobj_Class)
+                            || IsStringObjectType(&BaseTypeInfo)){
                             //要求タイプがオブジェクトであり、Stringの受け入れが可能な場合
 

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -324 +324 @@
                     if(pBaseType){
                         if(pBaseType->type==DEF_OBJECT){
-                            if(IsStringSubsituation(pBaseType->u.pobj_Class)){
+                            if(IsStringSubsituation(pBaseType->u.pobj_Class)
+                                || IsStringObjectType(pBaseType)){
                                 //要求タイプがオブジェクトであり、Stringの受け入れが可能な場合
                                 extern CClass *pobj_StringClass;