From 863e357d3520f5507cefac951c61ddc5b1755d64 Mon Sep 17 00:00:00 2001
From: trochas <thibaut.rochas@etudiant.univ-rennes.fr>
Date: Fri, 14 Feb 2025 13:12:20 +0100
Subject: [PATCH] bug lexer, ID/STRING

---
 src/main/antlr/TurtleParser.g | 16 ++++++++--------
 tests/test2.ttl               |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/antlr/TurtleParser.g b/src/main/antlr/TurtleParser.g
index 701ea42..321ebf1 100644
--- a/src/main/antlr/TurtleParser.g
+++ b/src/main/antlr/TurtleParser.g
@@ -35,8 +35,8 @@ moreBloc [TurtleAST parent] : bloc[parent]
    |
    ;
 sujet returns[String val]:
-   LC en=entity RC //<entity>
-   {$val = $en.val;}
+   LC enS=entity RC //<entity>
+   {$val = $enS.val;}
    ;
 listvc [TurtleAST parent]  :
    vc[parent] more[parent] //<verbe> (;<verbe>)*
@@ -56,14 +56,14 @@ morec [TurtleAST parent] : V listc[parent] //correction : listc au lieux de comp
    |
    ;
 verbe returns[String val] :
-   i=ID
-   {$val = $i.text;}
+   enV=entity
+   {$val = $enV.val;}
     ;     
 comp[TurtleAST parent] :
-   LC i=ID RC //<ID>
-   {parent.addComplement($i.text,false);}
-   | G i=STRING G //"STRING"
-   {parent.addComplement($i.text,true);}
+   LC enC=entity RC //<ID>
+   {parent.addComplement($enC.val,false);}
+   | G sC=STRING G //"STRING"
+   {parent.addComplement($sC.text,true);}
     ;    
 entity returns[String val] :
    i=ID
diff --git a/tests/test2.ttl b/tests/test2.ttl
index 29d56f7..c03c586 100755
--- a/tests/test2.ttl
+++ b/tests/test2.ttl
@@ -1,6 +1,6 @@
 <m1info>	<type>		<formation> ;
 		<intitule>	"Master 1 en informatique" ;
-		<niveau>	"M1" ;
+		<niveau>	"M1A";
 		<responsable>	<Derrien> ;
 		<parcours>	<m1infoGL>, <m1infoSR>, <m1infoRI> .
 <m1infoGL>	<type>		<parcours> ;