try to make ?. avaliable in compile mode

ZZZank · Jun 24, 2024 · 7984699 · 7984699
1 parent fb0608b
commit 7984699
Showing 1 changed file with 37 additions and 25 deletions.
diff --git a/common/src/main/java/dev/latvian/mods/rhino/optimizer/BodyCodegen.java b/common/src/main/java/dev/latvian/mods/rhino/optimizer/BodyCodegen.java
@@ -11,6 +11,7 @@
 import dev.latvian.mods.rhino.ast.ScriptNode;
 import dev.latvian.mods.rhino.classfile.ByteCode;
 import dev.latvian.mods.rhino.classfile.ClassFileWriter;
+import lombok.val;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -978,11 +979,9 @@ private void generateExpression(Node node, Node parent) {
 
             case Token.FUNCTION:
                 if (fnCurrent != null || parent.getType() != Token.SCRIPT) {
-                    int fnIndex = node.getExistingIntProp(Node.FUNCTION_PROP);
-                    OptFunctionNode ofn = OptFunctionNode.get(scriptOrFn,
-                        fnIndex
-                    );
-                    int t = ofn.fnode.getFunctionType();
+                    val fnIndex = node.getExistingIntProp(Node.FUNCTION_PROP);
+                    val ofn = OptFunctionNode.get(scriptOrFn, fnIndex);
+                    val t = ofn.fnode.getFunctionType();
                     if (t != FunctionNode.FUNCTION_EXPRESSION &&
                         t != FunctionNode.ARROW_FUNCTION) {
                         throw Codegen.badTree();
@@ -1141,9 +1140,9 @@ private void generateExpression(Node node, Node parent) {
                 break;
 
             case Token.NOT: {
-                int trueTarget = cfw.acquireLabel();
-                int falseTarget = cfw.acquireLabel();
-                int beyond = cfw.acquireLabel();
+                val trueTarget = cfw.acquireLabel();
+                val falseTarget = cfw.acquireLabel();
+                val beyond = cfw.acquireLabel();
                 generateIfJump(child, node, trueTarget, falseTarget);
 
                 cfw.markLabel(trueTarget);
@@ -1234,41 +1233,41 @@ private void generateExpression(Node node, Node parent) {
                 generateExpression(child, node);
                 generateExpression(child.getNext(), node);
                 switch (node.getIntProp(Node.ISNUMBER_PROP, -1)) {
-                    case Node.BOTH:
-                        cfw.add(ByteCode.DADD);
-                        break;
-                    case Node.LEFT:
-                        addOptRuntimeInvoke("add",
-                            "(DLjava/lang/Object;)Ljava/lang/Object;"
-                        );
-                        break;
-                    case Node.RIGHT:
-                        addOptRuntimeInvoke("add",
-                            "(Ljava/lang/Object;D)Ljava/lang/Object;"
-                        );
-                        break;
-                    default:
+                    case Node.BOTH -> cfw.add(ByteCode.DADD);
+                    case Node.LEFT -> addOptRuntimeInvoke(
+                        "add",
+                        "(DLjava/lang/Object;)Ljava/lang/Object;"
+                    );
+                    case Node.RIGHT -> addOptRuntimeInvoke(
+                        "add",
+                        "(Ljava/lang/Object;D)Ljava/lang/Object;"
+                    );
+                    default -> {
                         if (child.getType() == Token.STRING) {
-                            addScriptRuntimeInvoke("add",
+                            addScriptRuntimeInvoke(
+                                "add",
                                 "(Ljava/lang/CharSequence;"
                                     + "Ljava/lang/Object;"
                                     + ")Ljava/lang/CharSequence;"
                             );
                         } else if (child.getNext().getType() == Token.STRING) {
-                            addScriptRuntimeInvoke("add",
+                            addScriptRuntimeInvoke(
+                                "add",
                                 "(Ljava/lang/Object;"
                                     + "Ljava/lang/CharSequence;"
                                     + ")Ljava/lang/CharSequence;"
                             );
                         } else {
                             cfw.addALoad(contextLocal);
-                            addScriptRuntimeInvoke("add",
+                            addScriptRuntimeInvoke(
+                                "add",
                                 "(Ljava/lang/Object;"
                                     + "Ljava/lang/Object;"
                                     + "Ldev/latvian/mods/rhino/Context;"
                                     + ")Ljava/lang/Object;"
                             );
                         }
+                    }
                 }
             }
             break;
@@ -1356,6 +1355,7 @@ private void generateExpression(Node node, Node parent) {
 
             case Token.GETPROP:
             case Token.GETPROPNOWARN:
+            case Token.GETOPTIONAL:
                 visitGetProp(node, child);
                 break;
 
@@ -3976,6 +3976,18 @@ private void visitGetProp(Node node, Node child) {
                     + ")Ljava/lang/Object;"
             );
             return;
+        } else if (node.getType() == Token.GETOPTIONAL) {
+            cfw.addALoad(contextLocal);
+            cfw.addALoad(variableObjectLocal);
+            addScriptRuntimeInvoke(
+                "getObjectPropOptional",
+                "(Ljava/lang/Object;"
+                    + "Ljava/lang/String;"
+                    + "Ldev/latvian/mods/rhino/Context;"
+                    + "Ldev/latvian/mods/rhino/Scriptable;"
+                    + ")Ljava/lang/Object;"
+            );
+            return;
         }
         /*
             for 'this.foo' we call getObjectProp(Scriptable...) which can