From 90615e3eb4eb0f9d31ba4faf698a29d9549c1abb Mon Sep 17 00:00:00 2001
From: b21202065 <niels.bauquin@etu.univ-amu.fr>
Date: Fri, 26 Jan 2024 18:19:45 +0100
Subject: [PATCH] dgrdfhg
---
src/l.cfg | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/l.cfg b/src/l.cfg
index e2c8d42..c562d10 100644
--- a/src/l.cfg
+++ b/src/l.cfg
@@ -38,10 +38,10 @@ faire = 'faire';
retour = 'retour';
ecrire = 'ecrire';
lire = 'lire';
-int = 'int';
-boolean = 'boolean';
+int = 'entier';
+boolean = 'bool';
nombre = chiffre+;
-id = alpha alphanum*;
+id = alpha [alpha + chiffre]*;
Ignored Tokens
@@ -57,7 +57,7 @@ exp2 = {egal} exp2 egal exp3 | {inf} exp2 inf exp3 | {exp3} exp3;
exp3 = {add} exp3 add exp4 | {sub} exp3 sub exp4 | {exp4} exp4;
exp4 = {mult} exp4 mult exp5 | {div} exp4 div exp5 | {exp5} exp5;
exp5 = {not} not exp5 | {exp6} exp6;
-exp6 = {parenthesis} gpar exp dpar | {nombre} nombre | {var} var | {vrai} vrai | {faux} faux | {ecrire} ecrire gpar dpar;
+exp6 = {parenthesis} gpar exp dpar | {nombre} nombre | {var} var | {vrai} vrai | {faux} faux | {lire} lire gpar dpar;
var = {id} id | {crochets} id gcro exp dcro;
@@ -72,8 +72,8 @@ ins = {affectation} var egal exp pvirg|
bloc = {accolades} gacc lins dacc;
lins = {lins} ins lins | {epsilon} epsilon;
-lexp = {lexp2} lexp2 | {epsilon} epsilon;
-lexp2 = {virgule} exp virg lexp2 | {exp} exp;
+lexp = {lexp2} exp lexp2 | {epsilon} epsilon;
+lexp2 = {virgule} exp lexp2 | {exp} exp;
type = {boolean} boolean | {int} int;
@@ -82,10 +82,10 @@ typeopt = {type} type | {epsilon} epsilon;
decvar = {var} type id | {tableau} type id gcro nombre dcro;
-decfonc = {fonction} type id gpar [params]: ldecvar dpar [locals]: ldecvar bloc;
+decfonc = {fonction} typeopt id gpar [params]: ldecvar dpar [locals]: ldecvar bloc;
-ldecvar = {listedecvar} ldecvar2 | {epsilon} epsilon;
-ldecvar2 = {listedecvar2} decvar virg ldecvar2 | {decvar} decvar;
+ldecvar = {listedecvar} decvar ldecvar2 | {epsilon} epsilon;
+ldecvar2 = {listedecvar2} virg decvar ldecvar2 | {decvar} decvar;
ldecfonc = {listedecfonc} decfonc ldecfonc | {epsilon} epsilon;
--
GitLab