gitlab-zoql 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca281035447bc28813574e9680f05af39465972ab945f5ef1e5e4ac1eb20c31c
-  data.tar.gz: 864e281a1289c3862b368c9258219f1ef8c73a15cd36d2de1e03cd9b273b8818
+  metadata.gz: 192588dd18190685a4996fe85d28fdc4baf3b5d7f63506800c2aa9e6dff8712d
+  data.tar.gz: 59e7fe4b691b6fb392cb5b6db40dec6804c5b166a3a71e903c73453b6ef2ff24
 SHA512:
-  metadata.gz: ae376415208f17886d3d9fb37468a91a524b6235a6d1ca62feeacd5395e72f98099e99c6510c65fc1a2583d6e70fecbd4d5a5ed9e597624dd5c0f1cda7af895e
-  data.tar.gz: 4488d937464b5cadcbd8db633b9204b407a0fd935662f1eb948ae0aafd944a665e010ea527c0811719f3e3f38e379824bacc596d8c5cf5a8f7fd94f6e6c9cdec
+  metadata.gz: 33dd78a002bbbfb414221e1b4c40fd65371797da8708a83443561b50ed2a47f6642d80a98fc5defa3b44e4923367fe7cd8db88849d0ba782c1785b3e20f0801c
+  data.tar.gz: 3acb7050eff754bc0577433711f7b39195729562efa2888a2a1117fe9cf8fb43c7aa5a473a1dedf132ff17a3e62aa693670d9c98cd3b55a8af4d2ef88dbdeb2f

data/lib/gitlab-zoql/parser/parser.racc.rb

@@ -13,7 +13,7 @@ require File.dirname(__FILE__) + '/parser.rex.rb'
 module GitlabZOQL
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 155)
+module_eval(<<'...end parser.racc/module_eval...', 'parser.racc', 140)
 
 def self.parse(zoql)
   new.scan_str(zoql)
