Поддержка инстанцирования java-класса с помощью ключевого слова new

Author: aNNiMON

src/main/java/com/annimon/ownlang/lib/ClassDeclarations.java

@@ -1,15 +1,14 @@
 package com.annimon.ownlang.lib;
 
-import com.annimon.ownlang.exceptions.UnknownFunctionException;
 import com.annimon.ownlang.parser.ast.ClassDeclarationStatement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public final class ClassDeclarations {
 
     private static final Map<String, ClassDeclarationStatement> declarations;
     static {
-        declarations = new HashMap<>();
+        declarations = new ConcurrentHashMap<>();
     }
 
     private ClassDeclarations() { }
@@ -22,12 +21,7 @@ public static Map<String, ClassDeclarationStatement> getAll() {
         return declarations;
     }
 
-    public static boolean isExists(String key) {
-        return declarations.containsKey(key);
-    }
-    
     public static ClassDeclarationStatement get(String key) {
-        if (!isExists(key)) throw new UnknownFunctionException(key);
         return declarations.get(key);
     }
 

src/main/java/com/annimon/ownlang/lib/Instantiable.java

@@ -0,0 +1,9 @@
+package com.annimon.ownlang.lib;
+
+/**
+ * Interface for values that supports creating instances with `new` keyword.
+ */
+public interface Instantiable {
+    
+    Value newInstance(Value[] args);
+}

src/main/java/com/annimon/ownlang/modules/java/java.java

@@ -103,7 +103,7 @@ public String toString() {
         }
     }
 
-    private static class ClassValue extends MapValue {
+    private static class ClassValue extends MapValue implements Instantiable {
 
         public static Value classOrNull(Class<?> clazz) {
             if (clazz == null) return NULL;
@@ -162,7 +162,8 @@ private Value isAssignableFrom(Value[] args) {
             return NumberValue.fromBoolean(clazz.isAssignableFrom( ((ClassValue)args[0]).clazz ));
         }
 
-        private Value newInstance(Value[] args) {
+        @Override
+        public Value newInstance(Value[] args) {
             return findConstructorAndInstantiate(args, clazz.getConstructors());
         }
 

src/main/java/com/annimon/ownlang/parser/ast/ObjectCreationExpression.java

@@ -1,5 +1,6 @@
 package com.annimon.ownlang.parser.ast;
 
+import com.annimon.ownlang.exceptions.UnknownClassException;
 import com.annimon.ownlang.lib.*;
 import java.util.Iterator;
 import java.util.List;
@@ -17,6 +18,16 @@ public ObjectCreationExpression(String className, List<Expression> constructorAr
     @Override
     public Value eval() {
         final ClassDeclarationStatement cd = ClassDeclarations.get(className);
+        if (cd == null) {
+            // Is Instantiable?
+            if (Variables.isExists(className)) {
+                final Value variable = Variables.get(className);
+                if (variable instanceof Instantiable) {
+                    return ((Instantiable) variable).newInstance(ctorArgs());
+                }
+            }
+            throw new UnknownClassException(className);
+        }
 
         // Create an instance and put evaluated fields with method declarations
         final ClassInstanceValue instance = new ClassInstanceValue(className);
@@ -30,14 +41,17 @@ public Value eval() {
         }
 
         // Call a constructor
+        instance.callConstructor(ctorArgs());
+        return instance;
+    }
+    
+    private Value[] ctorArgs() {
         final int argsSize = constructorArguments.size();
         final Value[] ctorArgs = new Value[argsSize];
         for (int i = 0; i < argsSize; i++) {
             ctorArgs[i] = constructorArguments.get(i).eval();
         }
-        instance.callConstructor(ctorArgs);
-        
-        return instance;
+        return ctorArgs;
     }
 
     @Override