implementing new

pbalduino · May 6, 2012 · 4581f1e · 4581f1e
1 parent e939f51
commit 4581f1e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/org/dynjs/compiler/DynJSCompiler.java b/src/main/java/org/dynjs/compiler/DynJSCompiler.java
@@ -174,7 +174,7 @@ public static interface Helper {
     }
 
     public static class InternalDynObject extends DynObject {
-        public InternalDynObject(Object prototype, Function function) {
+        public InternalDynObject(Object prototype, Object function) {
             setProperty("prototype", prototype);
             setProperty("call", function);
             setProperty("construct", function);

diff --git a/src/main/java/org/dynjs/parser/Executor.java b/src/main/java/org/dynjs/parser/Executor.java
@@ -17,6 +17,7 @@
 
 import me.qmx.jitescript.CodeBlock;
 import org.antlr.runtime.tree.CommonTree;
+import org.dynjs.compiler.DynJSCompiler;
 import org.dynjs.exception.DynJSException;
 import org.dynjs.parser.statement.*;
 import org.dynjs.runtime.DynThreadContext;
@@ -316,8 +317,9 @@ public Statement executeNew(final Statement statement) {
             @Override
             public CodeBlock getCodeBlock() {
                 return CodeBlock.newCodeBlock()
+                        .aload(DynJSCompiler.Arities.CONTEXT)
                         .append(statement.getCodeBlock())
-                        .invokedynamic("newInstance", sig(Object.class, Object.class), RT.BOOTSTRAP, RT.BOOTSTRAP_ARGS);
+                        .invokedynamic("new", sig(Object.class, DynThreadContext.class, Object.class), RT.BOOTSTRAP, RT.BOOTSTRAP_ARGS);
             }
         };
     }

diff --git a/src/main/java/org/dynjs/runtime/RT.java b/src/main/java/org/dynjs/runtime/RT.java
@@ -16,11 +16,13 @@
 package org.dynjs.runtime;
 
 import org.dynjs.api.Function;
+import org.dynjs.compiler.DynJSCompiler;
 import org.dynjs.runtime.linker.DynJSBootstrapper;
 import org.objectweb.asm.Handle;
 import org.objectweb.asm.Opcodes;
 
 import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.Map;
@@ -34,6 +36,15 @@ public class RT {
             p(DynJSBootstrapper.class), "bootstrap", methodType(CallSite.class,
             MethodHandles.Lookup.class, String.class, MethodType.class).toMethodDescriptorString());
     public static final Object[] BOOTSTRAP_ARGS = new Object[0];
+    public static final MethodHandle CONSTRUCT;
+
+    static {
+        try {
+            CONSTRUCT = MethodHandles.lookup().findStatic(RT.class, "construct", methodType(Object.class, DynThreadContext.class, Object.class));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     public static DynFunction paramPopulator(DynFunction function, Object[] args) {
         String[] parameters = function.getArguments();
@@ -83,4 +94,8 @@ public static String typeof(Object obj) {
 
         return "undefined";
     }
+
+    public static Object construct(DynThreadContext context, Object obj) {
+        return new DynJSCompiler.InternalDynObject(obj, null);
+    }
 }
diff --git a/src/main/java/org/dynjs/runtime/linker/DynJSLinker.java b/src/main/java/org/dynjs/runtime/linker/DynJSLinker.java
@@ -84,6 +84,8 @@ public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerSer
                         .invokeVirtual(lookup(), "typeof");
                 return new GuardedInvocation(typeof, null);
             }
+        } else if ("new".equals(callSiteDescriptor.getName())) {
+            return new GuardedInvocation(RT.CONSTRUCT, null);
         } else if ("eq".equals(callSiteDescriptor.getName()) && argumentsAreNotStrings(linkRequest.getArguments())) {
             targetHandle = lookup().findStatic(ObjectOperations.class, "eq", methodType);
         } else if (isFromDynalink(callSiteDescriptor)) {