@@ -22,198 +22,162 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -55,     6,    67,   -55,    42,    77,     7,    71,    99,    36,
-    37,    67,    31,    42,    34,    75,    71,    38,    39,   -57,
-    17,    22,    35,    25,    75,    27,   -55,    29,    30,    17,
-    22,    46,    25,    67,    27,    42,    29,    30,    71,    45,
-    44,    47,    67,    48,    42,    50,    75,    71,    90,    91,
-    53,    17,    22,    54,    25,    75,    27,    60,    29,    30,
-    17,    22,    61,    25,    62,    27,    24,    29,    30,    20,
-   -54,   -54,   -54,   -54,    42,    77,    85,    20,    60,    85,
-   100,   nil,    17,    22,   nil,    25,   nil,    27,   nil,    29,
-    30,    22,   nil,    25,   nil,    27,    42,    29,    30,    20,
-   nil,   nil,   nil,   nil,   nil,    42,   nil,   nil,    20,   nil,
-   nil,   nil,    17,    22,   nil,    25,   nil,    27,   nil,    29,
-    30,    17,    22,   nil,    25,   nil,    27,    42,    29,    30,
-    20,   nil,   nil,   nil,   nil,   nil,    42,   nil,   nil,    20,
-   nil,   nil,   nil,    17,    22,   nil,    25,   nil,    27,   nil,
-    29,    30,    17,    22,   nil,    25,   nil,    27,    42,    29,
-    30,    20,   nil,   nil,   nil,   nil,   nil,    42,   nil,   nil,
-    71,   nil,   nil,   nil,    17,    22,   nil,    25,    75,    27,
-   nil,    29,    30,    17,    22,   nil,    25,   nil,    27,    42,
-    29,    30,    20,   nil,   nil,   nil,   nil,   nil,    42,   nil,
-    75,    20,   nil,   nil,   nil,    17,    22,   nil,    25,    75,
-    27,   nil,    29,    30,    17,    22,   nil,    25,   nil,    27,
-    42,    29,    30,    20,   nil,   nil,   nil,   nil,   nil,    42,
-   nil,    75,    20,   nil,   nil,   nil,    17,    22,   nil,    25,
-    75,    27,   nil,    29,    30,    17,    22,   nil,    25,   nil,
-    27,    42,    29,    30,    20,   nil,   nil,   nil,   nil,   nil,
-    42,   nil,    75,    20,   nil,   nil,   nil,    17,    22,   nil,
-    25,    75,    27,   nil,    29,    30,    17,    22,    78,    25,
-   nil,    27,   nil,    29,    30,   nil,    79,    80,    81,    82,
-    83,    84 ]
+    23,    35,    36,   -10,   -49,   -28,   -10,   -49,     6,    41,
+    52,   -28,   -28,    63,    17,    21,     7,    24,    41,    26,
+    30,    28,    29,    17,    21,   -49,    24,    41,    26,    33,
+    28,    29,    17,    21,   -51,    24,    41,    26,    34,    28,
+    29,    17,    21,    44,    24,    41,    26,    45,    28,    29,
+    17,    21,    46,    24,    48,    26,    51,    28,    29,    17,
+    21,    41,    24,    52,    26,    79,    28,    29,    52,    52,
+    41,    63,    63,    58,    81,    17,    21,    59,    24,    41,
+    26,    68,    28,    29,    17,    21,    69,    24,    41,    26,
+    52,    28,    29,    17,    21,    69,    24,    41,    26,   nil,
+    28,    29,    17,    21,   nil,    24,    41,    26,   nil,    28,
+    29,    17,    21,   nil,    24,   nil,    26,   nil,    28,    29,
+    17,    21,   nil,    24,   -27,    26,   -29,    28,    29,   -30,
+   -27,   -27,   -29,   -29,   -31,   -30,   -30,   -32,    37,    38,
+   -31,   -31,   nil,   -32,   -32,    71,   nil,    72,    73,    74,
+    75,    76,    43,    42,    35,    36,    35,    36 ]
 
 racc_action_check = [
-    24,     0,    50,    24,    50,    87,     1,    50,    87,    15,
-    15,    71,     7,    71,     8,    50,    71,    16,    16,    10,
-    50,    50,    11,    50,    71,    50,    24,    50,    50,    71,
-    71,    27,    71,    77,    71,    77,    71,    71,    77,    25,
-    25,    29,    85,    30,    85,    33,    77,    85,    78,    78,
-    34,    77,    77,    35,    77,    85,    77,    43,    77,    77,
-    85,    85,    44,    85,    47,    85,     6,    85,    85,     6,
-    14,    14,    14,    14,    17,    63,    65,    17,    88,    89,
-    90,   nil,     6,     6,   nil,     6,   nil,     6,   nil,     6,
-     6,    17,   nil,    17,   nil,    17,    20,    17,    17,    20,
-   nil,   nil,   nil,   nil,   nil,    36,   nil,   nil,    36,   nil,
-   nil,   nil,    20,    20,   nil,    20,   nil,    20,   nil,    20,
-    20,    36,    36,   nil,    36,   nil,    36,    37,    36,    36,
-    37,   nil,   nil,   nil,   nil,   nil,    38,   nil,   nil,    38,
-   nil,   nil,   nil,    37,    37,   nil,    37,   nil,    37,   nil,
-    37,    37,    38,    38,   nil,    38,   nil,    38,    39,    38,
-    38,    39,   nil,   nil,   nil,   nil,   nil,    67,   nil,   nil,
-    67,   nil,   nil,   nil,    39,    39,   nil,    39,    67,    39,
-   nil,    39,    39,    67,    67,   nil,    67,   nil,    67,    79,
-    67,    67,    79,   nil,   nil,   nil,   nil,   nil,    80,   nil,
-    79,    80,   nil,   nil,   nil,    79,    79,   nil,    79,    80,
-    79,   nil,    79,    79,    80,    80,   nil,    80,   nil,    80,
-    81,    80,    80,    81,   nil,   nil,   nil,   nil,   nil,    82,
-   nil,    81,    82,   nil,   nil,   nil,    81,    81,   nil,    81,
-    82,    81,   nil,    81,    81,    82,    82,   nil,    82,   nil,
-    82,    83,    82,    82,    83,   nil,   nil,   nil,   nil,   nil,
-    84,   nil,    83,    84,   nil,   nil,   nil,    83,    83,   nil,
-    83,    84,    83,   nil,    83,    83,    84,    84,    64,    84,
-   nil,    84,   nil,    84,    84,   nil,    64,    64,    64,    64,
-    64,    64 ]
+     6,    15,    15,    12,    23,    80,    12,    23,     0,    17,
+    48,    80,    80,    48,     6,     6,     1,     6,    35,     6,
+     7,     6,     6,    17,    17,    23,    17,    36,    17,     8,
+    17,    17,    35,    35,    10,    35,    37,    35,    11,    35,
+    35,    36,    36,    26,    36,    38,    36,    28,    36,    36,
+    37,    37,    29,    37,    32,    37,    33,    37,    37,    38,
+    38,    71,    38,    34,    38,    71,    38,    38,    68,    69,
+    72,    68,    69,    42,    72,    71,    71,    45,    71,    73,
+    71,    60,    71,    71,    72,    72,    61,    72,    74,    72,
+    63,    72,    72,    73,    73,    77,    73,    75,    73,   nil,
+    73,    73,    74,    74,   nil,    74,    76,    74,   nil,    74,
+    74,    75,    75,   nil,    75,   nil,    75,   nil,    75,    75,
+    76,    76,   nil,    76,    82,    76,    83,    76,    76,    84,
+    82,    82,    83,    83,    85,    84,    84,    86,    16,    16,
+    85,    85,   nil,    86,    86,    65,   nil,    65,    65,    65,
+    65,    65,    24,    24,    56,    56,    57,    57 ]
 
 racc_action_pointer = [
-    -1,     6,   nil,   nil,   nil,   nil,    58,    12,    11,   nil,
-    -7,    -4,   nil,   nil,    50,   -11,    -5,    66,   nil,   nil,
-    88,   nil,   nil,   nil,     0,    12,   nil,     1,   nil,     9,
-    12,   nil,   nil,    41,    42,    45,    97,   119,   128,   150,
-   nil,   nil,   nil,    45,    35,   nil,   nil,    33,   nil,   nil,
-    -4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    66,   273,    66,   nil,   159,   nil,   nil,
-   nil,     5,   nil,   nil,   nil,   nil,   nil,    27,    42,   181,
-   190,   212,   221,   243,   252,    36,   nil,    -4,    66,    69,
-    73,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil ]
+     6,    16,   nil,   nil,   nil,   nil,    -5,    20,    26,   nil,
+    13,    17,     3,   nil,   nil,   -14,   121,     4,   nil,   nil,
+   nil,   nil,   nil,     4,   130,   nil,    18,   nil,    20,    26,
+   nil,   nil,    50,    51,    58,    13,    22,    31,    40,   nil,
+   nil,   nil,    51,   nil,   nil,    51,   nil,   nil,     5,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   139,   141,   nil,   nil,
+    75,    79,   nil,    85,   nil,   137,   nil,   nil,    63,    64,
+   nil,    56,    65,    74,    83,    92,   101,    88,   nil,   nil,
+     5,   nil,   124,   126,   129,   134,   137 ]
 
 racc_action_default = [
-   -68,   -68,    -1,    -2,    -3,    -4,   -68,   -68,    -6,    -7,
-    -8,    -9,   -10,   -39,   -40,   -43,   -46,   -68,   -48,   -49,
-   -68,   -51,   -52,   -53,   -58,   -68,   -61,   -68,   -63,   -67,
-   -68,   101,    -5,   -14,   -68,   -68,   -68,   -68,   -68,   -68,
-   -47,   -54,   -58,   -68,   -68,   -60,   -62,   -65,   -66,   -11,
-   -68,   -12,   -13,   -18,   -55,   -56,   -41,   -42,   -44,   -45,
-   -50,   -59,   -64,   -15,   -68,   -19,   -21,   -68,   -24,   -25,
-   -26,   -68,   -28,   -29,   -36,   -37,   -38,   -68,   -68,   -68,
-   -68,   -68,   -68,   -68,   -68,   -68,   -23,   -68,   -38,   -20,
-   -68,   -17,   -30,   -31,   -32,   -33,   -34,   -35,   -22,   -27,
-   -16 ]
+   -62,   -62,    -1,    -2,    -3,    -4,   -62,   -62,    -6,    -7,
+    -8,    -9,   -44,   -33,   -34,   -37,   -40,   -62,   -42,   -43,
+   -45,   -46,   -47,   -52,   -62,   -55,   -62,   -57,   -61,   -62,
+    87,    -5,   -14,   -62,   -62,   -62,   -62,   -62,   -62,   -41,
+   -44,   -52,   -62,   -54,   -56,   -59,   -60,   -11,   -62,   -12,
+   -13,   -16,   -49,   -50,   -33,   -33,   -37,   -37,   -53,   -58,
+   -15,   -17,   -19,   -62,   -22,   -62,   -25,   -26,   -62,   -62,
+   -21,   -62,   -62,   -62,   -62,   -62,   -62,   -18,   -20,   -23,
+   -44,   -24,   -44,   -44,   -44,   -44,   -44 ]
 
 racc_goto_table = [
-    12,    10,    41,     1,    63,    92,    93,    94,    95,    96,
-    97,    56,    57,     2,    43,    58,    59,     3,     4,     5,
-     8,    41,    41,    41,    41,    87,    32,     9,    11,    33,
-    55,    49,    51,    52,    89,    98,    86,    40,   nil,   nil,
+    12,    10,    61,    54,    55,    56,    57,     1,     2,     3,
+     4,     5,     8,    31,     9,    11,    32,    47,    49,    50,
+    60,    78,    77,    70,    39,   nil,   nil,   nil,   nil,    53,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    88 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    80,    82,    83,    84,    85,
+    86 ]
 
 racc_goto_check = [
-    11,     9,    27,     1,    16,    18,    18,    18,    18,    18,
-    18,    26,    26,     2,    11,    28,    28,     3,     4,     5,
-     6,    27,    27,    27,    27,    16,     7,     8,    10,    12,
-     9,    13,    14,    15,    19,    20,    21,    30,   nil,   nil,
+    11,     9,    17,    22,    22,    24,    24,     1,     2,     3,
+     4,     5,     6,     7,     8,    10,    12,    13,    14,    15,
+    16,    18,    17,    19,    26,   nil,   nil,   nil,   nil,     9,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    11 ]
+   nil,   nil,   nil,   nil,   nil,    11,    11,    11,    11,    11,
+    11 ]
 
 racc_goto_pointer = [
-   nil,     3,    13,    17,    18,    19,    14,    18,    21,    -5,
-    22,    -6,    21,    -2,    -2,    -1,   -46,   nil,   -74,   -43,
-   -50,   -31,   nil,   nil,   nil,   nil,   -25,   -15,   -23,   nil,
-    20,   nil,   nil,   nil,   nil,   nil ]
+   nil,     7,     8,     9,    10,    11,     6,     5,     8,    -5,
+     9,    -6,     8,   -15,   -15,   -14,   -28,   -46,   -48,   -40,
+   nil,   nil,   -32,   nil,   -32,   nil,     7,   nil,   nil,   nil,
+   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    76,   nil,   nil,   nil,   nil,   nil,    73,    64,    65,
-    66,    68,    69,    70,    72,    74,    13,    14,    15,    16,
-    18,    19,    21,    23,    26,    28 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    65,
+   nil,    40,   nil,   nil,   nil,   nil,   nil,   nil,    62,    64,
+    67,    66,    13,    14,    15,    16,    18,    19,    20,    22,
+    25,    27 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 34, :_reduce_none,
-  1, 35, :_reduce_none,
-  1, 36, :_reduce_3,
-  1, 37, :_reduce_none,
-  3, 38, :_reduce_5,
-  2, 38, :_reduce_6,
-  1, 39, :_reduce_7,
-  1, 41, :_reduce_none,
-  1, 41, :_reduce_none,
-  1, 41, :_reduce_none,
-  2, 40, :_reduce_11,
-  2, 45, :_reduce_12,
+  1, 29, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 31, :_reduce_3,
+  1, 32, :_reduce_none,
+  3, 33, :_reduce_5,
+  2, 33, :_reduce_6,
+  1, 34, :_reduce_7,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  2, 35, :_reduce_11,
+  2, 40, :_reduce_12,
+  1, 42, :_reduce_none,
+  0, 41, :_reduce_none,
+  2, 41, :_reduce_15,
+  1, 43, :_reduce_16,
+  1, 44, :_reduce_none,
+  3, 44, :_reduce_18,
+  1, 45, :_reduce_none,
+  3, 45, :_reduce_20,
+  2, 46, :_reduce_21,
+  1, 46, :_reduce_none,
+  3, 48, :_reduce_23,
+  3, 48, :_reduce_24,
+  1, 47, :_reduce_none,
   1, 47, :_reduce_none,
