ça marche git add *!

README.md

@@ -9,7 +9,9 @@ turtle ::= Turtle(phrase*)
 phrase 	::= Phrase(entity, aff*)
 aff ::= Aff(ntity, complement*)
 complement ::= Complement(entity) 
-		| Complement_Text(String)
+		| Complement_Text(text)
+text ::= Text(entity)
+		|TextSTR(String)
 entity ::= Entity(String)
 ```
 
@@ -25,8 +27,12 @@ aff ::= Aff(entity, complement*)
 			complement*.v = entity.val
 complement ::= Complement(entity) 
 			complement.c = entity.val
-		| Complement_Text(String)
+		| Complement_Text(text)
-			complement.c = String.self
+			complement.c = text.val
+text ::= Text(entity)
+			text.val = entity.val
+		|TextSTR(String)
+			text.val = String.self
 entity ::= Entity(String)
 			entity.val=String.self
 

src/main/antlr/TurtleParser.g

@@ -62,9 +62,15 @@ verbe returns[String val] :
 comp[TurtleAST parent] :
    LC enC=entity RC //<ID>
    {parent.addComplement($enC.val,false);}
-   | G sC=STRING G //"STRING"
+   | G text[parent] G //"STRING" ou "ID"
+    ;
+text[TurtleAST parent] :
+   sC=STRING
    {parent.addComplement($sC.text,true);}
-    ;    
+   |enC2=entity
+   {parent.addComplement($enC2.val,true);}
+    ;
+
 entity returns[String val] :
    i=ID
    {$val = $i.text;}

tests/test2.ttl

@@ -1,6 +1,6 @@
 <m1info>	<type>		<formation> ;
 		<intitule>	"Master 1 en informatique" ;
-		<niveau>	"M1A";
+		<niveau>	"M1";
 		<responsable>	<Derrien> ;
 		<parcours>	<m1infoGL>, <m1infoSR>, <m1infoRI> .
 <m1infoGL>	<type>		<parcours> ;