c/crafting-interpreters
1
Fork 0
Code Issues Releases Activity

[tlox] Add support for comparisons

Browse Source
This commit is contained in:
ctsk
2022-09-13 19:05:17 +02:00
parent a93b1018ca
commit ed8f945f7f
10 changed files with 103 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/LoxExpressionNode.java
View File

@@ -1,9 +1,19 @@
package xyz.ctsk.lox.nodes;
import com.oracle.truffle.api.dsl.TypeSystem;
import com.oracle.truffle.api.dsl.TypeSystemReference;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
@TypeSystemReference(LoxTypes.class)
public abstract class LoxExpressionNode extends LoxNode {
public abstract double executeDouble(VirtualFrame frame);
public double executeDouble(VirtualFrame frame) throws UnexpectedResultException {
return LoxTypesGen.expectDouble(executeGeneric(frame));
}
public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
return LoxTypesGen.expectBoolean(executeGeneric(frame));
}
public abstract Object executeGeneric(VirtualFrame frame);
}

2
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/LoxRootNode.java
View File

@@ -15,6 +15,6 @@ public class LoxRootNode extends RootNode {
@Override
public Object execute(VirtualFrame frame) {
return this.exprNode.executeDouble(frame);
return this.exprNode.executeGeneric(frame);
}
}

7
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/LoxTypes.java Normal file
View File

@@ -0,0 +1,7 @@
package xyz.ctsk.lox.nodes;
import com.oracle.truffle.api.dsl.TypeSystem;
@TypeSystem({double.class, boolean.class})
public abstract class LoxTypes {
}

18
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/expr/LoxGreaterNode.java Normal file
View File

@@ -0,0 +1,18 @@
package xyz.ctsk.lox.nodes.expr;
import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import xyz.ctsk.lox.LoxException;
public abstract class LoxGreaterNode extends LoxBinaryNode {
@Specialization
public boolean greater(double left, double right) {
return left > right;
}
@Fallback
protected Object typeError(Object left, Object right) {
throw LoxException.typeError(this, left, right);
}
}

18
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/expr/LoxGreaterOrEqualNode.java Normal file
View File

@@ -0,0 +1,18 @@
package xyz.ctsk.lox.nodes.expr;
import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import xyz.ctsk.lox.LoxException;
public abstract class LoxGreaterOrEqualNode extends LoxBinaryNode {
@Specialization
public boolean greaterOrEqual(double left, double right) {
return left >= right;
}
@Fallback
protected Object typeError(Object left, Object right) {
throw LoxException.typeError(this, left, right);
}
}

18
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/expr/LoxLessNode.java Normal file
View File

@@ -0,0 +1,18 @@
package xyz.ctsk.lox.nodes.expr;
import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import xyz.ctsk.lox.LoxException;
public abstract class LoxLessNode extends LoxBinaryNode {
@Specialization
public boolean less(double left, double right) {
return left < right;
}
@Fallback
protected Object typeError(Object left, Object right) {
throw LoxException.typeError(this, left, right);
}
}

18
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/expr/LoxLessOrEqualNode.java Normal file
View File

@@ -0,0 +1,18 @@
package xyz.ctsk.lox.nodes.expr;
import com.oracle.truffle.api.dsl.Fallback;
import com.oracle.truffle.api.dsl.Specialization;
import xyz.ctsk.lox.LoxException;
public abstract class LoxLessOrEqualNode extends LoxBinaryNode {
@Specialization
public boolean lessOrEqual(double left, double right) {
return left <= right;
}
@Fallback
protected Object typeError(Object left, Object right) {
throw LoxException.typeError(this, left, right);
}
}

4
jlox/tlox/src/main/java/xyz/ctsk/lox/nodes/expr/LoxNumberLiteralNode.java
View File

@@ -10,10 +10,6 @@ public class LoxNumberLiteralNode extends LoxExpressionNode {
this.value = value;
}
public double executeDouble(VirtualFrame frame) {
return this.value;
}
@Override
public Object executeGeneric(VirtualFrame frame) {
return this.value;

4
jlox/tlox/src/main/java/xyz/ctsk/lox/parser/LoxNodeFactory.java
View File

@@ -16,6 +16,10 @@ public class LoxNodeFactory {
case "-" -> LoxSubNodeGen.create(left, right);
case "*" -> LoxMulNodeGen.create(left, right);
case "/" -> LoxDivNodeGen.create(left, right);
case "<" -> LoxLessNodeGen.create(left, right);
case "<=" -> LoxLessOrEqualNodeGen.create(left, right);
case ">" -> LoxGreaterNodeGen.create(left, right);
case ">=" -> LoxGreaterOrEqualNodeGen.create(left, right);
default -> null;
};
}

11
jlox/tlox/src/main/resources/xyz/ctsk/lox/parser/Lox.g4
View File

@@ -28,9 +28,14 @@ file returns [LoxExpressionNode result]
;
expression returns [LoxExpressionNode result]
: literal { $result = $literal.result; }
| left=expression op=( '*' | '/' ) right=expression { $result = factory.createBinaryNode($op, $left.result, $right.result); }
| left=expression op=( '+' | '-' ) right=expression { $result = factory.createBinaryNode($op, $left.result, $right.result); }
: literal
{ $result = $literal.result; }
| left=expression op=( '*' | '/' ) right=expression
{ $result = factory.createBinaryNode($op, $left.result, $right.result); }
| left=expression op=( '+' | '-' ) right=expression
{ $result = factory.createBinaryNode($op, $left.result, $right.result); }
| left=expression op=( LESS | LESS_EQUAL | GREATER | GREATER_EQUAL) right=expression
{ $result = factory.createBinaryNode($op, $left.result, $right.result); }
;
literal returns [LoxExpressionNode result]