-  0, 46, :_reduce_none,
-  2, 46, :_reduce_15,
-  4, 50, :_reduce_16,
-  3, 50, :_reduce_17,
-  1, 48, :_reduce_18,
-  1, 49, :_reduce_none,
-  3, 49, :_reduce_20,
+  3, 49, :_reduce_27,
+  3, 49, :_reduce_28,
+  3, 49, :_reduce_29,
+  3, 49, :_reduce_30,
+  3, 49, :_reduce_31,
+  3, 49, :_reduce_32,
+  1, 39, :_reduce_none,
+  1, 39, :_reduce_none,
+  3, 50, :_reduce_35,
+  3, 50, :_reduce_36,
+  1, 50, :_reduce_none,
+  3, 52, :_reduce_38,
+  3, 52, :_reduce_39,
   1, 52, :_reduce_none,
-  3, 52, :_reduce_22,
-  2, 53, :_reduce_23,
+  2, 53, :_reduce_41,
   1, 53, :_reduce_none,
   1, 54, :_reduce_none,
+  1, 54, :_reduce_44,
+  1, 55, :_reduce_none,
   1, 55, :_reduce_none,
-  3, 55, :_reduce_27,
   1, 56, :_reduce_none,
   1, 56, :_reduce_none,
-  3, 57, :_reduce_30,
-  3, 57, :_reduce_31,
-  3, 57, :_reduce_32,
-  3, 57, :_reduce_33,
-  3, 57, :_reduce_34,
-  3, 57, :_reduce_35,
+  1, 37, :_reduce_49,
+  3, 38, :_reduce_50,
+  1, 38, :_reduce_none,
+  1, 51, :_reduce_52,
+  3, 51, :_reduce_53,
+  2, 51, :_reduce_54,
   1, 51, :_reduce_none,
