Changeset 489

Timestamp:

03/30/16 17:05:17 (9 years ago)

Author:

Maciej Komosinski

Message:

Fixed iteration of invalid values and objects

File:

• cpp/frams/vm/framscript.y (modified) (1 diff)

cpp/frams/vm/framscript.y

@@ -493 +493 @@
                    trctx.out->printf("dec m0\nmove %s.iterator,m[m0]\n",$4.getString().c_str());
            else
-                   trctx.out->printf("move s%d,m1\ndec m0\nif m1,==,null,:_loop_end_%d\nmove [m1].\"iterator\",m[m0]\n",0,$1.counter);
+                   trctx.out->printf("move s%d,m1\ndec m0\nif ~=,m1,:_loop_end_%d\nmove [m1].\"iterator\",m[m0]\n",0,$1.counter);
            // s0=iterator s1=obj (=obj.iterator)
            trctx.out->printf(":_loop1_%d\n",$1.counter);
            trctx.out->printf(":_loop_%d\n",$1.counter);
            trctx.out->printf("move s0,m1\nmove [m1].\"next\",m2\n");
-           trctx.out->printf("if m2,==,0,:_loop_end_%d\n",$1.counter);
+           trctx.out->printf("if ~=,m2,:_loop_end_%d\n",$1.counter);
            trctx.out->printf("move [m1].\"value\",s%d\n",$3.getInt()-trstack.currentPos());
            }