Added endign work in lexer

3 files changed, 45 insertions, 0 deletions

diff --git a/src/test/bw.conflicts b/src/test/bw.conflicts
new file mode 100644
index 0000000..58385d2
--- /dev/null
+++ b/src/test/bw.conflicts
@@ -0,0 +1,25 @@
+
+** Conflict (shift/reduce) in state 2.
+** Token involved: W
+** This state is reached from main after reading:
+
+seq W
+
+** The derivations that appear below have the following common factor:
+** (The question mark symbol (?) represents the spot where the derivations begin to differ.)
+
+main 
+(?)
+
+** In state 2, looking ahead at W, shifting is permitted
+** because of the following sub-derivation:
+
+seq ending EOL 
+    W . W W 
+
+** In state 2, looking ahead at W, reducing production
+** seq -> seq W
+** is permitted because of the following sub-derivation:
+
+seq ending EOL // lookahead token appears because ending can begin with W
+seq W . 
diff --git a/src/test/bw.mly b/src/test/bw.mly
new file mode 100644
index 0000000..8b022bd
--- /dev/null
+++ b/src/test/bw.mly
@@ -0,0 +1,18 @@
+%token B
+%token W
+%token EOL
+
+%start<unit> main
+
+%% 
+
+seq    :                {}
+       | seq B          {}
+       | seq W          {}
+       ;
+
+ending :                {}
+       | W W W          {}
+       ;
+
+main   : seq ending EOL {}
diff --git a/src/test/test.ml b/src/test/test.ml
index a9980e4..a3f4598 100644
--- a/src/test/test.ml
+++ b/src/test/test.ml
@@ -48,6 +48,7 @@ let tests =
   ; "achat",        "aSa(t)"
   ; "ani",          "ani"
   ; "anta",         "@ta"
+  ; "anneaux",      "ano(s)"
   ; "arachide",     "aRaSid°"
   ; "as",           "a(s)"
   ; "asia",         "azia"
@@ -65,6 +66,7 @@ let tests =
   ; "loin",         "Lw5"
   ; "groin",        "gR[w5]"
   ; "hirondelle",   "iR§dEL°"
+  ; "joues",        "ju°(s)"
   ; "pacha",        "paSa"
   ; "péché",        "peSe"
   ; "persai",       "pERsE"