-  1, 51, :_reduce_none,
-  1, 58, :_reduce_none,
-  1, 44, :_reduce_none,
-  1, 44, :_reduce_none,
-  3, 59, :_reduce_41,
-  3, 59, :_reduce_42,
-  1, 59, :_reduce_none,
-  3, 61, :_reduce_44,
-  3, 61, :_reduce_45,
-  1, 61, :_reduce_none,
-  2, 62, :_reduce_47,
-  1, 62, :_reduce_none,
-  1, 63, :_reduce_none,
-  3, 63, :_reduce_50,
-  1, 64, :_reduce_none,
-  1, 64, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  1, 42, :_reduce_55,
-  3, 43, :_reduce_56,
-  1, 43, :_reduce_none,
-  1, 60, :_reduce_58,
-  3, 60, :_reduce_59,
-  2, 60, :_reduce_60,
-  1, 60, :_reduce_none,
-  2, 67, :_reduce_62,
-  1, 66, :_reduce_none,
-  3, 68, :_reduce_64,
-  2, 68, :_reduce_65,
-  2, 68, :_reduce_66,
-  1, 68, :_reduce_67 ]
-
-racc_reduce_n = 68
-
-racc_shift_n = 101
+  2, 58, :_reduce_56,
+  1, 57, :_reduce_none,
+  3, 59, :_reduce_58,
+  2, 59, :_reduce_59,
+  2, 59, :_reduce_60,
+  1, 59, :_reduce_61 ]
+
+racc_reduce_n = 62
+
+racc_shift_n = 87
 
 racc_token_table = {
   false => 0,
@@ -221,36 +185,31 @@ racc_token_table = {
   :SELECT => 2,
   :FROM => 3,
   :WHERE => 4,
-  :IS => 5,
-  :NOT => 6,
-  :NULL => 7,
-  :identifier => 8,
-  :OR => 9,
-  :AND => 10,
-  :left_paren => 11,
-  :right_paren => 12,
-  :equals_operator => 13,
-  :not_equals_operator => 14,
-  :less_than_operator => 15,
-  :greater_than_operator => 16,
-  :less_than_or_equals_operator => 17,
-  :greater_than_or_equals_operator => 18,
-  :row_subquery => 19,
-  :plus_sign => 20,
-  :minus_sign => 21,
-  :asterisk => 22,
-  :solidus => 23,
-  :sign => 24,
-  :general_value_specification => 25,
-  :comma => 26,
-  :quote => 27,
-  :character_string_literal => 28,
-  :DATETIME => 29,
-  :datetime_string => 30,
-  :unsigned_integer => 31,
-  :period => 32 }
-
-racc_nt_base = 33
+  :identifier => 5,
+  :OR => 6,
+  :AND => 7,
+  :not_equals_operator => 8,
+  :NULL => 9,
+  :equals_operator => 10,
+  :less_than_operator => 11,
+  :greater_than_operator => 12,
+  :less_than_or_equals_operator => 13,
+  :greater_than_or_equals_operator => 14,
+  :plus_sign => 15,
+  :minus_sign => 16,
+  :asterisk => 17,
+  :solidus => 18,
+  :sign => 19,
+  :general_value_specification => 20,
+  :comma => 21,
+  :quote => 22,
+  :character_string_literal => 23,
+  :DATETIME => 24,
+  :datetime_string => 25,
+  :unsigned_integer => 26,
+  :period => 27 }
+
+racc_nt_base = 28
 
 racc_use_result_var = true
 
