From bef20735994736ac4382fe1d6be339b88d0a97bd Mon Sep 17 00:00:00 2001 From: trochas Date: Tue, 1 Apr 2025 18:17:52 +0200 Subject: [PATCH] correction bug Op --- src/main/antlr/.antlr/VSLLexer.java | 2 +- src/main/antlr/.antlr/VSLParser.java | 10 +++++----- src/main/antlr/VSLParser.g | 8 ++++---- src/main/java/TP2/asd/Interface.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/antlr/.antlr/VSLLexer.java b/src/main/antlr/.antlr/VSLLexer.java index b065b3a..d1cf93a 100644 --- a/src/main/antlr/.antlr/VSLLexer.java +++ b/src/main/antlr/.antlr/VSLLexer.java @@ -1,4 +1,4 @@ -// Generated from /home/tuanvu/Desktop/M1/S8/PDS/tp2-vsl-pds/src/main/antlr/VSLLexer.g by ANTLR 4.13.1 +// Generated from c:/Users/Thibaut/Documents/Git/PDS/tp2-vsl-pds/src/main/antlr/VSLLexer.g by ANTLR 4.13.1 package TP2; diff --git a/src/main/antlr/.antlr/VSLParser.java b/src/main/antlr/.antlr/VSLParser.java index 7dc7eab..49b9618 100644 --- a/src/main/antlr/.antlr/VSLParser.java +++ b/src/main/antlr/.antlr/VSLParser.java @@ -1,4 +1,4 @@ -// Generated from /home/tuanvu/Desktop/M1/S8/PDS/tp2-vsl-pds/src/main/antlr/VSLParser.g by ANTLR 4.13.1 +// Generated from c:/Users/Thibaut/Documents/Git/PDS/tp2-vsl-pds/src/main/antlr/VSLParser.g by ANTLR 4.13.1 package TP2; import TP2.asd.Program.*; @@ -383,8 +383,8 @@ public class VSLParser extends Parser { ((ExpressionContext)_localctx).out = new BinopExpression( switch(((ExpressionContext)_localctx).op.getType()) { - case PLUS -> PLUS; - case MINUS -> MINUS; + case PLUS -> Op.PLUS; + case MINUS -> Op.MINUS; default -> throw new IllegalArgumentException("Unknown operator"); }, ((ExpressionContext)_localctx).left.out, @@ -476,8 +476,8 @@ public class VSLParser extends Parser { ((Td_expressionContext)_localctx).out = new Program.BinopExpression( switch(((Td_expressionContext)_localctx).op.getType()) { - case TIMES -> TIMES; - case DIV -> DIV; + case TIMES -> Op.TIMES; + case DIV -> Op.DIV; default -> throw new IllegalArgumentException("Unknown operator"); }, ((Td_expressionContext)_localctx).left.out, diff --git a/src/main/antlr/VSLParser.g b/src/main/antlr/VSLParser.g index 7233134..d9f6331 100644 --- a/src/main/antlr/VSLParser.g +++ b/src/main/antlr/VSLParser.g @@ -67,8 +67,8 @@ expression [SymTable table] returns [Type return_Type, Expression out]: (op=(PLUS | MINUS) right=td_expression[table] { $out = new BinopExpression( switch($op.getType()) { - case PLUS -> PLUS; - case MINUS -> MINUS; + case PLUS -> Op.PLUS; + case MINUS -> Op.MINUS; default -> throw new IllegalArgumentException("Unknown operator"); }, $left.out, @@ -86,8 +86,8 @@ td_expression [SymTable table] returns [Type return_Type, Expression out]: (op=(TIMES | DIV) right=lit { $out = new Program.BinopExpression( switch($op.getType()) { - case TIMES -> TIMES; - case DIV -> DIV; + case TIMES -> Op.TIMES; + case DIV -> Op.DIV; default -> throw new IllegalArgumentException("Unknown operator"); }, $left.out, diff --git a/src/main/java/TP2/asd/Interface.java b/src/main/java/TP2/asd/Interface.java index 8812369..898e8d6 100644 --- a/src/main/java/TP2/asd/Interface.java +++ b/src/main/java/TP2/asd/Interface.java @@ -29,7 +29,7 @@ public interface Interface{ public String prettyprinter(); } - public enum Op {PLUS, MINUS, TIMES,DIV} + public enum Op {PLUS, MINUS, TIMES, DIV} //Eval public interface ExprEval extends ExprVisitor, Integer> {