Allow double quotes in string expressions

Passing tool arguments such as -CFLAGS "blah blah" requires '"'.
skokvermon · Mar 6, 2023 · e75364d · e75364d
1 parent 9395056
commit e75364d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/fusesoc/capi2/exprs.py b/fusesoc/capi2/exprs.py
@@ -12,7 +12,7 @@
   expr ::= word
          | conditional
 
-  word ::= [a-zA-Z0-9:<>.\[\]_-,=~/^+]+    (one or more alphanum/special chars)
+  word ::= [a-zA-Z0-9:<>.\[\]_-,=~/^+"]+    (one or more alphanum/special chars)
 
   conditional ::= condition "?" "(" exprs ")"
 
@@ -75,7 +75,7 @@ def _get_parser():
     if _PARSER is not None:
         return _PARSER
 
-    word = Word(alphanums + "`:<>.[]_-,=~/^+")
+    word = Word(alphanums + '`:<>.[]_-,=~/^+"')
     exprs = Forward()
 
     conditional = (

diff --git a/tests/test_exprs.py b/tests/test_exprs.py
@@ -26,6 +26,7 @@ def test_exprs():
     check_parses_to("a ? (b ? (c))", [(False, "a", [(False, "b", ["c"])])])
     check_parses_to("!a ? (b)", [(True, "a", ["b"])])
     check_parses_to("a b ? (c)", ["a", (False, "b", ["c"])])
+    check_parses_to('a"b"', ['a"b"'])
 
     check_parse_error("!a")
     check_parse_error("a ? b")