fix: returns wrong variable names when expression contains new statement, #476

Author: killme2008

src/main/java/com/googlecode/aviator/BaseExpression.java

@@ -17,6 +17,7 @@
 import com.googlecode.aviator.exception.ExpressionNotFoundException;
 import com.googlecode.aviator.lexer.SymbolTable;
 import com.googlecode.aviator.lexer.token.Variable;
+import com.googlecode.aviator.parser.CompileTypes;
 import com.googlecode.aviator.parser.VariableMeta;
 import com.googlecode.aviator.runtime.FunctionArgument;
 import com.googlecode.aviator.runtime.LambdaFunctionBootstrap;
@@ -149,8 +150,8 @@ public Map<String, VariableMeta> getFullNameMetas() {
     for (VariableMeta m : this.vars) {
       final String name = m.getName();
       String[] tmps = Constants.SPLIT_PAT.split(name);
-      if (!m.isInit() && !definedVars.contains(tmps[0]) && !definedVars.contains(name)
-          && m.getFirstIndex() >= 0) {
+      if (!m.isInit() && m.getType() != CompileTypes.Class && !definedVars.contains(tmps[0])
+          && !definedVars.contains(name) && m.getFirstIndex() >= 0) {
         fullNames.put(name, m);
       } else if (m.getFirstIndex() >= 0) {
         // It's defined in current scope

src/main/java/com/googlecode/aviator/parser/CompileTypes.java

@@ -7,5 +7,5 @@
  *
  */
 public enum CompileTypes {
-  Function, Array;
+  Function, Array, Class,
 }

src/main/java/com/googlecode/aviator/parser/ExpressionParser.java

@@ -1565,7 +1565,8 @@ private void newStatement() {
       reportSyntaxError("invalid class name");
     }
     checkVariableName(this.lookhead);
-    getCodeGeneratorWithTimes().onConstant(this.lookhead);
+    getCodeGeneratorWithTimes()
+        .onConstant(this.lookhead.withMeta(Constants.TYPE_META, CompileTypes.Class));
     getCodeGeneratorWithTimes().onMethodParameter(this.lookhead);
     move(true);
 

src/test/java/com/googlecode/aviator/AviatorEvaluatorInstanceCompatibleUnitTest.java

@@ -23,6 +23,12 @@ public void testMaxLoopCount() {
     super.testMaxLoopCount();
   }
 
+  @Override
+  @Test
+  public void testIssue476() {
+    // ignore
+  }
+
   @Override
   @Test
   public void testClassAllowList() {

src/test/java/com/googlecode/aviator/AviatorEvaluatorInstanceUnitTest.java

@@ -25,6 +25,7 @@
 import static org.junit.Assert.fail;
 import java.io.ByteArrayOutputStream;
 import java.math.MathContext;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -58,6 +59,14 @@ public void setup() {
     this.instance = AviatorEvaluator.newInstance();
   }
 
+  @Test
+  public void testIssue476() {
+    Expression expr = instance.compile("let abc = new String('abc');");
+    assertTrue(expr.getVariableFullNames().isEmpty());
+    expr = instance.compile("let abc = new String('abc'); abc + x");
+    assertEquals(expr.getVariableFullNames(), Arrays.asList("x"));
+  }
+
   @SuppressWarnings("unchecked")
   @Test
   public void testIssue466() {