Changeset 54 in dev

Timestamp:

Feb 12, 2007, 2:09:55 PM (18 years ago)

Author:

dai_9181

Message:

DeclareのLib、AliasにConst定義された文字列定数を指定できるようにした。

Location:

BasicCompiler_Common

Files:

• Intermediate_Step1.cpp (modified) (7 diffs)
• Subroutine.cpp (modified) (2 diffs)

BasicCompiler_Common/Intermediate_Step1.cpp

@@ -414 +414 @@
     char *temporary,temp2[VN_SIZE];
 
-    temporary=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(buffer)*2);
+    temporary=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(buffer)*2);
     for(i=0,i2=0,IsStr=0;;i++,i2++){
         if(buffer[i]=='\"') IsStr^=1;
@@ -594 +594 @@
                     if(lstrcmpi(temporary+i3,"Declare")==0){
                         i2=i3;
+                        int i9=i2;
                         temporary[i2]=1;
                         temporary[++i2]=ESC_DECLARE;
                         i++;
                         while(buffer[i]==' '||buffer[i]=='\t') i++;
+
+                        // Sub/Function
                         for(i4=0;;i++,i4++){
                             if(!IsVariableChar(buffer[i])){
@@ -608 +611 @@
                         else if(lstrcmpi(temp2,"Function")==0) temporary[++i2]=ESC_FUNCTION;
                         while(buffer[i]==' '||buffer[i]=='\t') i++;
+
+                        // 関数名
                         for(i2++;;i++,i2++){
                             if(!IsVariableChar(buffer[i])){
@@ -616 +621 @@
                         }
                         while(buffer[i]==' '||buffer[i]=='\t') i++;
+
                         for(i4=0;;i++,i4++){
                             if(!IsVariableChar(buffer[i])){
@@ -638 +644 @@
                         if(lstrcmpi(temp2,"Lib")==0) temporary[++i2]=',';
                         while(buffer[i]==' '||buffer[i]=='\t') i++;
+
                         if(buffer[i]=='\"'){
                             temporary[++i2]=buffer[i];
@@ -649 +656 @@
                             }
                         }
+                        else{
+                            for(i2++;;i++,i2++){
+                                if(!IsVariableChar(buffer[i])){
+                                    i2--;
+                                    break;
+                                }
+                                temporary[i2]=buffer[i];
+                            }
+                        }
                         while(buffer[i]==' '||buffer[i]=='\t') i++;
-                        for(i4=0;;i++,i4++){
-                            if(!IsVariableChar(buffer[i])){
-                                temp2[i4]=0;
-                                break;
+
+                        temporary[++i2]=',';
+
+                        if( memicmp( buffer + i, "Alias", 5 ) ==0 ){
+                            i+=5;
+                            for(i++,i2++;;i++,i2++){
+                                temporary[i2]=buffer[i];
+                                if(buffer[i]=='('){
+                                    i2--;
+                                    break;
+                                }
+                                if(buffer[i]=='\0') break;
                             }
-                            temp2[i4]=buffer[i];
-                        }
-                        if(lstrcmpi(temp2,"Alias")==0)
-                            temporary[++i2]=',';
+                        }
+
+                        temporary[++i2]=',';
+
                         i--;
                     }
@@ -942 +966 @@
     }
     lstrcpy(buffer,temporary);
-    GlobalFree(temporary);
+    HeapDefaultFree(temporary);
 }
 void DefCommandFormat(char *buffer){

BasicCompiler_Common/Subroutine.cpp

@@ -455 +455 @@
 
     //ライブラリ
-    if(buffer[i]!='\"'){
+    i = GetOneParameter( buffer, i, temporary );
+    int type;
+    LONG_PTR lpIndex;
+    _int64 i64data;
+    type = StaticCalculation( true, temporary, 0, &i64data, &lpIndex );
+    if( type != DEF_PTR_BYTE ){
         SetError(1,NULL,NowLine);
         return;
     }
-    for(i++,i2=0;;i++,i2++){
-        if(buffer[i]=='\"'){
-            temporary[i2]=0;
-            break;
-        }
-        if(buffer[i]=='\0'){
-            SetError(1,NULL,NowLine);
-            return;
-        }
-        temporary[i2]=buffer[i];
-    }
+    lstrcpy( temporary, (char *)i64data );
     CharUpper(temporary);
     if(!strstr(temporary,".")){
@@ -483 +478 @@
     pdi->file=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
     lstrcpy(pdi->file,temporary);
-    i++;
-
-    if(buffer[i]==','){
-        i++;
-        if(buffer[i]!='\"'){
+
+    //エイリアス
+    i = GetOneParameter( buffer, i, temporary );
+    if( temporary[0] ){
+        type = StaticCalculation( true, temporary, 0, &i64data, &lpIndex );
+        if( type != DEF_PTR_BYTE ){
             SetError(1,NULL,NowLine);
             return;
         }
-        for(i++,i2=0;;i++,i2++){
-            if(buffer[i]=='\"'){
-                temporary[i2]=0;
-                break;
-            }
-            if(buffer[i]=='\0'){
-                SetError(1,NULL,NowLine);
-                return;
-            }
-            temporary[i2]=buffer[i];
-        }
+        lstrcpy( temporary, (char *)i64data );
+
         pdi->alias=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
         lstrcpy(pdi->alias,temporary);
-        i++;
     }
     else{
+        //省略されたときは関数名
         pdi->alias=(char *)HeapAlloc(hHeap,0,lstrlen(pdi->name)+1);
         lstrcpy(pdi->alias,pdi->name);