Changeset 348 for cpp/frams/vm

Timestamp:

04/09/15 23:51:28 (10 years ago)

Author:

Maciej Komosinski

Message:

• explicit c_str() in SString instead of (const char*) cast
• genetic converters and GenMan? are now thread-local which enables multi-threaded simulator separation

Location:

cpp/frams/vm

Files:

• framscript.l (modified) (1 diff)
• framscript.y (modified) (11 diffs)

cpp/frams/vm/framscript.l

@@ -115 +115 @@
 int len=src.len();
 SString ret((len*11)/10+10);
-const char*t=(const char*)src;
+const char*t=src.c_str();
 while(len>0)
         {

cpp/frams/vm/framscript.y

@@ -467 +467 @@
                    {trctx.err->printf("%s can't be iterated\n",str($4)); return 1;}
            if ($4.objname) 
-                   trctx.out->printf("move %s.iterator,m[--m0]\n",(const char*)$4.getString());
+                   trctx.out->printf("move %s.iterator,m[--m0]\n",$4.getString().c_str());
            else
                    trctx.out->printf("move s%d,m1\nmove [m1].\"iterator\",m[--m0]\n",0);
@@ -662 +662 @@
 
        | OBJNAME ':' IDENT    {$$.constant=0; $$.ident=0;
-                              trctx.out->printf("push %s:%s\n",(const char*)$1.getString(),
-                                                 (const char*)$3.getString());
+                              trctx.out->printf("push %s:%s\n",$1.getString().c_str(),
+                                                 $3.getString().c_str());
                               trstack.adjust(-1);
                               }
@@ -688 +688 @@
         trstack.adjust(-1);}
         else if (globalOk($1))
-        { trctx.out->printf("push @%s\n%s @%s\n",(const char*)$1.getString(),
-                            $2.getInt()?"inc":"dec",(const char*)$1.getString());
+        { trctx.out->printf("push @%s\n%s @%s\n",$1.getString().c_str(),
+                            $2.getInt()?"inc":"dec",$1.getString().c_str());
         trstack.adjust(-1);}
         else {badVariable($$,$1); return 1;}
@@ -697 +697 @@
                                 if (!handleAssignOp($$,$1,$3,assign_op_names[$2.getInt()]))
                                 if (globalOk($1)) {SString t="@"; t+=$1.getString();
-                                  handleAssignOp2($$,(const char*)t,$3,assign_op_names[$2.getInt()],0,1);}
+                                  handleAssignOp2($$,t.c_str(),$3,assign_op_names[$2.getInt()],0,1);}
                                 else { badVariable($$,$1); return 1; }
                               }
@@ -895 +895 @@
                   if ($3.constant)
                           {
-                          handleAssignOp2($$,(const char*)t,$5,assign_op_names[$4.getInt()],0,1);
+                          handleAssignOp2($$,t.c_str(),$5,assign_op_names[$4.getInt()],0,1);
                           }
                   else
@@ -902 +902 @@
                           t=$1.getString();t+=".[m1]";
                           trctx.out->printf("move s0,m1\n",str($1));
-                          handleAssignOp2($$,(const char*)t,$5,assign_op_names[$4.getInt()],sp,0);
+                          handleAssignOp2($$,t.c_str(),$5,assign_op_names[$4.getInt()],sp,0);
                           if (sp) {trctx.out->printf("inc m0\n"); trstack.adjust(1);}
                           }
@@ -1008 +1008 @@
      | FUNCTION IDENT
              { trctx.emitLine(); $$.constant=0; $$.ident=0; SString t=":"; t+=$1.getString(); $$.setString(t);
-             trctx.out->printf("push :%s\n",(const char*)$2.getString());
+             trctx.out->printf("push :%s\n",$2.getString().c_str());
              trstack.adjust(-1);
              }
@@ -1053 +1053 @@
                              {sp=1; trctx.out->printf("move s1,m1\n");}
                      t="[m1]."; t+=str($3);
-                     handleAssignOp2($$,(const char*)t,$5,assign_op_names[$4.getInt()],sp,0);
+                     handleAssignOp2($$,t.c_str(),$5,assign_op_names[$4.getInt()],sp,0);
                      if (sp) {trctx.out->printf("inc m0\n");trstack.adjust(1);}
                      }
@@ -1295 +1295 @@
 SString ret((len*11)/10+10);
 ret+='\"';
-const char*t=(const char*)s;
+const char*t=s.c_str();
 while(len>0)
         {
@@ -1464 +1464 @@
 SymTabEntry* found=trstack.globals.find(var.getString());
 if (found) return true;
-return framscriptIsGlobalName(var.getString());
+return framscriptIsGlobalName(var.getString().c_str());
 }
 
@@ -1539 +1539 @@
 else if (globalOk(var))
         {
-        trctx.out->printf("push @%s\n",(const char*)var.getString());
+        trctx.out->printf("push @%s\n",var.getString().c_str());
         trstack.adjust(-1);
         return true;