Merge pull request #2740 from usethesource/fix/global-init

execute global initialization after all the other declarations have finished

Author: jurgenvinju

src/org/rascalmpl/library/lang/rascal/tests/basic/FunctionCachesAndGlobals.rsc

@@ -0,0 +1,9 @@
+module lang::rascal::tests::basic::FunctionCachesAndGlobals
+
+default int f(int _) = 42;
+int x = f(0);
+int f(0) = 0;
+
+test bool globalInitLast() = x == 0;
+
+// test bool noCacheDuringInit() = f(0) == 0;

src/org/rascalmpl/semantics/dynamic/Module.java

@@ -58,8 +58,18 @@ public Result<IValue> interpret(IEvaluator<Result<IValue>> eval) {
 			  List<Toplevel> decls = this.getBody().getToplevels();
 			  eval.__getTypeDeclarator().evaluateDeclarations(decls, eval.getCurrentEnvt(), false);
 
+			  // first everything that is not a global
 			  for (Toplevel l : decls) {
-				l.interpret(eval);
+				if (!l.getDeclaration().isVariable()) {
+					l.interpret(eval);
+				}
+			  }
+
+			  // then the globals which may depend on the previous
+			  for (Toplevel l : decls) {
+				if (l.getDeclaration().isVariable()) {
+					l.interpret(eval);
+				}
 			  }
 			}
 			finally {