Merge branch 'master' of github.com:dictation-toolbox/dragonfly

MANIFEST.in

@@ -21,6 +21,5 @@
 recursive-include dragonfly/examples *.py
 include documentation/*
 exclude .git*
-include dragonfly/parsing/grammar.lark
 include dragonfly/engines/backend_kaldi/kag_version.txt
 include *.txt *.md *.rst

dragonfly/parsing/parse.py

@@ -1,10 +1,31 @@
 from lark import Lark, Transformer
-from ..grammar.elements_basic import Literal, Optional, Sequence, Alternative, Empty
-import os
 
-dir_path = os.path.dirname(os.path.realpath(__file__))
+from dragonfly.grammar.elements_basic import (Literal, Optional, Sequence,
+                                              Alternative, Empty)
 
-spec_parser = Lark.open(os.path.join(dir_path, "grammar.lark"),
+grammar_string = r"""
+?start: alternative
+
+// ? means that the rule will be inlined iff there is a single child
+?alternative: sequence ("|" sequence)*
+?sequence: single*
+         | sequence "{" WORD "}"  -> special
+
+?single: WORD+               -> literal
+      | "<" WORD ">"         -> reference
+      | "[" alternative "]"  -> optional
+      | "(" alternative ")"
+
+// Match anything which is not whitespace or a control character,
+// we will let the engine handle invalid words
+WORD: /[^\s\[\]<>|(){}]+/
+
+%import common.WS_INLINE
+%ignore WS_INLINE
+"""
+
+spec_parser = Lark(
+    grammar_string,
     parser="lalr"
 )