Déclaration et affichage

spf.lark

@@ -1,66 +1,66 @@
 start: (instruction)*
 
-instruction: type declaration TERMINAL
-		   | assignation TERMINAL
+instruction: declaration ";"
+		   | assignation ";"
+		   | SHOW_KW expression ("," expression)* ";" -> afficher
+		   | ADD_KW expression "dans" VARIABLE ";"
 		   | controls
-		   | SHOW_KW expression ("," expression)* TERMINAL
-		   | ADD_KW expression "dans" VARIABLE TERMINAL
 
-expression: expressionleft // TODO: priorité des op certainement fausse
-          | op
+expression: expressionleft // TODO: priorité des operator certainement fausse
+          | operator
 
 expressionleft: literal 
               | list
               | range
-			  | VARIABLE
+			  | VARIABLE -> variable
+			  | "(" expression ")"
 
-op: expressionleft SAME_OP expression
+//any -> bool
+operator: expressionleft SAME_OP expression
   | expressionleft DIFF_OP expression
+//bool -> bool
   | expressionleft AND_OP expression
   | expressionleft OR_OP expression
   | NOT_OP expression
+//int -> bool
   | expressionleft LT_OP expression
   | expressionleft LE_OP expression
   | expressionleft GT_OP expression
   | expressionleft GE_OP expression
-  | expressionleft operator expression
+//int -> int
+  | expressionleft PLUS_OP expression
+  | expressionleft MINUS_OP expression
+  | expressionleft TIMES_OP expression
+  | expressionleft DIVIDE_OP expression
   | NEG_OP expression
+// string/list -> string/list
   | expressionleft CONC_OP expression
-  | expressionleft ("[" expression "]" | range)
   | SIZE_OP expression
-  | "(" expression ")"
 
-type: BOOL_TYPE
-	| INT_TYPE 
-	| STR_TYPE
-	| LIST_TYPE
+?type: BOOL_TYPE
+     | INT_TYPE 
+     | STR_TYPE
+     | LIST_TYPE
 
-declaration: VARIABLE (EQUAL_SIGN expression)?
+declaration: type VARIABLE (EQUAL_SIGN expression)?
 
 assignation: VARIABLE EQUAL_SIGN expression
 
-loop: "tant" "que" expression "faire" "{" (instruction)* "}"
-    | "pour" "chaque" type VARIABLE "dans" expression "faire" "{" (instruction)* "}"
+loop: /tant que/ expression "faire" "{" (instruction)* "}"
+    | /pour chaque/ type VARIABLE "dans" expression "faire" "{" (instruction)* "}"
 
-literal: ENTIER
+?literal: ENTIER -> entier
 	   | booleen 
-	   | ESCAPED_STRING
+	   | ESCAPED_STRING -> string
 
-list: "[" expression? ("," expression)* "]"
+list: "[" expression? ("," expression)* "]" 
 
 range: "[" expression? ":" expression? "]"
 
 controls: test
 		| loop
 
-test: "si" expression "alors" "{" instruction* "}"
-    | "si" expression "alors" "{" instruction* "}" "sinon" "{" instruction* "}"
-
-
-operator: PLUS_OP
-		| MINUS_OP
-		| TIMES_OP
-		| DIVIDE_OP // TODO: not complete
+test: "si" expression "alors" "{" instruction* "}" ("sinon" "{" instruction* "}")?
 
 TERMINAL: ";"
 
@@ -71,8 +71,8 @@ EQUAL_SIGN: "="
 
 ENTIER: /0|[1-9][0-9]*/
 
-booleen: TRUE_KW 
-	   | FALSE_KW
+?booleen: TRUE_KW  -> true
+	   | FALSE_KW -> false
 
 BOOL_TYPE: "booléen"
 INT_TYPE: "entier"
@@ -80,7 +80,7 @@ STR_TYPE: "texte"
 LIST_TYPE: "liste"
 
 SAME_OP: "==" | "vaut"
-DIFF_OP: "!=" | "ne" "vaut" "pas"
+DIFF_OP: "!=" | /ne vaut pas/ 
 
 AND_OP: "et"
 OR_OP: "ou"