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

Merge remote-tracking branch 'origin' into topic/bernhard/input-threads

Browse source
This commit is contained in:
Bernhard Amann 2012-03-22 12:41:44 -07:00
commit e7f1200f9f
26 changed files with 117 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/parse.y
View file

@ -10,7 +10,7 @@
%token TOK_CONSTANT TOK_COPY TOK_COUNT TOK_COUNTER TOK_DEFAULT TOK_DELETE
%token TOK_DOUBLE TOK_ELSE TOK_ENUM TOK_EVENT TOK_EXPORT TOK_FILE TOK_FOR
%token TOK_FUNCTION TOK_GLOBAL TOK_ID TOK_IF TOK_INT
%token TOK_INTERVAL TOK_LIST TOK_LOCAL TOK_MODULE TOK_MATCH
%token TOK_INTERVAL TOK_LIST TOK_LOCAL TOK_MODULE
%token TOK_NEXT TOK_OF TOK_PATTERN TOK_PATTERN_TEXT
%token TOK_PORT TOK_PRINT TOK_RECORD TOK_REDEF
%token TOK_REMOVE_FROM TOK_RETURN TOK_SCHEDULE TOK_SET
@ -34,7 +34,7 @@
%left ',' '|'
%right '=' TOK_ADD_TO TOK_REMOVE_FROM
%right '?' ':' TOK_USING
%right '?' ':'
%left TOK_OR
%left TOK_AND
%nonassoc '<' '>' TOK_LE TOK_GE TOK_EQ TOK_NE
@ -505,12 +505,6 @@ expr:
$$ = new VectorConstructorExpr($3);
}
| TOK_MATCH expr TOK_USING expr
{
set_location(@1, @4);
$$ = new RecordMatchExpr($2, $4);
}
| expr '(' opt_expr_list ')'
{
set_location(@1, @4);