diff options
author | Araq <rumpf_a@web.de> | 2014-11-29 14:08:42 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-11-29 14:08:42 +0100 |
commit | c2e04abcfa6c4953820a1d24be8d9655c2c685c7 (patch) | |
tree | 7861e2219a9b5e79d1a64c25d69e388f056d137f | |
parent | 80b83611875383760da40d626a516e794e1245e7 (diff) | |
download | Nim-c2e04abcfa6c4953820a1d24be8d9655c2c685c7.tar.gz |
fixes regression that caused pegs to not compile
-rw-r--r-- | compiler/semexprs.nim | 1 | ||||
-rw-r--r-- | lib/pure/pegs.nim | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 3ca80a9b1..108e21369 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -962,6 +962,7 @@ proc builtinFieldAccess(c: PContext, n: PNode, flags: TExprFlags): PNode = if s != nil: if s.kind in OverloadableSyms: result = symChoice(c, n, s, scClosed) + if result.kind == nkSym: result = semSym(c, n, s, flags) else: markUsed(n.sons[1].info, s) result = semSym(c, n, s, flags) diff --git a/lib/pure/pegs.nim b/lib/pure/pegs.nim index 1ecb9d19e..6eb7dee78 100644 --- a/lib/pure/pegs.nim +++ b/lib/pure/pegs.nim @@ -1467,7 +1467,7 @@ proc builtin(p: var PegParser): Peg = of "W": result = charSet({'\1'..'\xff'} - {'a'..'z','A'..'Z','_','0'..'9'}) of "a": result = charSet({'a'..'z', 'A'..'Z'}) of "A": result = charSet({'\1'..'\xff'} - {'a'..'z', 'A'..'Z'}) - of "ident": result = pegs.ident() + of "ident": result = pegs.ident of "letter": result = unicodeLetter() of "upper": result = unicodeUpper() of "lower": result = unicodeLower() |