Changeset 41 in dev for BasicCompiler_Common/calculation.cpp

Timestamp:

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

Author:

dai_9181

Message:

ByVal演算子を追加

File:

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

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]=='+'){