Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 04:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'topic/robin/record-table-default' into topic/robin/logging-internals

Browse source 
Includes additional fixes for the &default attribute's type checking.
This commit is contained in:
Robin Sommer 2011-04-17 12:03:58 -07:00
commit c132506203
146 changed files with 14037 additions and 7258 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/parse.y
View file

@ -100,6 +100,7 @@ extern Expr* g_curr_debug_expr;
Expr* bro_this = 0;
int in_init = 0;
int in_record = 0;
bool in_debug = false;
bool resolving_global_ID = false;
bool defining_global_ID = false;
@ -711,10 +712,10 @@ type:
$$ = new SetType($3, 0);
}
| TOK_RECORD '{' type_decl_list '}'
| TOK_RECORD '{' { ++in_record; } type_decl_list { --in_record; } '}'
{
set_location(@1, @4);
$$ = new RecordType($3);
set_location(@1, @5);
$$ = new RecordType($4);
}
| TOK_UNION '{' type_list '}'
@ -812,7 +813,7 @@ type_decl:
TOK_ID ':' type opt_attr ';'
{
set_location(@1, @5);
$$ = new TypeDecl($3, $1, $4);
$$ = new TypeDecl($3, $1, $4, (in_record > 0));
}
;