From 11a124a640eec03606dbb6107e576d3ba8d450d8 Mon Sep 17 00:00:00 2001 From: Vu Tuan Minh Date: Fri, 25 Apr 2025 15:04:51 +0200 Subject: [PATCH] change to varImp --- src/main/antlr/VSLParser.g | 12 ++++++------ src/main/java/TP2/asd/PrettyprinterVisitor.java | 1 - src/main/java/TP2/llvm/Interface.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/antlr/VSLParser.g b/src/main/antlr/VSLParser.g index 7211c7f..044fc97 100644 --- a/src/main/antlr/VSLParser.g +++ b/src/main/antlr/VSLParser.g @@ -38,19 +38,19 @@ prototypes returns [ArrayList out] ; proto returns [Prototype out]: - PROTOTYPE t=type i=ident ParO v=vars_locaux ParF + PROTOTYPE t=type i=ident ParO v=liste_param ParF { $out=new PrototypeImp($t.return_type,$i.out, $v.out); } ; -vars_locaux returns [ArrayList out] +liste_param returns [ArrayList out] @init{ - $out = new ArrayList(); + $out = new ArrayList(); }: ( - (ii1=ident {$out.add($ii1.out);}) - (VIRGULE ii2=ident {$out.add($ii2.out);})* + (ii1=ident {$out.add(new VarImp($ii1.out));}) + (VIRGULE ii2=ident {$out.add(new VarImp($ii2.out));})* )* ; @@ -64,7 +64,7 @@ functions returns [ArrayList out] ; function returns [Function out]: - FUNCTION t=type i=ident ParO vars_locaux ParF instr= instruction + FUNCTION t=type i=ident ParO liste_param ParF instr= instruction { $out=new FunctionImp($t.return_type, $i.out, $vars_locaux.out, $instr.out); } diff --git a/src/main/java/TP2/asd/PrettyprinterVisitor.java b/src/main/java/TP2/asd/PrettyprinterVisitor.java index 1127c41..1f0a6fa 100644 --- a/src/main/java/TP2/asd/PrettyprinterVisitor.java +++ b/src/main/java/TP2/asd/PrettyprinterVisitor.java @@ -42,7 +42,6 @@ public class PrettyprinterVisitor implements ProgramVisitor, str+=", "; } } - return str+")"; } diff --git a/src/main/java/TP2/llvm/Interface.java b/src/main/java/TP2/llvm/Interface.java index 30c6bf6..69ea46e 100644 --- a/src/main/java/TP2/llvm/Interface.java +++ b/src/main/java/TP2/llvm/Interface.java @@ -11,7 +11,7 @@ public interface Interface { public interface ProgramLLVMVisitor { public S visitProgramLLVM(ProgramLLVMImpl prog, H h); } - + //////////DefineLLVM (function) public interface DefineLLVM{ public S accept(DefineLLVMVisitor v, H h);