Skip to content

Commit

Permalink
Enhanced.
Browse files Browse the repository at this point in the history
  • Loading branch information
khmarbaise committed May 9, 2024
1 parent e56d5d0 commit 84cbd10
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ public Programm visitGRPUNARY(ExprParser.GRPUNARYContext ctx) {

@Override
public Programm visitComplexVector(ExprParser.ComplexVectorContext ctx) {
ctx.complex().stream().forEach(s -> System.out.println(
ctx.complex().forEach(s -> System.out.println(
"s.realPart() = {" + s.realPart().getText() + " " + s.imagPart().getText() + "}"));
super.visitComplexVector(ctx);
return null;
}

@Override
public Programm visitRealVector(ExprParser.RealVectorContext ctx) {
ctx.REAL().stream().forEach(s -> System.out.println("s.() = {" + s.getText() + "}"));
ctx.REAL().stream().forEach(s -> System.out.println("s.getText() = " + s.getSymbol()));
ctx.REAL().forEach(s -> System.out.println("s.() = {" + s.getText() + "}"));
ctx.REAL().forEach(s -> System.out.println("s.getText() = " + s.getSymbol()));
System.out.println("ctx = " + ctx.REAL());
super.visitRealVector(ctx);
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ExpressionVisitorTest {
static Stream<Arguments> createExpressionToParse() {
return Stream.of(
// arguments("Real", "3.13", 3.13)
// arguments("Complex", "(3.13,1.0)", 3.13)
arguments("Complex", "(3.13,1.0)", 3.13),
arguments("Real Vector", "[1 2 3 4]", 3.13)
// arguments("Complex Vector", "[(1,0) (2,0) (3,0) (4,0)]", 3.13)
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
package com.soebes.expression.ast;

public record BinaryExpression(Operator operator, Expression left, Expression right) implements Expression {
public enum Operator {
ADD("+"),
SUB("-"),
MUL("*"),
DIV("/");
private final String value;

Operator(String value) {
this.value = value;
}

@Override
public String toString() {
return value;
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.soebes.expression.ast;

public enum Operator {
ADD("+"),
SUB("-"),
MUL("*"),
DIV("/");
private final String value;

Operator(String value) {
this.value = value;
}

@Override
public String toString() {
return value;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import com.soebes.expression.ast.Expression;
import org.antlr.v4.runtime.Token;

import static com.soebes.expression.ast.BinaryExpression.Operator.ADD;
import static com.soebes.expression.ast.BinaryExpression.Operator.DIV;
import static com.soebes.expression.ast.BinaryExpression.Operator.MUL;
import static com.soebes.expression.ast.BinaryExpression.Operator.SUB;
import static com.soebes.expression.ast.Operator.ADD;
import static com.soebes.expression.ast.Operator.DIV;
import static com.soebes.expression.ast.Operator.MUL;
import static com.soebes.expression.ast.Operator.SUB;

public class ExpressionVisitor extends SimpleExpressionBaseVisitor<Expression> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@

import java.util.stream.Stream;

import static com.soebes.expression.ast.BinaryExpression.Operator.ADD;
import static com.soebes.expression.ast.BinaryExpression.Operator.DIV;
import static com.soebes.expression.ast.BinaryExpression.Operator.MUL;
import static com.soebes.expression.ast.BinaryExpression.Operator.SUB;
import static com.soebes.expression.ast.Operator.ADD;
import static com.soebes.expression.ast.Operator.DIV;
import static com.soebes.expression.ast.Operator.MUL;
import static com.soebes.expression.ast.Operator.SUB;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

import java.util.stream.Stream;

import static com.soebes.expression.ast.BinaryExpression.Operator.ADD;
import static com.soebes.expression.ast.BinaryExpression.Operator.DIV;
import static com.soebes.expression.ast.BinaryExpression.Operator.MUL;
import static com.soebes.expression.ast.BinaryExpression.Operator.SUB;
import static com.soebes.expression.ast.Operator.ADD;
import static com.soebes.expression.ast.Operator.DIV;
import static com.soebes.expression.ast.Operator.MUL;
import static com.soebes.expression.ast.Operator.SUB;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;

Expand Down

0 comments on commit 84cbd10

Please sign in to comment.