Changeset 382 for cpp/frams/vm

Timestamp:

05/22/15 04:15:14 (10 years ago)

Author:

sz

Message:

Moving frams/virtfile to common/virtfile:

• file references updated (includes, makefile)
• common/virtfile can no longer use the Framsticks specific SString (using std::string instead)

Location:

cpp/frams/vm

Files:

• framscript.l (modified) (2 diffs)
• framscript.y (modified) (2 diffs)

cpp/frams/vm/framscript.l

@@ -76 +76 @@
                     if (end)
                        {
-                       trctx.tmp+=SString(yytext,end-yytext);
-                       framscriptlval.setString(quoteMultiline(trctx.tmp));
+                       trctx.tmp+=string(yytext,end-yytext);
+                       framscriptlval.setString(quoteMultiline(SString(trctx.tmp.c_str())));
                        yyless((end-yytext)+3);
                        BEGIN 0;
@@ -83 +83 @@
                        }
                     else
-                       trctx.tmp+=SString(yytext,yyleng);
+                       trctx.tmp+=string(yytext,yyleng);
                     }
 <multiline>\n       {trctx.line++; trctx.linechanged=true; trctx.tmp+="\n";}

cpp/frams/vm/framscript.y

@@ -526 +526 @@
                    trstack.adjust(+1);
                    }
-           trctx.tmp=0;
+           trctx.tmp="";
            trctx.divertOut();
            //trctx.out->printf("# expr#3\n");
@@ -535 +535 @@
            if (!$7.constant) { trctx.out->printf("inc m0\n"); trstack.adjust(+1); }
            trctx.restoreOut();
-           $$.setString(trctx.tmp);
+           $$.setString(trctx.tmp.c_str());
            //trctx.out->printf("# pseudoblok_statement pos=%d\n",trstack.currentPos());
            }