@@ -277,21 +236,16 @@ Racc_token_to_s_table = [
   "SELECT",
   "FROM",
   "WHERE",
-  "IS",
-  "NOT",
-  "NULL",
   "identifier",
   "OR",
   "AND",
-  "left_paren",
-  "right_paren",
-  "equals_operator",
   "not_equals_operator",
+  "NULL",
+  "equals_operator",
   "less_than_operator",
   "greater_than_operator",
   "less_than_or_equals_operator",
   "greater_than_or_equals_operator",
-  "row_subquery",
   "plus_sign",
   "minus_sign",
   "asterisk",
@@ -322,15 +276,11 @@ Racc_token_to_s_table = [
   "table_reference",
   "table_name",
   "search_condition",
-  "null_predicate",
-  "row_value_constructor",
   "boolean_term",
   "boolean_factor",
-  "boolean_test",
-  "boolean_primary",
   "predicate",
+  "null_predicate",
   "comparison_predicate",
-  "row_value_constructor_element",
   "numeric_value_expression",
   "general_literal",
   "term",
@@ -416,248 +366,231 @@ module_eval(<<'.,.,', 'parser.racc', 41)
 
 module_eval(<<'.,.,', 'parser.racc', 45)
   def _reduce_16(val, _values, result)
-     result = GitlabZOQL::Parser::Statement::Not.new(GitlabZOQL::Parser::Statement::Is.new(val[0], GitlabZOQL::Parser::Statement::Null.new))
+     result = GitlabZOQL::Parser::Statement::Table.new(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 46)
-  def _reduce_17(val, _values, result)
-     result = GitlabZOQL::Parser::Statement::Is.new(val[0], GitlabZOQL::Parser::Statement::Null.new)
-    result
-  end
-.,.,
+# reduce 17 omitted
 
 module_eval(<<'.,.,', 'parser.racc', 50)
   def _reduce_18(val, _values, result)
-     result = GitlabZOQL::Parser::Statement::Table.new(val[0])
+     result = GitlabZOQL::Parser::Statement::Or.new(val[0], val[2])
     result
   end
 .,.,
 
 # reduce 19 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 55)
+module_eval(<<'.,.,', 'parser.racc', 54)
   def _reduce_20(val, _values, result)
-     result = GitlabZOQL::Parser::Statement::Or.new(val[0], val[2])
+     result = GitlabZOQL::Parser::Statement::And.new(val[0], val[2])
     result
   end
 .,.,
 
-# reduce 21 omitted
-
-module_eval(<<'.,.,', 'parser.racc', 59)
-  def _reduce_22(val, _values, result)
-     result = GitlabZOQL::Parser::Statement::And.new(val[0], val[2])
+module_eval(<<'.,.,', 'parser.racc', 57)
+  def _reduce_21(val, _values, result)
+     result = GitlabZOQL::Parser::Statement::Not.new(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 62)
+# reduce 22 omitted
+
+module_eval(<<'.,.,', 'parser.racc', 61)
   def _reduce_23(val, _values, result)
-     result = GitlabZOQL::Parser::Statement::Not.new(val[1])
+     result = GitlabZOQL::Parser::Statement::Not.new(GitlabZOQL::Parser::Statement::Equals.new(val[0], GitlabZOQL::Parser::Statement::Null.new))
     result
   end
 .,.,
 
-# reduce 24 omitted
-
-# reduce 25 omitted
-
-# reduce 26 omitted
-
-module_eval(<<'.,.,', 'parser.racc', 70)
-  def _reduce_27(val, _values, result)
-     result = val[1]
+module_eval(<<'.,.,', 'parser.racc', 62)
+  def _reduce_24(val, _values, result)
+     result = GitlabZOQL::Parser::Statement::Equals.new(val[0], GitlabZOQL::Parser::Statement::Null.new)
     result
   end
 .,.,
 
-# reduce 28 omitted
+# reduce 25 omitted
 
-# reduce 29 omitted
+# reduce 26 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 77)
-  def _reduce_30(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 69)
+  def _reduce_27(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Equals.new(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 78)
-  def _reduce_31(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 70)
+  def _reduce_28(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Not.new(GitlabZOQL::Parser::Statement::Equals.new(val[0], val[2]))
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 79)
-  def _reduce_32(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 71)
+  def _reduce_29(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Less.new(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 80)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 72)
+  def _reduce_30(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Greater.new(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 81)
-  def _reduce_34(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 73)
+  def _reduce_31(val, _values, result)
      result = GitlabZOQL::Parser::Statement::LessOrEquals.new(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 82)
-  def _reduce_35(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 74)
+  def _reduce_32(val, _values, result)
      result = GitlabZOQL::Parser::Statement::GreaterOrEquals.new(val[0], val[2])
     result
   end
 .,.,
 
-# reduce 36 omitted
+# reduce 33 omitted
 
-# reduce 37 omitted
-
-# reduce 38 omitted
-
-# reduce 39 omitted
+# reduce 34 omitted
 
-# reduce 40 omitted
-
-module_eval(<<'.,.,', 'parser.racc', 96)
-  def _reduce_41(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 81)
+  def _reduce_35(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Add.new(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 97)
-  def _reduce_42(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 82)
+  def _reduce_36(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Subtract.new(val[0], val[2])
     result
   end
 .,.,
 
-# reduce 43 omitted
+# reduce 37 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 101)
-  def _reduce_44(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 86)
+  def _reduce_38(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Multiply.new(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 102)
-  def _reduce_45(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 87)
+  def _reduce_39(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Divide.new(val[0], val[2])
     result
   end
 .,.,
 
-# reduce 46 omitted
+# reduce 40 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 106)
-  def _reduce_47(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 91)
+  def _reduce_41(val, _values, result)
      result = val[0].new(val[1])
     result
   end
 .,.,
 
-# reduce 48 omitted
+# reduce 42 omitted
 
-# reduce 49 omitted
+# reduce 43 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 111)
-  def _reduce_50(val, _values, result)
-     result = val[1]
+module_eval(<<'.,.,', 'parser.racc', 96)
+  def _reduce_44(val, _values, result)
+     result = val[0]
     result
   end
 .,.,
 
-# reduce 51 omitted
+# reduce 45 omitted
 
-# reduce 52 omitted
+# reduce 46 omitted
 
-# reduce 53 omitted
+# reduce 47 omitted
 
-# reduce 54 omitted
+# reduce 48 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 123)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 108)
+  def _reduce_49(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Column.new(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 126)
-  def _reduce_56(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 111)
+  def _reduce_50(val, _values, result)
      result = Array(val[0]) + Array(val[2])
     result
   end
 .,.,
 
-# reduce 57 omitted
+# reduce 51 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 131)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 116)
+  def _reduce_52(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Identifier.new(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 132)
-  def _reduce_59(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 117)
+  def _reduce_53(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Literal.new(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 133)
-  def _reduce_60(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 118)
+  def _reduce_54(val, _values, result)
      result = GitlabZOQL::Parser::Statement::String.new('')
     result
   end
 .,.,
 
-# reduce 61 omitted
+# reduce 55 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 137)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 122)
+  def _reduce_56(val, _values, result)
      result = GitlabZOQL::Parser::Statement::DateTime.new(val[1])
     result
   end
 .,.,
 
-# reduce 63 omitted
+# reduce 57 omitted
 
-module_eval(<<'.,.,', 'parser.racc', 143)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 128)
+  def _reduce_58(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Float.new("#{val[0]}.#{val[2]}".to_f)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 144)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 129)
+  def _reduce_59(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Float.new(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 145)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 130)
+  def _reduce_60(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Float.new("0.#{val[1]}".to_f)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.racc', 146)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'parser.racc', 131)
+  def _reduce_61(val, _values, result)
      result = GitlabZOQL::Parser::Statement::Integer.new(val[0])
     result
   end

data/lib/gitlab-zoql/parser/parser.rex.rb

@@ -68,34 +68,28 @@ class GitlabZOQL::Parser < Racc::Parser
                   when (text = @ss.scan(/\s+/i))
                     ;
 
-                  when (text = @ss.scan(/AND/i))
+                  when (text = @ss.scan(/AND\b/i))
                      action { [:AND, text] }
 
-                  when (text = @ss.scan(/BY/i))
-                     action { [:BY, text] }
-
-                  when (text = @ss.scan(/COUNT/i))
+                  when (text = @ss.scan(/COUNT\b/i))
                      action { [:COUNT, text] }
 
-                  when (text = @ss.scan(/ELSE/i))
+                  when (text = @ss.scan(/ELSE\b/i))
                      action { [:ELSE, text] }
 
-                  when (text = @ss.scan(/END/i))
-                     action { [:END, text] }
-
-                  when (text = @ss.scan(/FROM/i))
+                  when (text = @ss.scan(/FROM\b/i))
                      action { [:FROM, text] }
 
-                  when (text = @ss.scan(/NULL/i))
+                  when (text = @ss.scan(/NULL\b/i))
                      action { [:NULL, text] }
 
-                  when (text = @ss.scan(/OR/i))
+                  when (text = @ss.scan(/OR\b/i))
                      action { [:OR, text] }
 
-                  when (text = @ss.scan(/SELECT/i))
+                  when (text = @ss.scan(/SELECT\b/i))
                      action { [:SELECT, text] }
 
-                  when (text = @ss.scan(/WHERE/i))
+                  when (text = @ss.scan(/WHERE\b/i))
                      action { [:WHERE, text] }
 
                   when (text = @ss.scan(/!=/i))
@@ -116,12 +110,6 @@ class GitlabZOQL::Parser < Racc::Parser
                   when (text = @ss.scan(/>/i))
                      action { [:greater_than_operator, text] }
 
-                  when (text = @ss.scan(/\(/i))
-                     action { [:left_paren, text] }
-
-                  when (text = @ss.scan(/\)/i))
-                     action { [:right_paren, text] }
-
                   when (text = @ss.scan(/,/i))
                      action { [:comma, text] }
 
@@ -142,14 +130,14 @@ class GitlabZOQL::Parser < Racc::Parser
 
             when :STRS
           case
-                  when (text = @ss.scan(/\'/i))
-                     action { @state = nil;    [:quote, text] }
-
                   when (text = @ss.scan(/[0-9]+-[0-9]+-[0-9]+T[0-9]+:[0-9]+:[0-9]+\+[0-9]+:[0-9]+/i))
                      action { [:datetime_string, DateTime.parse(text)] }
 
-                  when (text = @ss.scan(/.*(?=\')/i))
-                     action {                  [:character_string_literal, text.gsub("''", "'")] }
+                  when (text = @ss.scan(/(?:[^\\']|\\.|'')+/i))
+                     action {                  [:character_string_literal, text] }
+
+                  when (text = @ss.scan(/\'/i))
+                     action { @state = nil;    [:quote, text] }
 
           
           else

data/lib/gitlab-zoql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabZOQL
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

data/lib/gitlab-zoql/visitor.rb

@@ -47,14 +47,6 @@ module GitlabZOQL
       search_condition('AND', o)
     end
 
-    def visit_Is(o)
-      if @negated
-        comparison('IS NOT', o)
-      else
-        comparison('IS', o)
-      end
-    end
-
     def visit_GreaterOrEquals(o)
       comparison('>=', o)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-zoql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vitaly Slobodin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest