predicator 1.1.0 → 1.2.0

data/lib/predicator/parser.rb

@@ -35,91 +35,124 @@ module Predicator
 ##### State transition tables begin ###
 
 racc_action_table = [
-     6,     7,    10,     6,     7,    10,     9,    17,    18,     9,
-     6,     7,    10,    46,    17,    18,     9,    47,    14,    13,
-    15,    14,    13,    15,    28,     6,     7,    10,    14,    13,
-    15,     9,     6,     7,    10,    16,    17,    18,     9,    14,
-    13,    15,    31,    14,    13,    15,    32,    39,    17,    18,
-    14,    13,    15,    -7,    17,    18,    14,    13,    -7,    14,
-    13,    15,    27,    19,    14,    13,    -7,    -7,    22,    23,
-    24,    25,    26,    14,    13,    15,    14,    13,    15,    14,
-    13,    15,    40,    19,    41,    39 ]
+     6,     7,    10,     6,     7,    10,     9,    15,    31,     9,
+     6,     7,    10,     6,     7,    10,     9,    16,    17,     9,
+    16,    17,    14,    16,    17,    14,    52,     6,     7,    10,
+    25,    28,    14,     9,    53,    14,    20,    21,    22,    23,
+    24,    18,    19,    37,    57,    38,    39,    41,    38,    14,
+    26,    27,    16,    17,    37,    38,    56,    39,    41,    37,
+    38,    60,    39,    41,    37,    38,    70,    39,    41,    72,
+    71,    16,    17,    73,    58,    59,    37,    38,    39,    41,
+    61,    52,    37,    37,    38 ]
 
 racc_action_check = [
-     0,     0,     0,     9,     9,     9,     0,    20,    20,     9,
-    10,    10,    10,    42,    29,    29,    10,    42,     0,     0,
-     0,     9,     9,     9,    16,    17,    17,    17,    10,    10,
-    10,    17,    18,    18,    18,     1,    30,    30,    18,    22,
-    22,    22,    19,    17,    17,    17,    21,    26,     1,     1,
-    18,    18,    18,     8,    21,    21,    39,    39,     8,    23,
-    23,    23,    11,     8,    47,    47,     8,     8,    11,    11,
-    11,    11,    11,    24,    24,    24,    25,    25,    25,    41,
-    41,    41,    27,    34,    37,    40 ]
+     0,     0,     0,     9,     9,     9,     0,     1,    15,     9,
+    10,    10,    10,    16,    16,    16,    10,    29,    29,    16,
+     1,     1,     0,    32,    32,     9,    24,    17,    17,    17,
+     8,     8,    10,    17,    25,    16,     8,     8,     8,     8,
+     8,     8,     8,    23,    30,    26,    23,    23,    27,    17,
+     8,     8,    30,    30,    20,    20,    28,    20,    20,    21,
+    21,    48,    21,    21,    22,    22,    62,    22,    22,    64,
+    62,    33,    33,    64,    40,    40,    52,    52,    61,    61,
+    49,    53,    60,    71,    73 ]
 
 racc_action_pointer = [
-    -2,    35,   nil,   nil,   nil,   nil,   nil,   nil,    53,     1,
-     8,    53,   nil,   nil,   nil,   nil,    24,    23,    30,    20,
-    -6,    41,    19,    39,    53,    56,    41,    63,   nil,     1,
-    23,   nil,   nil,   nil,    73,   nil,   nil,    71,   nil,    36,
-    79,    59,     6,   nil,   nil,   nil,   nil,    44,   nil ]
+    -2,     7,   nil,   nil,   nil,   nil,   nil,   nil,    21,     1,
+     8,   nil,   nil,   nil,   nil,     8,    11,    25,   nil,   nil,
+    32,    37,    42,    21,    20,    15,    22,    25,    32,     4,
+    39,   nil,    10,    58,   nil,   nil,   nil,   nil,   nil,   nil,
+    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,    67,
+   nil,   nil,    54,    75,   nil,   nil,   nil,   nil,   nil,   nil,
+    60,    53,    59,   nil,    62,   nil,   nil,   nil,   nil,   nil,
+   nil,    61,   nil,    61,   nil,   nil ]
 
 racc_action_default = [
-   -27,   -27,    -1,    -2,    -3,    -4,    -5,    -6,   -22,   -27,
-   -27,   -27,   -21,   -23,   -24,   -25,   -27,   -27,   -27,   -27,
-    -8,   -27,   -27,   -27,   -27,   -27,   -27,   -27,    49,    -9,
-   -10,   -26,   -11,   -12,   -22,   -13,   -14,   -27,   -16,   -27,
-   -27,   -27,   -27,   -19,   -17,   -15,   -18,   -27,   -20 ]
+   -48,   -48,    -1,    -2,    -3,    -4,    -5,    -6,    -7,   -48,
+   -48,   -14,   -15,   -16,   -46,   -48,   -48,   -48,   -11,   -12,
+   -48,   -48,   -48,   -48,   -48,   -48,   -48,   -48,   -48,    -8,
+   -48,    76,    -9,   -10,   -17,   -23,   -30,   -40,   -41,   -42,
+   -48,   -45,   -18,   -24,   -31,   -19,   -25,   -32,   -48,   -48,
+   -21,   -26,   -48,   -48,   -28,   -29,   -47,   -13,   -43,   -44,
+   -48,   -48,   -48,   -35,   -48,   -38,   -22,   -27,   -20,   -33,
+   -34,   -48,   -37,   -48,   -36,   -39 ]
 
 racc_goto_table = [
-    34,    34,    34,    34,    33,    35,    36,    37,     1,    42,
-    38,   nil,    43,   nil,   nil,   nil,   nil,    20,    21,    34,
-    48,   nil,   nil,    45,    44,    29,    30 ]
+    35,    43,    46,    62,    50,    51,    54,    55,    34,    42,
+    45,    48,     1,    36,    44,    47,    49,    64,   nil,   nil,
+   nil,    29,    30,   nil,   nil,   nil,   nil,   nil,    32,    33,
+   nil,   nil,    65,    66,    67,   nil,   nil,   nil,   nil,   nil,
+    63,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    68,   nil,
+   nil,   nil,   nil,    75,    69,   nil,   nil,   nil,   nil,    74 ]
 
 racc_goto_check = [
-     6,     6,     6,     6,     7,     7,     7,     7,     1,     9,
-     8,   nil,    10,   nil,   nil,   nil,   nil,     1,     1,     6,
-    10,   nil,   nil,     7,     8,     1,     1 ]
+    12,    12,    12,    15,    11,    13,    12,    12,    10,    10,
+    10,    10,     1,    14,    14,    14,    14,    16,   nil,   nil,
+   nil,     1,     1,   nil,   nil,   nil,   nil,   nil,     1,     1,
+   nil,   nil,    12,    11,    13,   nil,   nil,   nil,   nil,   nil,
+    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
+   nil,   nil,   nil,    12,    14,   nil,   nil,   nil,   nil,    10 ]
 
 racc_goto_pointer = [
-   nil,     8,   nil,   nil,   nil,   nil,   -22,   -18,   -16,   -30,
-   -27 ]
+   nil,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   -12,   -20,   -20,   -19,    -7,   -49,   -35,   nil ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,     4,     5,     8,    11,   nil,   nil,
-    12 ]
+   nil,   nil,     2,     3,     4,     5,     8,    11,    12,    13,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 25, :_reduce_5,
-  1, 25, :_reduce_6,
-  1, 25, :_reduce_7,
-  2, 26, :_reduce_8,
-  3, 26, :_reduce_9,
-  3, 26, :_reduce_10,
-  3, 27, :_reduce_11,
-  3, 28, :_reduce_12,
-  3, 28, :_reduce_13,
-  3, 28, :_reduce_14,
-  5, 28, :_reduce_15,
-  3, 28, :_reduce_16,
-  4, 28, :_reduce_17,
-  3, 31, :_reduce_18,
   1, 32, :_reduce_none,
