Changeset 721 in dev for trunk/ab5.0

Timestamp:

Aug 15, 2008, 1:51:23 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

#192への対処

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• MakeExe.cpp (modified) (1 diff)
• VariableOpe.cpp (modified) (4 diffs)
• VariableOpe.h (modified) (1 diff)
• src/CodeGenerator.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -295 +295 @@
 #endif
 }
-void MainThread(void *dummy)
+void MainThread(void *)
 {
     if( program.IsDebugRun() )

trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -292 +292 @@
 }
 
-
-BOOL GetVarFormatString( char *buffer,char *array,char *array2,char *NestMember,ReferenceKind &refType, PareOrBracket *pPareOrBracket ){
+//対応する閉じ括弧cPare_Closeが現れるまでbufからarrayへコピーする。
+int CopyInsideBracket(char *array, const char *buf, char cPare_Open, char cPare_Close)
+{
+    bool inStr=false;
+    for(int i2=0;;i2++){
+        if(buf[i2]=='"'){
+            inStr=!inStr;
+        }
+        if(!inStr){
+            if(buf[i2]==cPare_Open){
+                int i3;
+                if(cPare_Open=='[') i3=GetStringInBracket(array+i2,buf+i2);
+                else i3=GetStringInPare(array+i2,buf+i2);
+                i2+=i3-1;
+                continue;
+            }
+            if(buf[i2]==cPare_Close){
+                array[i2]=0;
+                return i2;
+            }
+        }
+        array[i2]=buf[i2];
+    }
+}
+
+bool GetVarFormatString( char *buffer,char *array,char *array2,char *NestMember,ReferenceKind &refType, PareOrBracket *pPareOrBracket ){
     extern int cp;
-    int i,i2,i3;
+    int i;
     char cPare_Open,cPare_Close;
 
@@ -335 +359 @@
 
             buffer[i]=0;
-            for(i++,i2=0;;i++,i2++){
-                if(buffer[i]==cPare_Open){
-                    if(cPare_Open=='[') i3=GetStringInBracket(array+i2,buffer+i);
-                    else i3=GetStringInPare(array+i2,buffer+i);
-                    i+=i3-1;
-                    i2+=i3-1;
-                    continue;
-                }
-                if(buffer[i]==cPare_Close){
-                    array[i2]=0;
-                    break;
-                }
-                array[i2]=buffer[i];
-            }
+            i++;
+            i+=CopyInsideBracket(array,buffer+i,cPare_Open,cPare_Close);
             if(buffer[i+1]==cPare_Open){
-                for(i+=2,i2=0;;i++,i2++){
+                i+=2;
+                for(int i2=0;;i++,i2++){
                     if(buffer[i]==cPare_Open){
+                        int i3;
                         if(cPare_Open=='[') i3=GetStringInBracket(array2+i2,buffer+i);
                         else i3=GetStringInPare(array2+i2,buffer+i);
@@ -366 +380 @@
                 if(buffer[i+1]==cPare_Open){
                     compiler.errorMessenger.Output(14,buffer,cp);
-                    return 0;
+                    return false;
                 }
             }
@@ -385 +399 @@
         if(buffer[i]=='\0') break;
     }
-    return 1;
+    return true;
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.h

@@ -20 +20 @@
 Type GetStringTypeInfo();
 void GetWithName(char *buffer);
-BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, ReferenceKind &refType, PareOrBracket *pPareOrBracket = NULL );
+bool GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember, ReferenceKind &refType, PareOrBracket *pPareOrBracket = NULL );
 void GetArrayElement( const char *buffer,char *variable,char *array_element);
 BOOL CheckVarNameError(char *name,int nowLine);

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

@@ -1 +1 @@
 #include "stdafx.h"
 
-#include <windows.h>
-#include <stdlib.h>
-
 int GlobalOpBufferSize;