Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 21:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move Location to zeek::detail and BroObj to zeek

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 13:09:43 -07:00
parent 58c6e10b62
commit 40ecede4ea
41 changed files with 158 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rule-parse.y
View file

@ -104,7 +104,7 @@ rule_list:
rule:
TOK_SIGNATURE TOK_IDENT
{
Location l(current_rule_file, rules_line_number+1, 0, 0, 0);
zeek::detail::Location l(current_rule_file, rules_line_number+1, 0, 0, 0);
current_rule = new Rule(yylval.str, l);
}
'{' rule_attr_list '}'
@ -440,7 +440,7 @@ void rules_error(const char* msg, const char* addl)
void rules_error(Rule* r, const char* msg)
{
const Location& l = r->GetLocation();
const zeek::detail::Location& l = r->GetLocation();
reporter->Error("Error in signature %s (%s:%d): %s\n",
r->ID(), l.filename, l.first_line, msg);
rule_matcher->SetParseError();