Add property write expressions to the EasyScript grammar.

skinny85 · Oct 22, 2023 · d1b2045 · d1b2045
1 parent e05ff78
commit d1b2045
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/part-13/src/main/antlr/com/endoflineblog/truffle/part_13/parsing/antlr/EasyScript.g4 b/part-13/src/main/antlr/com/endoflineblog/truffle/part_13/parsing/antlr/EasyScript.g4
@@ -25,6 +25,7 @@ subroutine_decl : name=ID '(' args=func_args ')' '{' stmt* '}' ;
 func_args : (ID (',' ID)* )? ;
 
 expr1 : ID '=' expr1                                       #AssignmentExpr1
+      | object=expr5 '.' ID '=' rvalue=expr1               #PropertyWriteExpr1
       | arr=expr5 '[' index=expr1 ']' '=' rvalue=expr1     #ArrayIndexWriteExpr1
       | expr2                                              #PrecedenceTwoExpr1
       ;

diff --git a/...-13/src/main/java/com/endoflineblog/truffle/part_13/nodes/exprs/objects/ThisExprNode.java b/...-13/src/main/java/com/endoflineblog/truffle/part_13/nodes/exprs/objects/ThisExprNode.java
@@ -1,10 +1,9 @@
 package com.endoflineblog.truffle.part_13.nodes.exprs.objects;
 
 import com.endoflineblog.truffle.part_13.nodes.exprs.EasyScriptExprNode;
-import com.endoflineblog.truffle.part_13.runtime.Undefined;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class ThisExprNode extends EasyScriptExprNode {
+public final class ThisExprNode extends EasyScriptExprNode {
     @Override
     public Object executeGeneric(VirtualFrame frame) {
         // because of how we handle calls in FunctionDispatchNode,

diff --git a/...n/java/com/endoflineblog/truffle/part_13/nodes/exprs/properties/PropertyReadExprNode.java b/...n/java/com/endoflineblog/truffle/part_13/nodes/exprs/properties/PropertyReadExprNode.java
@@ -11,7 +11,7 @@
  * Used in code like {@code t.myProp}.
  * Identical to the class with the same name from part 11.
  */
-@NodeChild("target")
+@NodeChild("targetExpr")
 @NodeField(name = "propertyName", type = String.class)
 public abstract class PropertyReadExprNode extends EasyScriptExprNode {
     protected abstract String getPropertyName();

diff --git a/.../java/com/endoflineblog/truffle/part_13/nodes/exprs/properties/PropertyWriteExprNode.java b/.../java/com/endoflineblog/truffle/part_13/nodes/exprs/properties/PropertyWriteExprNode.java
@@ -0,0 +1,24 @@
+package com.endoflineblog.truffle.part_13.nodes.exprs.properties;
+
+import com.endoflineblog.truffle.part_13.exceptions.EasyScriptException;
+import com.endoflineblog.truffle.part_13.nodes.exprs.EasyScriptExprNode;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.NodeField;
+import com.oracle.truffle.api.dsl.Specialization;
+
+/**
+ * The Node for reading properties of objects.
+ * Used in code like {@code t.myProp = 3}.
+ */
+@NodeChild("targetExpr")
+@NodeField(name = "propertyName", type = String.class)
+@NodeChild("rvalueExpr")
+public abstract class PropertyWriteExprNode extends EasyScriptExprNode {
+    protected abstract String getPropertyName();
+
+    @Specialization
+    protected Object writeProperty(Object target, Object rvalue) {
+        throw new EasyScriptException("PropertyWriteExprNode.writeProperty() not implemented yet");
+    }
+}
diff --git a/part-13/src/main/java/com/endoflineblog/truffle/part_13/parsing/EasyScriptTruffleParser.java b/part-13/src/main/java/com/endoflineblog/truffle/part_13/parsing/EasyScriptTruffleParser.java
@@ -31,6 +31,7 @@
 import com.endoflineblog.truffle.part_13.nodes.exprs.objects.NewExprNodeGen;
 import com.endoflineblog.truffle.part_13.nodes.exprs.objects.ThisExprNode;
 import com.endoflineblog.truffle.part_13.nodes.exprs.properties.PropertyReadExprNodeGen;
+import com.endoflineblog.truffle.part_13.nodes.exprs.properties.PropertyWriteExprNodeGen;
 import com.endoflineblog.truffle.part_13.nodes.exprs.variables.GlobalVarAssignmentExprNodeGen;
 import com.endoflineblog.truffle.part_13.nodes.exprs.variables.GlobalVarReferenceExprNodeGen;
 import com.endoflineblog.truffle.part_13.nodes.exprs.variables.LocalVarAssignmentExprNode;
@@ -398,6 +399,8 @@ private EasyScriptExprNode parseExpr1(EasyScriptParser.Expr1Context expr1) {
         }
         if (expr1 instanceof EasyScriptParser.AssignmentExpr1Context) {
             return parseAssignmentExpr((EasyScriptParser.AssignmentExpr1Context) expr1);
+        } else if (expr1 instanceof EasyScriptParser.PropertyWriteExpr1Context) {
+            return this.parsePropertyWriteExpr((EasyScriptParser.PropertyWriteExpr1Context) expr1);
         } else if (expr1 instanceof EasyScriptParser.ArrayIndexWriteExpr1Context) {
             return this.parseArrayIndexWriteExpr((EasyScriptParser.ArrayIndexWriteExpr1Context) expr1);
         } else {
@@ -424,6 +427,13 @@ private EasyScriptExprNode parseAssignmentExpr(EasyScriptParser.AssignmentExpr1C
         }
     }
 
+    private EasyScriptExprNode parsePropertyWriteExpr(EasyScriptParser.PropertyWriteExpr1Context propertyWriteExpr) {
+        return PropertyWriteExprNodeGen.create(
+                this.parseExpr5(propertyWriteExpr.object),
+                this.parseExpr1(propertyWriteExpr.rvalue),
+                propertyWriteExpr.ID().getText());
+    }
+
     private EasyScriptExprNode parseArrayIndexWriteExpr(EasyScriptParser.ArrayIndexWriteExpr1Context arrayIndexWriteExpr) {
         return ArrayIndexWriteExprNodeGen.create(
                 this.parseExpr5(arrayIndexWriteExpr.arr),