Changeset 337 for cpp/frams/vm

Timestamp:

03/12/15 04:21:46 (10 years ago)

Author:

Maciej Komosinski

Message:

New math operator semantics: extend mixed int/float to float, forbid number+notnumber

File:

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

cpp/frams/vm/framscript.y

@@ -145 +145 @@
  {
 #ifdef FRAMSCRIPT_GOTO
-trctx.out->printf("jump :%s\n",str($2)); FMprintf("FramScriptCompiler","translate",FMLV_WARN,"goto is not recommended (%s line %d)",(const char*)trctx.srcname,trctx.line); trctx.emitLine();
+trctx.out->printf("jump :%s\n",str($2)); FMprintf("FramScriptCompiler","translate",FMLV_WARN,"goto is not recommended"); trctx.emitLine();
 #else
 trctx.err->printf("goto is not supported\n");return 1;
@@ -1409 +1409 @@
 }
 
-class FramscriptCmpMessageHandler: public ExtValue::CmpMessageHandler
-{
-  public:
-void cmpMessage(SString& msg)
-  {
-  FMprintf("FramScriptCompiler","translate",FMLV_WARN,"%s (%s line %d)",(const char*)msg,(const char*)trctx.srcname,trctx.line);
-  //trctx.err->printf("%s",(const char*)msg);
-  }
-};
-
-static FramscriptCmpMessageHandler framscript_cmp_messages;
-
 bool handleCompare(YYSTYPE& result,const YYSTYPE& arg1,const YYSTYPE& arg2,ExtValue::CmpOperator op,const char* opname)
 {
@@ -1432 +1420 @@
         context.v1=&arg1;
         context.v2=&arg2;
-        context.handler=&framscript_cmp_messages;
         int ret=ExtValue::interpretCompare(op,cmp,&context);
         if (ret<0)
@@ -1528 +1515 @@
 {
 if (t.assign && (!t.parens))
-        FMprintf("FramScriptCompiler","translate",FMLV_WARN,"Assignment used as truth value, use double parens if you really mean it (%s line %d)",(const char*)trctx.srcname,trctx.line);
+        FMprintf("FramScriptCompiler","translate",FMLV_WARN,"Assignment used as truth value, use ((double parens)) if you really mean it");
 }