-  3, 32, :_reduce_20,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 33, :_reduce_23,
-  1, 33, :_reduce_24,
-  1, 29, :_reduce_25,
-  3, 29, :_reduce_26 ]
-
-racc_reduce_n = 27
-
-racc_shift_n = 49
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 33, :_reduce_5,
+  1, 33, :_reduce_6,
+  1, 33, :_reduce_7,
+  2, 34, :_reduce_8,
+  3, 34, :_reduce_9,
+  3, 34, :_reduce_10,
+  2, 34, :_reduce_11,
+  2, 34, :_reduce_12,
+  3, 35, :_reduce_13,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  3, 38, :_reduce_17,
+  3, 38, :_reduce_18,
+  3, 38, :_reduce_19,
+  5, 38, :_reduce_20,
+  3, 38, :_reduce_21,
+  4, 38, :_reduce_22,
+  3, 39, :_reduce_23,
+  3, 39, :_reduce_24,
+  3, 39, :_reduce_25,
+  3, 39, :_reduce_26,
+  4, 39, :_reduce_27,
+  3, 39, :_reduce_28,
+  3, 39, :_reduce_29,
+  3, 40, :_reduce_30,
+  3, 40, :_reduce_31,
+  3, 40, :_reduce_32,
+  5, 40, :_reduce_33,
+  3, 42, :_reduce_34,
+  1, 46, :_reduce_none,
+  3, 46, :_reduce_36,
+  3, 44, :_reduce_37,
+  1, 47, :_reduce_none,
+  3, 47, :_reduce_39,
+  1, 41, :_reduce_40,
+  1, 43, :_reduce_41,
+  1, 45, :_reduce_42,
+  2, 45, :_reduce_43,
+  2, 45, :_reduce_44,
+  1, 48, :_reduce_45,
+  1, 37, :_reduce_46,
+  3, 37, :_reduce_47 ]
+
+racc_reduce_n = 48
+
+racc_shift_n = 76
 
 racc_token_table = {
   false => 0,
@@ -142,11 +175,19 @@ racc_token_table = {
   :LT => 17,
   :BETWEEN => 18,
   :IN => 19,
-  :INTEGER => 20,
-  :STRING => 21,
-  :IDENTIFIER => 22 }
-
-racc_nt_base = 23
+  :PRESENT => 20,
+  :BLANK => 21,
+  :INTEGER => 22,
+  :STRING => 23,
+  :IDENTIFIER => 24,
+  :DATE => 25,
+  :DURATION => 26,
+  :AGO => 27,
+  :FROMNOW => 28,
+  :STARTSWITH => 29,
+  :ENDSWITH => 30 }
+
+racc_nt_base = 31
 
 racc_use_result_var = false
 
