Changeset 382 for cpp/frams/vm/framscript.l

Timestamp:

05/22/15 04:15:14 (9 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)

File:

• cpp/frams/vm/framscript.l (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";}