Changeset 64 in dev for BasicCompiler_Common/calculation.cpp

Timestamp:

Mar 8, 2007, 2:49:34 AM (18 years ago)

Author:

dai_9181

Message:

すべてのオブジェクトを参照型に切り替えた。

File:

• BasicCompiler_Common/calculation.cpp (modified) (6 diffs)

BasicCompiler_Common/calculation.cpp

@@ -524 +524 @@
                         StrPtr[pnum][i2]=0;
 
-                        type[pnum]=DEF_PTR_BYTE;
+                        type[pnum]=DEF_PTR_CHAR;
                         before_index[pnum]=LITERAL_STRING;
                     }
@@ -538 +538 @@
                         StrPtr[pnum][i2]=0;
 
-                        type[pnum]=DEF_PTR_BYTE;
+                        type[pnum]=DEF_PTR_CHAR;
                         before_index[pnum]=LITERAL_STRING;
                     }
-                    else if(IsVariableTopChar(Parms[0])||Parms[0]=='*'){
+                    else if(IsVariableTopChar(Parms[0])||Parms[0]=='*'||(Parms[0]=='.'&&IsVariableTopChar(Parms[1]))){
                         if(bDebuggingWatchList){
                             //////////////////////////
@@ -1187 +1187 @@
     return -1;
 }
-BOOL IsStringObjectType(TYPEINFO *pTypeInfo){
-    if(pTypeInfo->type==DEF_OBJECT){
-        if(lstrcmp(pTypeInfo->u.pobj_Class->name,"String")==0){
+bool IsStringObjectType(const TYPEINFO &TypeInfo){
+    if(TypeInfo.type==DEF_OBJECT){
+        if(lstrcmp(TypeInfo.u.pobj_Class->name,"String")==0){
             return 1;
         }
@@ -1209 +1209 @@
         if(psi->ParmNum==2){
             TYPEINFO TypeInfo={psi->pParmInfo[1].type,psi->pParmInfo[1].u.index};
-            if(IsStringObjectType(&TypeInfo)){
+            if(IsStringObjectType( TypeInfo )){
                 bRet=1;
                 goto finish;
@@ -1277 +1277 @@
                         TypeInfo.type=pdi->ReturnType;
                         TypeInfo.u.lpIndex=pdi->u.ReturnIndex;
-                        if(IsStringObjectType(&TypeInfo)) return 1;
+                        if(IsStringObjectType( TypeInfo )) return 1;
                         return 0;
                     }
@@ -1287 +1287 @@
                         TypeInfo.type=psi->ReturnType;
                         TypeInfo.u.lpIndex=psi->u.ReturnIndex;
-                        if(IsStringObjectType(&TypeInfo)) return 1;
+                        if(IsStringObjectType(TypeInfo)) return 1;
                         return 0;
                     }