Changeset 333 for cpp/frams/vm/framscript.y

Timestamp:

03/01/15 01:19:56 (10 years ago)

Author:

Maciej Komosinski

Message:

• use source/code mapping for line number and file information in vm error messages
• enum ExtValue::CompareResult? instead of int

File:

• cpp/frams/vm/framscript.y (modified) (13 diffs)

cpp/frams/vm/framscript.y

@@ -28 +28 @@
 void warnTruthValue(const TokenValue& t);
 void outFunName(const TokenValue& t);
+static bool resultIsRelaxedEqual(ExtValue::CompareResult res);
 
 static const char* assign_op_names[]={"add","sub","mul","div","mod"};
@@ -46 +47 @@
 %left NEG     /* negation--unary minus */
 %left TYPEOF
-%left INT
-%left FLOAT
-%left STRING
+%left INT_TYPE
+%left FLOAT_TYPE
+%left STRING_TYPE
 
 %token IDENT
@@ -67 +68 @@
 %token DEFAULT  "default"
 
-%token TYPEOF    "typeof"
-%token INT       "int"
-%token FLOAT     "float"
-%token STRING    "string"
+%token TYPEOF      "typeof"
+%token INT_TYPE    "int"
+%token FLOAT_TYPE  "float"
+%token STRING_TYPE "string"
 
 %token ASM     
@@ -704 +705 @@
                              {trctx.out->printf("type s0,s0\n");}
                      }
-       | INT '(' expr ')' { trctx.emitLine(); $$.ident=0;
+       | INT_TYPE '(' expr ')' { trctx.emitLine(); $$.ident=0;
                        if ($3.constant)
                              {$$.constant=1; $$=ExtValue($3.getInt());}
@@ -710 +711 @@
                              {trctx.out->printf("conv 1,s0\n");}
                      }
-       | FLOAT '(' expr ')' { trctx.emitLine(); $$.ident=0;
+       | FLOAT_TYPE '(' expr ')' { trctx.emitLine(); $$.ident=0;
                        if ($3.constant)
                              {$$.constant=1; $$=ExtValue($3.getDouble());}
@@ -716 +717 @@
                              {trctx.out->printf("conv 2,s0\n");}
                      }
-       | STRING '(' expr ')' { trctx.emitLine(); $$.ident=0;
+       | STRING_TYPE '(' expr ')' { trctx.emitLine(); $$.ident=0;
                        if ($3.constant)
                              {$$.constant=1; $$=ExtValue($3.getString());}
@@ -748 +749 @@
  if ($1.constant)
          {
-         int cond=$1.compare(ExtValue::zero());
-         if ((cond==0)||(cond==2))
+         ExtValue::CompareResult cond=$1.compare(ExtValue::zero());
+         if (resultIsRelaxedEqual(cond))
                  {
                  $1.counter=0;
@@ -776 +777 @@
          if (!($1.constant && $1.counter==0))
                  {
-                 int cond=$4.compare(ExtValue::zero());
-                 bool value=!((cond==0)||(cond==2));
+                 ExtValue::CompareResult  cond=$4.compare(ExtValue::zero());
+                 bool value=!resultIsRelaxedEqual(cond);
                  trstack.adjust(-1);
                  trctx.out->printf("push %d\n",value);
@@ -803 +804 @@
  if ($1.constant)
          {
-         int cond=$1.compare(ExtValue::zero());
-         if (!((cond==0)||(cond==2)))
+         ExtValue::CompareResult  cond=$1.compare(ExtValue::zero());
+         if (!resultIsRelaxedEqual(cond))
                  {
                  $1.counter=1;
@@ -831 +832 @@
          if (!($1.constant && $1.counter==1))
                  {
-                 int cond=$4.compare(ExtValue::zero());
-                 bool value=!((cond==0)||(cond==2));
+                 ExtValue::CompareResult cond=$4.compare(ExtValue::zero());
+                 bool value=!resultIsRelaxedEqual(cond);
                  trstack.adjust(-1);
                  trctx.out->printf("push %d\n",value);
@@ -854 +855 @@
                          trctx.emitLine(); $$.assign=$2.assign; $$.parens=0; $$.ident=0;
                          if ($2.constant)
-                                 {$$.constant=1; int res=$2.compare(ExtValue((paInt)0)); $$.setInt((res==0)||(res==2));}
+                                 {$$.constant=1; ExtValue::CompareResult res=$2.compare(ExtValue((paInt)0)); $$.setInt(resultIsRelaxedEqual(res));}
                          else
                                 {trctx.out->printf("setif ~=,s0,s0\n");}
@@ -1427 +1428 @@
         {
         result.constant=1;
-        int cmp=arg1.compare(arg2);
+        ExtValue::CompareResult cmp=arg1.compare(arg2);
         ExtValue::CmpContext context;
         context.v1=&arg1;
@@ -1458 +1459 @@
 }
 
+static bool resultIsRelaxedEqual(ExtValue::CompareResult res)
+{
+return (res==ExtValue::ResultEqual)||(res==ExtValue::ResultEqualUnordered)||(res==ExtValue::ResultUnequal_RelaxedEqual);
+}
+
 bool variableOk(TokenValue &tok, const TokenValue& var,int &loc)
 {