Changeset 466 for cpp/frams/vm

Timestamp:

02/07/16 20:49:30 (9 years ago)

Author:

Maciej Komosinski

Message:

• accessing a non-global variable that was declared outside of a function causes a compilation error
• symbolic constant instead of a magic value

File:

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

cpp/frams/vm/framscript.y

@@ -155 +155 @@
 {
 int offset;
-if (trctx.functionstackpos==999)
+if (trctx.functionstackpos==TranslatorContext::NOT_IN_FUNCTION)
         offset=-trstack.currentPos();
 else
@@ -186 +186 @@
 {
 int offset;
-if (trctx.functionstackpos==999)
+if (trctx.functionstackpos==TranslatorContext::NOT_IN_FUNCTION)
         offset=-trstack.currentPos();
 else
@@ -231 +231 @@
 int pos=trstack.currentPos();
 $$.setInt(pos);
-if (trctx.functionstackpos!=999)
+if (trctx.functionstackpos!=TranslatorContext::NOT_IN_FUNCTION)
         {trctx.err->printf("functions cannot be nested\n");return 1;}
+trctx.beforefunctionstackpos=trstack.currentPos();
 }
                             '(' paramlist ')'
@@ -242 +243 @@
 int pos=$3.getInt();
 trstack.dropToPos(pos);
-trctx.functionstackpos=999;
+trctx.functionstackpos=TranslatorContext::NOT_IN_FUNCTION;
+trctx.beforefunctionstackpos=TranslatorContext::NOT_IN_FUNCTION;
 trctx.out->printf(":_skipfun_%d\n",trctx.functiontmplabel);
 trctx.functiontmplabel=-1;
@@ -1455 +1457 @@
 loc=trstack.getVariableLocation(var.getString());
 if (loc != TranslatorStack::NOTFOUND)
-        {tok.setInt(loc); tok.constant=0;
-        return 1;}
+        {
+        if ((trctx.functionstackpos!=TranslatorContext::NOT_IN_FUNCTION)
+            && (loc>=trctx.beforefunctionstackpos))
+                return 0;
+        tok.setInt(loc); tok.constant=0;
+        return 1;
+        }
 return 0;
 }