Disallow reserved words from being storm command names (#1240)

* Disallow reserved words from being storm command names
vertexproject · May 17, 2019 · 0aef7a4 · 0aef7a4
1 parent 58bb924
commit 0aef7a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -18,7 +18,8 @@ Features and Enhancements
 Bugfixes
 --------
 
-- Resolve grammar ambiguity between tag condition filters with value and left join (`#1237 <https://github.com/vertexproject/synapse/pull/1237>`_)
+- Resolve Storm grammar ambiguity between tag condition filters with value and left join. (`#1237 <https://github.com/vertexproject/synapse/pull/1237>`_)
+- Resolve Storm grammar ambiguity to prevent reserved words from being identified as a Storm command. (`#1240 <https://github.com/vertexproject/synapse/pull/1240>`_)
 
 Improved Documentation
 ----------------------

diff --git a/synapse/lib/storm.lark b/synapse/lib/storm.lark
@@ -190,7 +190,7 @@ ABSPROPNOUNIV: PROPS
 RELPROP: /:[$.\w][$.\w:]*/
 
 // The name of a storm command
-CMDNAME: /[a-z][a-z0-9.]+/
+CMDNAME: /\b(?!(break|continue|for|switch|else|elif|if|not|or|and)\b)[a-z][a-z0-9.]+\b/
 
 // The entry point for a $(...) expression
 dollarexpr: _EXPRSTART _WSCOMM? exprcmp _WSCOMM? ")"