Changeset 41 in dev

Timestamp:

Jan 28, 2007, 5:28:43 AM (18 years ago)

Author:

dai_9181

Message:

ByVal演算子を追加

Files:

• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/BasicFixed.h (modified) (2 diffs)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (2 diffs)
• BasicCompiler_Common/StrOperation.cpp (modified) (1 diff)
• BasicCompiler_Common/calculation.cpp (modified) (5 diffs)
• ProjectEditor/SubOperation.cpp (modified) (1 diff)

BasicCompiler32/NumOpe.cpp

@@ -667 +667 @@
                 break;
 
+            case CALC_BYVAL:
+                //ポインタ型→参照型
+                if( PTR_LEVEL( type[sp-1] ) <= 0 ){
+                    //ポインタ型ではないとき
+                    SetError( 3, NULL, cp );
+                    goto error;
+                }
+
+                type[sp-1] = PTR_LEVEL_DOWN( type[sp-1] );
+
+                break;
+
             default:
                 SetError(300,NULL,cp);
-                break;
+                goto error;
         }
     }

BasicCompiler64/Compile_Var.cpp

@@ -934 +934 @@
     }
 
+
+    ///////////////////////////////////////
+    // 単発式（[]で囲まれていない）
+    ///////////////////////////////////////
+
     if(SubScripts[0]!=-1){
         SetError(41,0,cp);

BasicCompiler64/NumOpe.cpp

@@ -737 +737 @@
                 if(!Calc_Cast(type,index_stack,&sp)) goto error;
                 break;
+            case CALC_BYVAL:
+                //ポインタ型→参照型
+                if( PTR_LEVEL( type[sp-1] ) <= 0 ){
+                    //ポインタ型ではないとき
+                    SetError( 3, NULL, cp );
+                    goto error;
+                }
+
+                type[sp-1] = PTR_LEVEL_DOWN( type[sp-1] );
+
+                break;
 
             default:
                 SetError(300,NULL,cp);
-                break;
+                goto error;
         }
     }

BasicCompiler_Common/BasicFixed.h

@@ -54 +54 @@
 #define NATURAL_TYPE(t) ((t)&MASK_NATURAL)
 #define MAKE_PTR_TYPE(t,p)  ((t)|((p)<<8))
-#define PTR_LEVEL_UP(t) MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)+1)
+#define PTR_LEVEL_UP(t)     MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)+1)
+#define PTR_LEVEL_DOWN(t)   MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)-1)
 
 #define DEF_PTR_BYTE    MAKE_PTR_TYPE(DEF_BYTE,1)
@@ -105 +106 @@
 #define CALC_INTQUOTIENT    63  //整数除算
 #define CALC_AS             71  // As
+#define CALC_BYVAL          72  // ByVal
 #define CALC_MINUSMARK      81  // -x
 #define CALC_POWER          91  // ^

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -163 +163 @@
         case CALC_AS:
             if((type[sp-1]&FLAG_CAST)==0){
+                //型名が指定されていないときはエラー
+                SetError(47,NULL,cp);
+                return 0;
+            }
+            break;
+
+        case CALC_BYVAL:
+            if(type[sp-1]&FLAG_CAST){
                 //型名が指定されていないときはエラー
                 SetError(47,NULL,cp);
@@ -601 +609 @@
                 sp--;
                 break;
+
+            case CALC_BYVAL:
+                //ポインタ型→参照型
+                if( PTR_LEVEL( type[sp-1] ) <= 0 ){
+                    //ポインタ型ではないとき
+                    SetError( 3, NULL, cp );
+                    goto error;
+                }
+
+                type[sp-1] = PTR_LEVEL_DOWN( type[sp-1] );
+                break;
         }
     }

BasicCompiler_Common/StrOperation.cpp

@@ -652 +652 @@
             lstrcpy(name,"As");
             break;
+        case CALC_BYVAL:
+            lstrcpy(name,"ByVal");
+            break;
         case CALC_MINUSMARK:
             lstrcpy(name,"-");

BasicCompiler_Common/calculation.cpp

@@ -39 +39 @@
         Command[p]=='='||Command[p]=='<'||Command[p]=='>'||
         IsJudgMark(Command,p)||
-        (Command[p]==1&&Command[p+1]==ESC_AS)) return 1;
+        (Command[p]==1&&Command[p+1]==ESC_AS)||
+        (Command[p]==1&&Command[p+1]==ESC_BYVAL)) return 1;
     return 0;
 }
@@ -775 +776 @@
             else if(Command[i]=='^') i3=CALC_POWER;
             else if(Command[i]==1&&Command[i+1]==ESC_AS) i3=CALC_AS;
+            else if(Command[i]==1&&Command[i+1]==ESC_BYVAL) i3=CALC_BYVAL;
 
             i3+=PareNum*100;
@@ -889 +891 @@
                 sp--;
                 break;
+            case CALC_BYVAL:
+                //エラー
+                break;
         }
     }
@@ -1404 +1409 @@
     else if(Command[0]=='^') return CALC_POWER;
     else if(Command[0]==1&&Command[1]==ESC_AS) return CALC_AS;
+    else if(Command[0]==1&&Command[1]==ESC_BYVAL) return CALC_BYVAL;
 
     return 0;
@@ -1480 +1486 @@
             }
             else{
-                if(!(Command[i]=='+'||Command[i]=='-'||(Command[i]==1&&Command[i+1]==ESC_NOT))){
-                    SetError(1,NULL,cp);
-                    return 0;
+                if(!(
+                        Command[i]=='+'||
+                        Command[i]=='-'||
+                        (Command[i]==1&&Command[i+1]==ESC_NOT)||
+                        (Command[i]==1&&Command[i+1]==ESC_BYVAL)
+                    )){
+                        SetError(1,NULL,cp);
+                        return 0;
                 }
                 if(Command[i]=='+'){

ProjectEditor/SubOperation.cpp

@@ -504 +504 @@
     else if(str[0]=='o'||str[0]=='O'){
         if(lstrcmpi(str,"Open")==0) return COM_OPEN;
+        if(lstrcmpi(str,"Operator")==0) return -1;
         if(lstrcmpi(str,"Override")==0) return COM_OVERRIDE;
     }