diff --git a/CHANGES b/CHANGES index 990a840f50..814e9b69eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.6-626 | 2019-07-18 19:44:31 -0700 + + * Remove unused expression type tag: EXPR_MATCH (Jon Siwek, Corelight) + + * Add missing expr_name: vector_coerce (Jon Siwek, Corelight) + 2.6-624 | 2019-07-16 16:07:59 +0000 * Redo README. We now have separate plain text and Markdown versions. diff --git a/VERSION b/VERSION index 38097559ee..bdb9e158ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-624 +2.6-626 diff --git a/src/Expr.cc b/src/Expr.cc index f63277b936..9fa85b6686 100644 --- a/src/Expr.cc +++ b/src/Expr.cc @@ -27,7 +27,7 @@ const char* expr_name(BroExprTag t) "&", "|", "^", "&&", "||", "<", "<=", "==", "!=", ">=", ">", "?:", "ref", - "=", "~", "[]", "$", "?$", "[=]", + "=", "[]", "$", "?$", "[=]", "table()", "set()", "vector()", "$=", "in", "<<>>", "()", "event", "schedule", diff --git a/src/Expr.h b/src/Expr.h index 4e929bdf16..d1959ac071 100644 --- a/src/Expr.h +++ b/src/Expr.h @@ -28,7 +28,6 @@ typedef enum { EXPR_COND, EXPR_REF, EXPR_ASSIGN, - EXPR_MATCH, EXPR_INDEX, EXPR_FIELD, EXPR_HAS_FIELD, EXPR_RECORD_CONSTRUCTOR,