From e4faaaf8a022fbe2c8c574d2d49155f74aa18a33 Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@chimrod.com>
Date: Mon, 6 Sep 2021 16:13:56 +0200
Subject: Update
---
src/lib/lexer.mll | 1 +
src/lib/prononciation.mly | 3 ++-
src/test/bw.conflicts | 25 -------------------------
src/test/bw.mly | 18 ------------------
src/test/test.ml | 3 +++
5 files changed, 6 insertions(+), 44 deletions(-)
delete mode 100644 src/test/bw.conflicts
delete mode 100644 src/test/bw.mly
(limited to 'src')
diff --git a/src/lib/lexer.mll b/src/lib/lexer.mll
index 50c25a7..592b6ed 100644
--- a/src/lib/lexer.mll
+++ b/src/lib/lexer.mll
@@ -50,6 +50,7 @@ rule letter = parse
| "erf" ending { ERF_ }
| "el" ending { EL_ }
| "ent" ending { ENT_ }
+| "ie" ending { IE_ }
| "ient" ending { IENT_ }
| "x" ending { X_ }
diff --git a/src/lib/prononciation.mly b/src/lib/prononciation.mly
index d367170..75d9d8b 100644
--- a/src/lib/prononciation.mly
+++ b/src/lib/prononciation.mly
@@ -21,6 +21,7 @@
%token ERF_
%token EL_
%token IENT_
+%token IE_
%token Sep
%token A
@@ -84,7 +85,6 @@ letters
| C I { S :: I :: [] }
| C E { S :: letter_e $2 :: [] }
| C U { K :: U :: [] }
- | C U I { K :: I :: [] }
| C U E { K :: E :: [] }
| D { D :: [] }
| D D { D :: [] }
@@ -137,6 +137,7 @@ letters
ending:
| X_ { S::EOL::[]}
| IENT_ { I::T::EOL::[]}
+ | IE_ { I::EOL::[]}
| ENT_ { E::T::EOL::[]}
| ERF_ { E_AGRAVE::R::EOL::[]}
| EL_ { E_AGRAVE::L::EOL::[]}
diff --git a/src/test/bw.conflicts b/src/test/bw.conflicts
deleted file mode 100644
index 58385d2..0000000
--- a/src/test/bw.conflicts
+++ /dev/null
@@ -1,25 +0,0 @@
-
-** 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
deleted file mode 100644
index 8b022bd..0000000
--- a/src/test/bw.mly
+++ /dev/null
@@ -1,18 +0,0 @@
-%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 9ae698a..49cb9ff 100644
--- a/src/test/test.ml
+++ b/src/test/test.ml
@@ -67,6 +67,7 @@ let tests =
; "besoin", "b2zw5"
; "beaumont", "bom§(t)"
; "bisoux", "bizu(s)"
+ ; "boulangerie", "buL@Z2Ri"
; "casait", "kazE(t)"
; "cassait", "kasE(t)"
; "célibat", "seLiba(t)"
@@ -75,6 +76,7 @@ let tests =
; "chipant", "Sip@(t)"
; "co|incidant", "ko5sid@(t)"
; "croire", "kR[wa]R°"
+ ; "cuillère", "kyijER°"
; "demeure", "d2m9R°"
; "diag|nostic", "d[ja]gnostik"
; "ébrouas", "ebRua(s)"
@@ -105,6 +107,7 @@ let tests =
; "plan", "pL@"
; "plat", "pLa(t)"
; "platte", "pLat°"
+ ; "quille", "kij°"
; "soin", "sw5"
; "souris", "suRi(s)"
; "toiture", "t[wa]tyR°"
--
cgit v1.2.3