Skip to content

Commit

Permalink
Better errors on unknown possible-keywords
Browse files Browse the repository at this point in the history
As raised in #153
This change introduces a clearer and much more verbose error message on
similar invalid pflang input.
  • Loading branch information
Katerina Barone-Adesi committed Apr 14, 2015
1 parent 8800d14 commit 727b37c
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/pf/parse.lua
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ local function tokens(str)
return true
end
local function error_str(message, ...)
local location_error_message = "Error: In expression \"%s\""
local location_error_message = "Pflua parse error: In expression \"%s\""
local start = #location_error_message - 4
local cursor_pos = start + last_pos

Expand Down Expand Up @@ -838,7 +838,16 @@ local function parse_primitive_or_arithmetic(lexer)
-- short for `not host vs and host ace` and which should not be
-- confused with `not (host vs or ace)`." For now we punt on this
-- part of the grammar.
lexer.error('keyword elision not implemented %s', tok)
local msg =
[[%s is not a recognized keyword. Likely causes:
a) %s is a typo, invalid keyword, or similar error.
b) An attempt to use keyword elision.
Repeating the previous keyword is not implemented.
Instead of elision, explicitly use keywords in each clause:
ie, "host a and host b", not "host a and b".]]

local err = string.format(msg, tok, tok)
lexer.error(err)
end

local logical_ops = set('&&', 'and', '||', 'or')
Expand Down

0 comments on commit 727b37c

Please sign in to comment.