@@ -187,9 +228,17 @@ Racc_token_to_s_table = [
   "LT",
   "BETWEEN",
   "IN",
+  "PRESENT",
+  "BLANK",
   "INTEGER",
   "STRING",
   "IDENTIFIER",
+  "DATE",
+  "DURATION",
+  "AGO",
+  "FROMNOW",
+  "STARTSWITH",
+  "ENDSWITH",
   "$start",
   "predicate",
   "boolean_predicate",
@@ -197,10 +246,17 @@ Racc_token_to_s_table = [
   "group_predicate",
   "comparison_predicate",
   "variable",
-  "value",
-  "array",
-  "array_contents",
-  "literal" ]
+  "integer_comparison_predicate",
+  "string_comparison_predicate",
+  "date_comparison_predicate",
+  "integer",
+  "integer_array",
+  "string",
+  "string_array",
+  "date",
+  "integer_array_contents",
+  "string_array_contents",
+  "duration" ]
 
 Racc_debug_parser = false
 
@@ -241,60 +297,140 @@ def _reduce_10(val, _values)
 end
 
 def _reduce_11(val, _values)
- AST::Group.new val[1] 
+ AST::Present.new val.first 
 end
 
 def _reduce_12(val, _values)
- AST::Equal.new val.first, val.last 
+ AST::Blank.new val.first 
 end
 
 def _reduce_13(val, _values)
- AST::GreaterThan.new val.first, val.last 
+ AST::Group.new val[1] 
 end
 
-def _reduce_14(val, _values)
- AST::LessThan.new val.first, val.last 
-end
+# reduce 14 omitted
 
-def _reduce_15(val, _values)
- AST::Between.new val.first, val[2], val.last 
-end
+# reduce 15 omitted
 
-def _reduce_16(val, _values)
- AST::In.new val.first, val.last 
-end
+# reduce 16 omitted
 
 def _reduce_17(val, _values)
- AST::NotIn.new val.first, val.last 
+ AST::IntegerEqual.new val.first, val.last 
 end
 
 def _reduce_18(val, _values)
- AST::Array.new val[1] 
+ AST::IntegerGreaterThan.new val.first, val.last 
 end
 
-# reduce 19 omitted
+def _reduce_19(val, _values)
+ AST::IntegerLessThan.new val.first, val.last 
+end
 
 def _reduce_20(val, _values)
- [val.first, val.last].flatten 
+ AST::IntegerBetween.new val.first, val[2], val.last 
 end
 
-# reduce 21 omitted
+def _reduce_21(val, _values)
+ AST::IntegerIn.new val.first, val.last 
+end
 
-# reduce 22 omitted
+def _reduce_22(val, _values)
+ AST::IntegerNotIn.new val.first, val.last 
+end
 
 def _reduce_23(val, _values)
- AST::String.new val.first 
+ AST::StringEqual.new val.first, val.last 
 end
 
 def _reduce_24(val, _values)
- AST::Integer.new val.first.to_i 
+ AST::StringGreaterThan.new val.first, val.last 
 end
 
 def _reduce_25(val, _values)
- AST::Variable.new val.first 
+ AST::StringLessThan.new val.first, val.last 
 end
 
 def _reduce_26(val, _values)
+ AST::StringIn.new val.first, val.last 
+end
+
+def _reduce_27(val, _values)
+ AST::StringNotIn.new val.first, val.last 
+end
+
+def _reduce_28(val, _values)
+ AST::StringStartsWith.new val.first, val.last 
+end
+
+def _reduce_29(val, _values)
+ AST::StringEndsWith.new val.first, val.last 
+end
+
+def _reduce_30(val, _values)
+ AST::DateEqual.new val.first, val.last 
+end
+
+def _reduce_31(val, _values)
+ AST::DateGreaterThan.new val.first, val.last 
+end
+
+def _reduce_32(val, _values)
+ AST::DateLessThan.new val.first, val.last 
+end
+
+def _reduce_33(val, _values)
+ AST::DateBetween.new val.first, val[2], val.last 
+end
+
+def _reduce_34(val, _values)
+ AST::IntegerArray.new val[1] 
+end
+
+# reduce 35 omitted
+
+def _reduce_36(val, _values)
+ [val.first, val.last].flatten 
+end
+
+def _reduce_37(val, _values)
+ AST::StringArray.new val[1] 
+end
+
+# reduce 38 omitted
+
+def _reduce_39(val, _values)
+ [val.first, val.last].flatten 
+end
+
+def _reduce_40(val, _values)
+ AST::Integer.new val.first.to_i 
+end
+
+def _reduce_41(val, _values)
+ AST::String.new val.first 
+end
+
+def _reduce_42(val, _values)
+ AST::Date.new val.first 
+end
+
+def _reduce_43(val, _values)
+ AST::DateAgo.new val.first 
+end
+
+def _reduce_44(val, _values)
+ AST::DateFromNow.new val.first 
+end
+
+def _reduce_45(val, _values)
+ AST::Duration.new val.first 
+end
+
+def _reduce_46(val, _values)
+ AST::Variable.new val.first 
+end
+
+def _reduce_47(val, _values)
  AST::Variable.new [val.first, val.last].flatten.join(".") 
 end
 

data/lib/predicator/parser.y

@@ -4,8 +4,10 @@ options no_result_var
 
 token TRUE FALSE LPAREN RPAREN LBRACKET RBRACKET
       BANG NOT DOT COMMA AT AND OR
-      EQ GT LT BETWEEN IN
+      EQ GT LT BETWEEN IN PRESENT BLANK
       INTEGER STRING IDENTIFIER
+      DATE DURATION AGO FROMNOW
+      STARTSWITH ENDSWITH
 
 rule
   predicate
@@ -23,32 +25,67 @@ rule
     : BANG predicate            { AST::Not.new val.last }
     | predicate AND predicate   { AST::And.new val.first, val.last }
     | predicate OR predicate    { AST::Or.new val.first, val.last }
+    | variable PRESENT          { AST::Present.new val.first }
+    | variable BLANK            { AST::Blank.new val.first }
     ;
   group_predicate
     : LPAREN predicate RPAREN   { AST::Group.new val[1] }
     ;
   comparison_predicate
-    : value EQ value                { AST::Equal.new val.first, val.last }
-    | value GT value                { AST::GreaterThan.new val.first, val.last }
-    | value LT value                { AST::LessThan.new val.first, val.last }
-    | value BETWEEN value AND value { AST::Between.new val.first, val[2], val.last }
-    | value IN array                { AST::In.new val.first, val.last }
-    | value NOT IN array            { AST::NotIn.new val.first, val.last }
+    : integer_comparison_predicate
+    | string_comparison_predicate
+    | date_comparison_predicate
     ;
-  array
-    : LBRACKET array_contents RBRACKET { AST::Array.new val[1] }
+  integer_comparison_predicate
+    : variable EQ integer                      { AST::IntegerEqual.new val.first, val.last }
+    | variable GT integer                      { AST::IntegerGreaterThan.new val.first, val.last }
+    | variable LT integer                      { AST::IntegerLessThan.new val.first, val.last }
+    | variable BETWEEN integer AND integer     { AST::IntegerBetween.new val.first, val[2], val.last }
+    | variable IN integer_array                { AST::IntegerIn.new val.first, val.last }
+    | variable NOT IN integer_array            { AST::IntegerNotIn.new val.first, val.last }
     ;
-  array_contents
-    : literal
-    | array_contents COMMA literal  { [val.first, val.last].flatten }
+  string_comparison_predicate
+    : variable EQ string                       { AST::StringEqual.new val.first, val.last }
+    | variable GT string                       { AST::StringGreaterThan.new val.first, val.last }
+    | variable LT string                       { AST::StringLessThan.new val.first, val.last }
+    | variable IN string_array                 { AST::StringIn.new val.first, val.last }
+    | variable NOT IN string_array             { AST::StringNotIn.new val.first, val.last }
+    | variable STARTSWITH string               { AST::StringStartsWith.new val.first, val.last }
+    | variable ENDSWITH string                 { AST::StringEndsWith.new val.first, val.last }
     ;
-  value
-    : literal
-    | variable
+  date_comparison_predicate
+    : variable EQ date                         { AST::DateEqual.new val.first, val.last }
+    | variable GT date                         { AST::DateGreaterThan.new val.first, val.last }
+    | variable LT date                         { AST::DateLessThan.new val.first, val.last }
+    | variable BETWEEN date AND date           { AST::DateBetween.new val.first, val[2], val.last }
     ;
-  literal
+  integer_array
+    : LBRACKET integer_array_contents RBRACKET { AST::IntegerArray.new val[1] }
+    ;
+  integer_array_contents
+    : integer
+    | integer_array_contents COMMA integer     { [val.first, val.last].flatten }
+    ;
+  string_array
+    : LBRACKET string_array_contents RBRACKET  { AST::StringArray.new val[1] }
+    ;
+  string_array_contents
+    : string
+    | string_array_contents COMMA string       { [val.first, val.last].flatten }
+    ;
+  integer
+    : INTEGER                   { AST::Integer.new val.first.to_i }
+    ;
+  string
     : STRING                    { AST::String.new val.first }
-    | INTEGER                   { AST::Integer.new val.first.to_i }
+    ;
+  date
+    : DATE                      { AST::Date.new val.first }
+    | duration AGO              { AST::DateAgo.new val.first }
+    | duration FROMNOW          { AST::DateFromNow.new val.first }
+    ;
+  duration
+    : DURATION                  { AST::Duration.new val.first }
     ;
   variable
     : IDENTIFIER                { AST::Variable.new val.first }