Simplify negations

Author: ansd

deps/rabbit/src/rabbit_amqp_filter_jms.erl

@@ -162,39 +162,19 @@ eval0({'between', Expr, From, To}, Msg) ->
     FromVal = eval0(From, Msg),
     ToVal = eval0(To, Msg),
     between(Value, FromVal, ToVal);
-eval0({'not_between', Expr, From, To}, Msg) ->
-    case eval0({'between', Expr, From, To}, Msg) of
-        true -> false;
-        false -> true;
-        _ -> undefined
-    end;
 
 eval0({'in', Expr, ValueList}, Msg) ->
     Value = eval0(Expr, Msg),
     is_in(Value, ValueList);
-eval0({'not_in', Expr, ValueList}, Msg) ->
-    case eval0({'in', Expr, ValueList}, Msg) of
-        true -> false;
-        false -> true;
-        _ -> undefined
-    end;
 
 eval0({'is_null', Expr}, Msg) ->
     eval0(Expr, Msg) =:= undefined;
-eval0({'is_not_null', Expr}, Msg) ->
-    eval0(Expr, Msg) =/= undefined;
 
 eval0({'like', Expr, {pattern, Pattern}}, Msg) ->
     Subject = eval0(Expr, Msg),
     case is_binary(Subject) of
         true -> like(Subject, Pattern);
         false -> undefined
-    end;
-eval0({'not_like', Expr, Pattern}, Msg) ->
-    case eval0({'like', Expr, Pattern}, Msg) of
-        true -> false;
-        false -> true;
-        _ -> undefined
     end.
 
 %% "Comparison or arithmetic with an unknown value always yields an unknown value."
@@ -361,9 +341,7 @@ transform_ast(Ast0, JmsSelector) ->
           fun({identifier, Ident})
                 when is_binary(Ident) ->
                   {identifier, rabbit_amqp_util:section_field_name_to_atom(Ident)};
-             ({Op, _Ident, _Pattern, _Escape} = Node)
-               when Op =:= 'like' orelse
-                    Op =:= 'not_like' ->
+             ({'like', _Ident, _Pattern, _Escape} = Node) ->
                   transform_pattern_node(Node);
              (Node) ->
                   Node

deps/rabbit/src/rabbit_jms_selector_parser.erl

@@ -1600,7 +1600,7 @@ yeccpars2_49_(__Stack0) ->
  [___4,___3,___2,___1 | __Stack] = __Stack0,
  [begin
 
-    {'not_like', ___1, process_like_pattern(___4), no_escape}
+    {'not', {'like', ___1, process_like_pattern(___4), no_escape}}
   end | __Stack].
 
 -compile({inline,yeccpars2_51_/1}).
@@ -1611,7 +1611,7 @@ yeccpars2_51_(__Stack0) ->
  [___6,___5,___4,___3,___2,___1 | __Stack] = __Stack0,
  [begin
 
-    {'not_like', ___1, process_like_pattern(___4), process_escape_char(___6)}
+    {'not', {'like', ___1, process_like_pattern(___4), process_escape_char(___6)}}
   end | __Stack].
 
 -compile({inline,yeccpars2_54_/1}).
@@ -1651,7 +1651,7 @@ yeccpars2_57_(__Stack0) ->
 yeccpars2_58_(__Stack0) ->
  [___6,___5,___4,___3,___2,___1 | __Stack] = __Stack0,
  [begin
-                                                          {'not_in', ___1, lists:uniq(___5)}
+                                                          {'not', {'in', ___1, lists:uniq(___5)}}
   end | __Stack].
 
 -compile({inline,yeccpars2_61_/1}).
@@ -1661,7 +1661,7 @@ yeccpars2_58_(__Stack0) ->
 yeccpars2_61_(__Stack0) ->
  [___6,___5,___4,___3,___2,___1 | __Stack] = __Stack0,
  [begin
-                                                                                  {'not_between', ___1, ___4, ___6}
+                                                                                  {'not', {'between', ___1, ___4, ___6}}
   end | __Stack].
 
 -compile({inline,yeccpars2_62_/1}).
@@ -1823,7 +1823,7 @@ yeccpars2_85_(__Stack0) ->
 yeccpars2_86_(__Stack0) ->
  [___4,___3,___2,___1 | __Stack] = __Stack0,
  [begin
-                                                    {'is_not_null', ___1}
+                                                    {'not', {'is_null', ___1}}
   end | __Stack].
 
 

deps/rabbit/src/rabbit_jms_selector_parser.yrl

@@ -67,28 +67,28 @@ comparison_expr -> additive_expr : '$1'.
 
 %% BETWEEN expression
 between_expr -> additive_expr 'BETWEEN' additive_expr 'AND' additive_expr : {'between', '$1', '$3', '$5'}.
-between_expr -> additive_expr 'NOT' 'BETWEEN' additive_expr 'AND' additive_expr : {'not_between', '$1', '$4', '$6'}.
+between_expr -> additive_expr 'NOT' 'BETWEEN' additive_expr 'AND' additive_expr : {'not', {'between', '$1', '$4', '$6'}}.
 
 %% LIKE expression
 like_expr -> additive_expr 'LIKE' string :
     {'like', '$1', process_like_pattern('$3'), no_escape}.
 like_expr -> additive_expr 'LIKE' string 'ESCAPE' string :
     {'like', '$1', process_like_pattern('$3'), process_escape_char('$5')}.
 like_expr -> additive_expr 'NOT' 'LIKE' string :
-    {'not_like', '$1', process_like_pattern('$4'), no_escape}.
+    {'not', {'like', '$1', process_like_pattern('$4'), no_escape}}.
 like_expr -> additive_expr 'NOT' 'LIKE' string 'ESCAPE' string :
-    {'not_like', '$1', process_like_pattern('$4'), process_escape_char('$6')}.
+    {'not', {'like', '$1', process_like_pattern('$4'), process_escape_char('$6')}}.
 
 %% IN expression
 in_expr -> additive_expr 'IN' '(' string_list ')' : {'in', '$1', lists:uniq('$4')}.
-in_expr -> additive_expr 'NOT' 'IN' '(' string_list ')' : {'not_in', '$1', lists:uniq('$5')}.
+in_expr -> additive_expr 'NOT' 'IN' '(' string_list ')' : {'not', {'in', '$1', lists:uniq('$5')}}.
 string_list -> string_item : ['$1'].
 string_list -> string_item ',' string_list : ['$1'|'$3'].
 string_item -> string : extract_value('$1').
 
 %% IS NULL expression
 is_null_expr -> identifier_expr 'IS' 'NULL' : {'is_null', '$1'}.
-is_null_expr -> identifier_expr 'IS' 'NOT' 'NULL' : {'is_not_null', '$1'}.
+is_null_expr -> identifier_expr 'IS' 'NOT' 'NULL' : {'not', {'is_null', '$1'}}.
 
 %% Arithmetic expressions
 additive_expr -> additive_expr '+' multiplicative_expr : {'+', '$1', '$3'}.