Commit b2699837 authored by di68kap's avatar di68kap

Merge remote-tracking branch 'origin/master'

parents c230b2e2 ade77081
......@@ -436,7 +436,7 @@ class EBNFCompiler(CompilerBase):
arg = node.result[-1]
argstr = str(arg)
if arg.parser.name != 'symbol':
node.add_error(('Retrieve Operator "%s" requires a symbols, '
node.add_error(('Retrieve Operator "%s" requires a symbol, '
'and not a %s.') % (prefix, str(arg.parser)))
return str(arg.result)
if str(arg) in self.directives['complement']:
......
......@@ -25,9 +25,9 @@ partext = text | PARSEP
text = cfgtext | brackets
cfgtext = chunk | escaped | WSPC
escaped = /\\[%$&]/
brackets = /[\[\]]/ # left and right square brackets: [ ]
chunk = /[^\\%$&\{\}\[\]\s\n]+/ # some piece of text excluding whitespace,
ESCAPED = /\\[%$&]/
BRACKET = /[\[\]]/ # left or right square bracket: [ ]
TEXTCHUNK = /[^\\%$&\{\}\[\]\s\n]+/ # some piece of text excluding whitespace,
# linefeed and special characters
WSPC = /[ \t]*\n?(?!\s*\n)[ \t]*/ # whitespace, including at most one linefeed
LF = /[ \t]*\n(?!\s*\n)/ # a linefeed, but not an empty line (i.e. par)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment