maj lexer

src/main/antlr/TurtleLexer.g

@@ -26,4 +26,6 @@ G: '"'
 // Whitespaces are ignored.
 fragment WS: (' ' | '\n' | '\t' | '\r' | '\u000C');
 WSS: WS+ { skip(); };
-ID: ('a'..'z'|'A'..'Z')('a'..'z'|'A'..'Z'|'0'..'9'|'_')*;
+ID: ('a'..'z'|'A'..'Z')('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'-')*;
+STRING: ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|' '|'-'|'é'|'è'|'&')+;
+//STRING: '"'(~('"'))+'"';

src/main/antlr/TurtleParser.g

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

src/main/java/TP1/TurtleAST.java

@@ -52,10 +52,12 @@ public class TurtleAST {
 
     public void addSujet(String sujet){
         this.currentSujet=sujet;
+        System.out.println("debug : sujet = " + sujet);
     }
 
     public void addVerbe(String verbe){
         this.currentVerbe=verbe;
+        System.out.println("debug : verbe = " + verbe);
     }
 
     public void addComplement(String complement, Boolean isText){
@@ -64,6 +66,8 @@ public class TurtleAST {
         EntityImp c = new EntityImp(complement, isText);
         PhraseImp phrase = new PhraseImp(s,v,c);
         this.listPhrases.add(phrase);
+        System.out.println("debug : complement = " + complement);
+
     }
 
     public void finishNtriple(){