Handle more Translation Opcodes

which brings the success rate up to 63%
liblouis · Mar 8, 2024 · 29ce1ff · 29ce1ff
1 parent 8363628
commit 29ce1ff
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/README.org b/README.org
@@ -68,11 +68,11 @@ Run all YAML tests:
 #+BEGIN_SRC shell
   $ LOUIS_TABLE_PATH=~/src/liblouis/tables:~/src/liblouis cargo run -- check --brief ~/src/liblouis/tests/braille-specs/*.yaml ~/src/liblouis/tests/yaml/*.yaml 2> /dev/null
   ================================================================================
-  648317 tests run:
-  333007 successes [51%]
-  277307 failures [43%]
-  25560 expected failures [4%]
-  12443 unexpected successes [2%]
+  654045 tests run:
+  410433 successes [63%]
+  231425 failures [35%]
+  11824 expected failures [2%]
+  363 unexpected successes [0%]
 #+END_SRC
 
 Test the table query functionality:

diff --git a/src/translator.rs b/src/translator.rs
@@ -4,8 +4,8 @@ use trie::Trie;
 
 use crate::parser::{dots_to_unicode, Braille, Direction, Rule};
 
-mod trie;
 mod boundaries;
+mod trie;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct Translation {
@@ -104,15 +104,45 @@ impl TranslationTable {
                     dots: Braille::Explicit(dots),
                     ..
                 }
+                | Rule::Sufword {
+                    chars,
+                    dots: Braille::Explicit(dots),
+                    ..
+                }
+                | Rule::Prfword {
+                    chars,
+                    dots: Braille::Explicit(dots),
+                    ..
+                }
                 | Rule::Begword {
                     chars,
                     dots: Braille::Explicit(dots),
                     ..
                 }
+                | Rule::Begmidword {
+                    chars,
+                    dots: Braille::Explicit(dots),
+                    ..
+                }
+                | Rule::Midword {
+                    chars,
+                    dots: Braille::Explicit(dots),
+                    ..
+                }
+                | Rule::Midendword {
+                    chars,
+                    dots: Braille::Explicit(dots),
+                    ..
+                }
                 | Rule::Endword {
                     chars,
                     dots: Braille::Explicit(dots),
                     ..
+                }
+                | Rule::Partword {
+                    chars,
+                    dots: Braille::Explicit(dots),
+                    ..
                 } => trie.insert(
                     &chars,
                     Translation {