Changeset 54 in dev for BasicCompiler_Common/Subroutine.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/Subroutine.cpp (modified) (2 diffs)

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);