(fix) NPE when loading constants in InterpretExpression

killme2008 · killme2008 · commit 797abed1bfab · 2021-09-15T14:07:20.000+08:00
diff --git a/src/main/java/com/googlecode/aviator/InterpretExpression.java b/src/main/java/com/googlecode/aviator/InterpretExpression.java
@@ -47,7 +47,9 @@ private void loadVars(final List<VariableMeta> vars) {
   }
 
   private void loadConstants(final Set<Token<?>> constants, final List<IR> instruments) {
-    InterpretContext ctx = new InterpretContext(this, instruments, getCompileEnv());
+    final Env env = new Env();
+    env.setInstance(this.instance);
+    InterpretContext ctx = new InterpretContext(this, instruments, env);
     for (Token<?> token : constants) {
       final LoadIR loadConstantIR = new LoadIR(this.sourceFile, token, null, false);
       loadConstantIR.evalWithoutDispatch(ctx);
