sportdb-parser 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c262398deab4e59ae7f57655a5ab67b03e4ad6290c66aa1b68f082448619c9c
-  data.tar.gz: 4c9b0c700f3bc472b27975cd1c4e7698eabf2e3965e0c1dbbed6feb4271103d6
+  metadata.gz: ac0970b3fbdf8ca8030b5b8de8f149b630b76546acbf094c78ccf5deb6d31ef0
+  data.tar.gz: 8ff6968c2d1113952040ab297cb522e5b8948f9a69c08543e9dd2763b0867f01
 SHA512:
-  metadata.gz: dbfeb90c1e8499e67c653bc313696cdafd18c8f56af2b752aa6466e3ea76515d45ac91433741ba106b0ced8a55178aff54b348bf37463a86ec81127b87bec58d
-  data.tar.gz: f98cb825168e198601b43a70e8e19173ddbec39a93f04f4d277d632dc5d8f45577190e3f780b88fe48c9d6c194e7e59c1caf67897aebcdaa8c9a6527e1bbc2c1
+  metadata.gz: b1a8eb1bef571c019e4201a71ccb73dfe06cf8e348f46f9cfa2b676d7acf639132c27b6c0cb59d9da40521ca82d522a4e240321b7402b38bab0354ca8d313e22
+  data.tar.gz: d4125ca745cdc4fc432e68577f80904a572050447272a32625b9df6f203de101c477be91574a2dc5f37f5ea1341d2bc517ecae4d2a99104c5048f6cbed71085c

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.5.5
+### 0.5.6
 ### 0.0.1 / 2024-07-12
 
 * Everything is new. First release.

data/Manifest.txt

@@ -10,6 +10,8 @@ config/rounds_pt.txt
 lib/sportdb/parser.rb
 lib/sportdb/parser/lang.rb
 lib/sportdb/parser/parser.rb
+lib/sportdb/parser/racc_parser.rb
+lib/sportdb/parser/racc_tree.rb
 lib/sportdb/parser/token-date.rb
 lib/sportdb/parser/token-score.rb
 lib/sportdb/parser/token-status.rb

data/lib/sportdb/parser/parser.rb

@@ -9,200 +9,200 @@ class RaccMatchParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-   102,    94,    60,   119,    28,    35,    37,   129,    43,    57,
-    38,    39,    22,    60,    43,   120,    41,    36,    49,    68,
-    55,    61,    62,    65,    65,    31,   128,    12,    40,    30,
-    58,    28,    61,    62,    66,    16,    12,    70,    30,    13,
-    28,    25,    14,    15,    16,    20,    22,    80,    13,    81,
-    25,    14,    15,    71,    20,    22,    54,    51,    54,    91,
-    72,    74,    75,    76,    44,    47,    46,    85,    86,   104,
-   105,   117,   118,    83,    52,    55,    52,    55,   125,   126,
-   134,   126,    87,    88,    65,    89,    49,    96,    98,    40,
-    99,   100,    43,   107,    43,   109,    35,   111,   112,    80,
-    65,   121,   122,   123,    49,   127,    65,    43,    43,    35,
-   132,    65,    49,   136,   137 ]
+    34,   120,    12,   106,    33,    38,    30,    58,    95,    39,
+    16,    61,    24,   121,    13,    40,    27,    14,    15,    45,
+    17,    19,    22,    24,    12,    30,    33,    27,    30,    56,
+    71,    32,    16,    62,    63,   130,    13,    43,    27,    14,
+    15,    41,    17,    19,    22,    24,    55,    52,    55,    92,
+    32,    59,    81,    32,    82,    64,   129,    46,    49,    48,
+    42,    73,    75,    76,    77,    68,    53,    56,    53,    56,
+    66,    32,    86,    87,   108,   109,   118,   119,   126,   127,
+   135,   127,    71,    72,    84,    88,    89,    90,    27,    97,
+    99,    42,   100,   101,    32,   103,    32,   110,    38,   112,
+   113,    81,    71,   122,   123,   124,    27,   128,    32,    32,
+    71,    38,   133,    71,    27,   137,   138 ]
 
 racc_action_check = [
-    63,    52,    25,    82,    16,    12,    13,    97,    27,    20,
-    14,    15,    20,    49,    16,    82,    16,    13,    18,    27,
-    52,    25,    25,    63,    25,     1,    97,     1,    15,     1,
-    24,     1,    49,    49,    26,     1,     0,    28,     0,     1,
-     0,     1,     1,     1,     0,     1,     1,    35,     0,    35,
-     0,     0,     0,    31,     0,     0,    19,    19,    48,    48,
-    33,    33,    33,    33,    17,    17,    17,    38,    38,    65,
-    65,    81,    81,    36,    19,    19,    48,    48,    92,    92,
-   124,   124,    41,    42,    43,    45,    51,    53,    55,    57,
-    59,    62,    67,    68,    70,    72,    73,    75,    76,    78,
-    80,    84,    87,    88,    91,    95,   102,   106,   108,   114,
-   115,   116,   126,   129,   131 ]
+     1,    83,     1,    69,     1,    12,     1,    22,    53,    13,
+     1,    27,    22,    83,     1,    14,     1,     1,     1,    17,
+     1,     1,     1,     1,     0,    16,     0,    20,     0,    53,
+    69,     1,     0,    27,    27,    98,     0,    16,     0,     0,
+     0,    15,     0,     0,     0,     0,    21,    21,    50,    50,
+    16,    26,    38,     0,    38,    28,    98,    18,    18,    18,
+    15,    36,    36,    36,    36,    30,    21,    21,    50,    50,
+    29,    29,    40,    40,    71,    71,    82,    82,    93,    93,
+   125,   125,    32,    34,    39,    43,    44,    47,    52,    54,
+    56,    58,    60,    63,    65,    66,    68,    73,    74,    76,
+    77,    79,    81,    85,    88,    89,    92,    96,   102,   104,
+   106,   115,   116,   117,   127,   130,   132 ]
 
 racc_action_pointer = [
-    34,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    -2,     2,    -5,     7,    -2,    60,     2,    52,
-    -9,   nil,   nil,   nil,     4,    -4,    30,    -8,    10,   nil,
-   nil,    53,   nil,    57,   nil,    39,    57,   nil,    49,   nil,
-   nil,    71,    72,    56,   nil,    68,   nil,   nil,    54,     7,
-   nil,    70,    -3,    83,   nil,    72,   nil,    68,   nil,    74,
-   nil,   nil,    75,    -5,   nil,    40,   nil,    76,    89,   nil,
-    78,   nil,    91,    89,   nil,    93,    94,   nil,    91,   nil,
-    72,    59,    -1,   nil,    97,   nil,   nil,    98,    99,   nil,
-   nil,    88,    74,   nil,   nil,   101,   nil,     2,   nil,   nil,
-   nil,   nil,    78,   nil,   nil,   nil,    91,   nil,    92,   nil,
-   nil,   nil,   nil,   nil,   102,    99,    83,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    76,   nil,    96,   nil,   nil,    97,
-   nil,   105,   nil,   nil,   nil,   nil,   nil,   nil ]
+    22,     0,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    -2,    -6,     0,    37,    19,    15,    53,   nil,
+    11,    42,   -11,   nil,   nil,   nil,    22,     5,    51,    40,
+    35,   nil,    50,   nil,    83,   nil,    58,   nil,    44,    68,
+    54,   nil,   nil,    74,    75,   nil,   nil,    66,   nil,   nil,
+    44,   nil,    72,     4,    85,   nil,    63,   nil,    68,   nil,
+    76,   nil,   nil,    77,   nil,    63,    91,   nil,    65,    -2,
+   nil,    41,   nil,    93,    91,   nil,    95,    96,   nil,    93,
+   nil,    70,    64,    -3,   nil,    99,   nil,   nil,   100,   101,
+   nil,   nil,    90,    74,   nil,   nil,   103,   nil,    30,   nil,
+   nil,   nil,    77,   nil,    78,   nil,    78,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   104,   101,    81,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    76,   nil,    98,   nil,   nil,
+    88,   nil,   107,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
    -90,   -90,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
-   -10,   -11,   -90,   -90,   -41,   -54,   -90,   -90,   -90,   -90,
-   -51,   -53,   -56,   -65,   -66,   -90,   -90,   -74,   -90,   -79,
-   -89,   -90,    -2,   -90,   -13,   -20,   -90,   -39,   -90,   -37,
-   -55,   -90,   -90,   -90,   -40,   -90,   -43,   -44,   -90,   -90,
-   -46,   -90,   -90,   -90,   -60,   -90,   -52,   -54,   -71,   -90,
-   -68,   -69,   -90,   -81,   -82,   -85,   -73,   -90,   -77,   -80,
-   -90,   138,   -90,   -90,   -15,   -16,   -18,   -21,   -22,   -24,
-   -90,   -90,   -90,   -32,   -90,   -35,   -36,   -90,   -90,   -42,
-   -45,   -90,   -90,   -49,   -57,   -90,   -59,   -61,   -63,   -67,
-   -70,   -83,   -90,   -86,   -87,   -88,   -76,   -78,   -75,   -12,
-   -14,   -17,   -19,   -23,   -90,   -90,   -27,   -29,   -30,   -31,
-   -33,   -34,   -38,   -72,   -90,   -48,   -90,   -58,   -62,   -90,
-   -84,   -90,   -26,   -28,   -47,   -50,   -64,   -25 ]
+   -10,   -11,   -90,   -90,   -90,   -54,   -90,   -90,   -90,   -41,
+   -90,   -90,   -51,   -53,   -56,   -65,   -66,   -90,   -90,   -74,
+   -90,   -79,   -90,   -89,   -90,    -2,   -90,   -13,   -20,   -90,
+   -90,   -37,   -55,   -90,   -90,   -39,   -40,   -90,   -43,   -44,
+   -90,   -46,   -90,   -90,   -90,   -60,   -90,   -52,   -54,   -71,
+   -90,   -68,   -69,   -90,   -73,   -90,   -77,   -80,   -90,   -81,
+   -82,   -85,   139,   -90,   -90,   -15,   -16,   -18,   -21,   -22,
+   -24,   -90,   -90,   -90,   -32,   -90,   -35,   -36,   -90,   -90,
+   -42,   -45,   -90,   -90,   -49,   -57,   -90,   -59,   -61,   -63,
+   -67,   -70,   -76,   -78,   -75,   -83,   -90,   -86,   -87,   -88,
+   -12,   -14,   -17,   -19,   -23,   -90,   -90,   -27,   -29,   -30,
+   -31,   -33,   -34,   -38,   -72,   -90,   -48,   -90,   -58,   -62,
+   -90,   -84,   -90,   -26,   -28,   -47,   -50,   -64,   -25 ]
 
 racc_goto_table = [
-    48,    34,    69,   101,    79,    92,    50,   106,     2,    32,
-   108,     1,    33,    73,    77,    78,   115,   116,    82,    84,
-   114,    45,    56,    95,    97,    42,    67,   103,   nil,   nil,
-   nil,   nil,   nil,    93,   nil,    90,   nil,   nil,   nil,   nil,
-   nil,   nil,   130,   nil,   nil,   124,   nil,   113,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   133,   nil,   nil,   nil,
-   nil,   nil,   110,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    93,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    69,   nil,    69,   nil,   nil,   nil,   nil,   nil,   nil,
+    50,    37,    70,    80,    67,    93,    51,   102,     2,    35,
+   104,     1,    36,    74,    78,    79,   116,   117,    83,    85,
+    47,    57,    96,    98,    60,    44,    65,    69,   107,   nil,
+   nil,   nil,    94,   nil,   nil,    91,   nil,   nil,   nil,   105,
+   nil,   nil,   nil,   nil,   114,   125,   nil,   nil,   nil,   nil,
+   nil,   115,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   111,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    94,   nil,   nil,   nil,   131,    67,   nil,    67,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   134,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   131,   nil,   nil,   nil,   nil,   135 ]
+   nil,   nil,   nil,   nil,   132,   nil,   nil,   136 ]
 
 racc_goto_check = [
-    26,    13,    38,    18,    17,    28,    27,    36,     2,     2,
+    26,    13,    18,    17,    38,    28,    27,    36,     2,     2,
     36,     1,    12,    14,    15,    16,    19,    20,    21,    22,
-    18,    24,    29,    30,    31,    35,    37,    40,   nil,   nil,
-   nil,   nil,   nil,    26,   nil,    27,   nil,   nil,   nil,   nil,
-   nil,   nil,    18,   nil,   nil,    28,   nil,    17,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,   nil,   nil,
-   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    38,   nil,    38,   nil,   nil,   nil,   nil,   nil,   nil,
+    24,    29,    30,    31,    34,    35,    37,    39,    40,   nil,
+   nil,   nil,    26,   nil,   nil,    27,   nil,   nil,   nil,    18,
+   nil,   nil,   nil,   nil,    17,    28,   nil,   nil,   nil,   nil,
+   nil,    18,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    26,   nil,   nil,   nil,    18,    38,   nil,    38,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    13,   nil,   nil,   nil,   nil,    26 ]
+   nil,   nil,   nil,   nil,    13,   nil,   nil,    26 ]
 
 racc_goto_pointer = [
    nil,    11,     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     0,   -11,   -20,   -21,   -20,   -31,   -60,   -65,
-   -64,   -18,   -19,   nil,     4,   nil,   -18,   -13,   -46,     2,
-   -29,   -31,   nil,   nil,   nil,     9,   -60,    -1,   -25,   nil,
-   -38 ]
+   nil,   nil,     0,   -11,   -23,   -24,   -23,   -35,   -30,   -66,
+   -65,   -21,   -21,   nil,     2,   nil,   -20,   -15,   -47,    -1,
+   -31,   -33,   nil,   nil,    -3,     9,   -58,    -3,   -25,    -5,
+   -43 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     3,     4,     5,     6,     7,     8,     9,
-    10,    11,   nil,   nil,   nil,   nil,   nil,   nil,    64,   nil,
-   nil,   nil,   nil,    17,   nil,    18,    19,   nil,   nil,    21,
-    53,   nil,    23,    24,    59,    26,    27,   nil,    29,    63,
+    10,    11,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    18,   nil,    20,    21,   nil,   nil,    23,
+    54,   nil,    25,    26,   nil,    28,    29,   nil,    31,   nil,
    nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 32, :_reduce_none,
-  2, 32, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  1, 33, :_reduce_none,
-  4, 42, :_reduce_12,
-  1, 43, :_reduce_13,
-  3, 43, :_reduce_14,
-  2, 43, :_reduce_15,
-  1, 45, :_reduce_none,
-  2, 45, :_reduce_17,
-  1, 45, :_reduce_none,
-  2, 45, :_reduce_19,
-  1, 44, :_reduce_20,
-  2, 44, :_reduce_21,
-  1, 46, :_reduce_22,
-  2, 46, :_reduce_23,
-  1, 46, :_reduce_24,
-  4, 48, :_reduce_25,
-  3, 47, :_reduce_26,
-  1, 50, :_reduce_27,
-  2, 50, :_reduce_28,
-  1, 51, :_reduce_none,
-  1, 51, :_reduce_none,
-  4, 37, :_reduce_31,
-  1, 52, :_reduce_32,
-  2, 52, :_reduce_33,
-  4, 38, :_reduce_34,
-  1, 53, :_reduce_35,
-  1, 53, :_reduce_36,
-  2, 34, :_reduce_37,
-  4, 34, :_reduce_38,
-  2, 35, :_reduce_39,
-  2, 36, :_reduce_40,
-  1, 54, :_reduce_41,
-  3, 54, :_reduce_42,
+  1, 36, :_reduce_none,
+  2, 36, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  4, 46, :_reduce_12,
+  1, 47, :_reduce_13,
+  3, 47, :_reduce_14,
+  2, 47, :_reduce_15,
+  1, 49, :_reduce_none,
+  2, 49, :_reduce_17,
+  1, 49, :_reduce_none,
+  2, 49, :_reduce_19,
+  1, 48, :_reduce_20,
+  2, 48, :_reduce_21,
+  1, 50, :_reduce_22,
+  2, 50, :_reduce_23,
+  1, 50, :_reduce_24,
+  4, 52, :_reduce_25,
+  3, 51, :_reduce_26,
+  1, 54, :_reduce_27,
+  2, 54, :_reduce_28,
   1, 55, :_reduce_none,
   1, 55, :_reduce_none,
-  3, 39, :_reduce_45,
-  2, 39, :_reduce_46,
-  5, 39, :_reduce_47,
-  4, 39, :_reduce_48,
-  1, 59, :_reduce_49,
-  3, 59, :_reduce_50,
-  1, 56, :_reduce_51,
-  2, 56, :_reduce_52,
-  1, 56, :_reduce_none,
-  1, 60, :_reduce_54,
-  2, 60, :_reduce_55,
-  1, 60, :_reduce_56,
-  2, 58, :_reduce_57,
-  3, 58, :_reduce_58,
-  2, 58, :_reduce_59,
-  1, 58, :_reduce_60,
-  2, 61, :_reduce_61,
-  3, 61, :_reduce_62,
-  1, 62, :_reduce_63,
-  3, 62, :_reduce_64,
-  1, 57, :_reduce_none,
-  1, 57, :_reduce_none,
-  3, 64, :_reduce_67,
-  1, 65, :_reduce_none,
-  1, 65, :_reduce_none,
-  3, 63, :_reduce_70,
-  2, 63, :_reduce_71,
-  4, 40, :_reduce_72,
-  2, 40, :_reduce_73,
-  1, 66, :_reduce_74,
-  3, 66, :_reduce_75,
-  3, 66, :_reduce_76,
-  1, 68, :_reduce_none,
-  2, 68, :_reduce_none,
-  1, 67, :_reduce_79,
-  2, 67, :_reduce_80,
-  2, 69, :_reduce_81,
-  1, 70, :_reduce_82,
-  2, 70, :_reduce_83,
-  3, 70, :_reduce_84,
-  1, 49, :_reduce_85,
-  2, 49, :_reduce_86,
-  1, 71, :_reduce_87,
-  1, 71, :_reduce_88,
-  1, 41, :_reduce_89 ]
+  4, 41, :_reduce_31,
+  1, 56, :_reduce_32,
+  2, 56, :_reduce_33,
+  4, 42, :_reduce_34,
+  1, 57, :_reduce_35,
+  1, 57, :_reduce_36,
+  2, 38, :_reduce_37,
+  4, 38, :_reduce_38,
+  2, 39, :_reduce_39,
+  2, 40, :_reduce_40,
+  1, 58, :_reduce_41,
+  3, 58, :_reduce_42,
+  1, 59, :_reduce_none,
+  1, 59, :_reduce_none,
+  3, 43, :_reduce_45,
+  2, 43, :_reduce_46,
+  5, 43, :_reduce_47,
+  4, 43, :_reduce_48,
+  1, 63, :_reduce_49,
+  3, 63, :_reduce_50,
+  1, 60, :_reduce_51,
+  2, 60, :_reduce_52,
+  1, 60, :_reduce_none,
+  1, 64, :_reduce_54,
+  2, 64, :_reduce_55,
+  1, 64, :_reduce_56,
+  2, 62, :_reduce_57,
+  3, 62, :_reduce_58,
+  2, 62, :_reduce_59,
+  1, 62, :_reduce_60,
+  2, 65, :_reduce_61,
+  3, 65, :_reduce_62,
+  1, 66, :_reduce_63,
+  3, 66, :_reduce_64,
+  1, 61, :_reduce_none,
+  1, 61, :_reduce_none,
+  3, 68, :_reduce_67,
+  1, 69, :_reduce_none,
+  1, 69, :_reduce_none,
+  3, 67, :_reduce_70,
+  2, 67, :_reduce_71,
+  4, 44, :_reduce_72,
+  2, 44, :_reduce_73,
+  1, 70, :_reduce_74,
+  3, 70, :_reduce_75,
+  3, 70, :_reduce_76,
+  1, 72, :_reduce_none,
+  2, 72, :_reduce_none,
+  1, 71, :_reduce_79,
+  2, 71, :_reduce_80,
+  2, 73, :_reduce_81,
+  1, 74, :_reduce_82,
+  2, 74, :_reduce_83,
+  3, 74, :_reduce_84,
+  1, 53, :_reduce_85,
+  2, 53, :_reduce_86,
+  1, 75, :_reduce_87,
+  1, 75, :_reduce_88,
+  1, 45, :_reduce_89 ]
 
 racc_reduce_n = 90
 
-racc_shift_n = 138
+racc_shift_n = 139
 
 racc_token_table = {
   false => 0,
@@ -219,25 +219,29 @@ racc_token_table = {
   "]" => 11,
   :YELLOW_CARD => 12,
   :RED_CARD => 13,
-  :GROUP => 14,
+  :GROUP_DEF => 14,
   "|" => 15,
-  :TEXT => 16,
-  :ROUND => 17,
+  :TEAM => 16,
+  :ROUND_DEF => 17,
   :DATE => 18,
   :DURATION => 19,
-  :ORD => 20,
-  :TIME => 21,
-  :STATUS => 22,
-  "@" => 23,
-  :TIMEZONE => 24,
-  :VS => 25,
-  :SCORE => 26,
-  ";" => 27,
-  :MINUTE => 28,
-  :OG => 29,
-  :PEN => 30 }
-
-racc_nt_base = 31
+  :GROUP => 20,
+  :ROUND => 21,
+  :ORD => 22,
+  :TIME => 23,
+  :STATUS => 24,
+  "@" => 25,
+  :TIMEZONE => 26,
+  :TEXT => 27,
+  :VS => 28,
+  :SCORE => 29,
+  ";" => 30,
+  :PLAYER => 31,
+  :MINUTE => 32,
+  :OG => 33,
+  :PEN => 34 }
+
+racc_nt_base = 35
 
 racc_use_result_var = true
 
@@ -273,20 +277,24 @@ Racc_token_to_s_table = [
   "\"]\"",
   "YELLOW_CARD",
   "RED_CARD",
-  "GROUP",
+  "GROUP_DEF",
   "\"|\"",
-  "TEXT",
-  "ROUND",
+  "TEAM",
+  "ROUND_DEF",
   "DATE",
   "DURATION",
+  "GROUP",
+  "ROUND",
   "ORD",
   "TIME",
   "STATUS",
   "\"@\"",
   "TIMEZONE",
+  "TEXT",
   "VS",
   "SCORE",
   "\";\"",
+  "PLAYER",
   "MINUTE",
   "OG",
   "PEN",

data/lib/sportdb/parser/racc_parser.rb

@@ -0,0 +1,58 @@
+
+####
+#   RaccMatchParser support machinery (incl. node classes/abstract syntax tree)
+
+class RaccMatchParser
+
+
+def initialize( txt )
+    ## puts "==> txt:"
+    ## puts txt
+   
+    parser = SportDb::Parser.new
+    @tokens = parser.tokenize( txt )
+    ## pp @tokens
+    
+    ## quick hack - convert to racc format single char literal tokens e.g. '@' etc.
+    @tokens = @tokens.map do |tok|
+                 if tok.size == 1
+                   [tok[0].to_s, tok[0].to_s]
+                 else 
+                   tok
+                 end
+               end
+  end
+  
+
+  def next_token
+    tok = @tokens.shift
+    puts "next_token => #{tok.pretty_inspect}"
+    tok
+  end
+  
+#  on_error do |error_token_id, error_value, value_stack|
+#      puts "Parse error on token: #{error_token_id}, value: #{error_value}"
+#  end  
+
+  def parse    
+     puts "parse:"
+     @tree = [] 
+     do_parse
+     @tree
+  end
+
+
+  def on_error(*args)
+    puts
+    puts "!! on parse error:"
+    puts "args=#{args.pretty_inspect}"
+    exit 1  ##   exit for now  -  get and print more info about context etc.!!
+  end
+
+
+=begin
+on_error do |error_token_id, error_value, value_stack|
+    puts "Parse error on token: #{error_token_id}, value: #{error_value}"
+end
+=end
+end   # class RaccMatchParser

data/lib/sportdb/parser/racc_tree.rb

@@ -0,0 +1,162 @@
+
+####
+#   RaccMatchParser support machinery (incl. node classes/abstract syntax tree)
+
+class RaccMatchParser
+
+
+LineupLine = Struct.new( :team, :lineup ) do
+  def pretty_print( printer )
+    printer.text( "<LineupLine " )
+    printer.text( self.team )
+    printer.text( " lineup=" + self.lineup.pretty_inspect )
+    printer.text( ">" )
+  end
+end
+
+Lineup     = Struct.new( :name, :card, :sub ) do
+  def pretty_print( printer )
+    buf = String.new
+    buf <<  self.name 
+    buf << " card=" + self.card.pretty_inspect    if card
+    buf << " sub=" + self.sub.pretty_inspect      if sub
+    printer.text( buf ) 
+  end
+end
+
+
+Card       = Struct.new( :name, :minute ) do
+  def to_s
+    buf = String.new
+    buf << "#{self.name}"
+    buf << " #{self.minute.to_s}"   if self.minute
+    buf
+  end
+
+  def pretty_print( printer )
+    printer.text( to_s )
+  end  
+end
+
+
+Sub        = Struct.new( :minute, :sub )  do
+  def pretty_print( printer )
+    buf = String.new 
+    buf << "(#{self.minute.to_s} " 
+    buf << self.sub.pretty_inspect  
+    buf << ")"
+    printer.text( buf ) 
+  end
+end
+
+
+
+GroupDef   = Struct.new( :name, :teams ) do
+  def pretty_print( printer )
+    printer.text( "<GroupDef " )
+    printer.text( self.name )
+    printer.text( " teams=" + self.teams.pretty_inspect )
+    printer.text( ">" )
+  end
+end
+
+
+RoundDef   = Struct.new( :name, :date, :duration )  do
+  def pretty_print( printer )
+    printer.text( "<RoundDef " )
+    printer.text( self.name )
+    printer.text( " date=" + self.date.pretty_inspect ) if date
+    printer.text( " durattion=" + self.duration.pretty_inspect ) if duration
+    printer.text( ">" )
+  end
+end
+
+DateHeader = Struct.new( :date ) do
+  def pretty_print( printer )
+    printer.text( "<DateHeader " )
+    printer.text( "#{self.date.pretty_inspect}>" )
+  end
+end
+
+GroupHeader = Struct.new( :name ) do
+  def pretty_print( printer )
+    printer.text( "<GroupHeader " )
+    printer.text( "#{self.name}>" )
+  end
+end
+
+RoundHeader = Struct.new( :names ) do
+  def pretty_print( printer )
+    printer.text( "<RoundHeader " )
+    printer.text( "#{self.names.join(', ')}>" )
+  end
+end
+
+MatchLine   = Struct.new( :ord, :date, :time,
+                          :team1, :team2, :score,
+                          :status, 
+                          :geo,
+                          :timezone )  do   ## change to geos - why? why not?
+
+  def pretty_print( printer )
+    printer.text( "<MatchLine " )
+    printer.text( "#{self.team1} v #{self.team2}")
+    printer.breakable
+
+    members.zip(values) do |name, value|
+      next if [:team1, :team2].include?( name )
+      next if value.nil?
+      
+      printer.text( "#{name}=#{value.pretty_inspect}" )
+    end    
+
+    printer.text( ">" )
+  end  
+
+end
+
+GoalLine    = Struct.new( :goals1, :goals2 ) do
+  def pretty_print( printer )
+    printer.text( "<GoalLine " )
+    printer.text( "goals1=" + self.goals1.pretty_inspect + "," )
+    printer.breakable
+    printer.text( "goals2=" + self.goals2.pretty_inspect + ">" )
+  end  
+end
+
+Goal        = Struct.new( :player, :minutes ) do
+  def to_s
+    buf = String.new
+    buf << "#{self.player}"
+    buf << " "
+    buf << minutes.map { |min| min.to_s }.join(' ')
+    buf
+  end
+
+  def pretty_print( printer )
+    printer.text( to_s )
+  end  
+
+end
+
+
+##
+##  fix - move :og, :pen  to Goal if possible - why? why not?
+##  or change to GoalMinute ???
+Minute      = Struct.new( :m, :offset, :og, :pen )  do
+    def to_s
+      buf = String.new
+      buf << "#{self.m}"
+      buf << "+#{self.offset}"  if self.offset 
+      buf << "'"
+      buf << "(og)"   if self.og
+      buf << "(pen)"  if self.pen
+      buf
+    end
+ 
+    def pretty_print( printer ) 
+       printer.text( to_s ) 
+    end  
+end
+
+end  # class RaccMatchParser

data/lib/sportdb/parser/tokenizer.rb

@@ -14,8 +14,239 @@ def log( msg )
 end
 
 
+## transforms
+##
+##  Netherlands  1-2 (1-1)   England
+##   =>  text => team
+##       score|vs
+##       text => team
+
+
+## token iter/find better name
+##  e.g. TokenBuffer/Scanner or such ??
+class Tokens
+  def initialize( tokens )
+      @tokens = tokens
+      @pos = 0
+  end
+
+  def pos()  @pos; end
+  def eos?() @pos >= @tokens.size; end
+
+
+  def include?( *types )
+      pos = @pos
+      ## puts "  starting include? #{types.inspect} @ #{pos}"
+      while pos < @tokens.size do
+          return true   if types.include?( @tokens[pos][0] )
+          pos +=1
+      end
+      false
+  end
+
+  ## pattern e.g. [:TEXT, [:VS,:SCORE], :TEXT]
+  def match?( *pattern )
+      ## puts "  starting match? #{pattern.inspect} @ #{@pos}"
+      pattern.each_with_index do |types,offset|
+          ## if single symbol wrap in array
+          types = types.is_a?(Array) ? types : [types]
+          return false  unless types.include?( peek(offset) )
+      end
+      true
+  end
+
+
+  ## return token type  (e.g. :TEXT, :NUM, etc.)
+  def cur()           peek(0); end
+  ## return content (assumed to be text)
+  def text(offset=0)
+      ## raise error - why? why not?
+      ##   return nil?
+      if peek( offset ) != :text
+          raise ArgumentError, "text(#{offset}) - token not a text type"
+      end
+      @tokens[@pos+offset][1]
+  end
+
 
-def tokenize_with_errors( line, debug: false )
+  def peek(offset=1)
+      ## return nil if eos
+      if @pos+offset >= @tokens.size
+          nil
+      else
+         @tokens[@pos+offset][0]
+      end
+  end
+
+  ## note - returns complete token
+  def next
+     # if @pos >= @tokens.size
+     #     raise ArgumentError, "end of array - #{@pos} >= #{@tokens.size}"
+     # end
+     #   throw (standard) end of iteration here why? why not?
+
+      t = @tokens[@pos]
+      @pos += 1
+      t
+  end
+
+  def collect( &blk )
+      tokens = []
+      loop do
+        break if eos?
+        tokens <<  if block_given?
+                      blk.call( self.next )
+                   else
+                      self.next
+                   end
+      end
+      tokens
+  end
+end  # class Tokens
+
+
+
+
+### convience helper - ignore errors by default
+def tokenize( lines, debug: false )
+  tokens, _ = tokenize_with_errors( lines, debug: debug )
+  tokens
+end
+
+def tokenize_with_errors( lines, debug: false )
+
+##
+##  note - for convenience - add support
+##         comments (incl. inline end-of-line comments) and empty lines here
+##             why? why not?
+##         why?  keeps handling "centralized" here in one place
+
+   ## todo/fix - rework and make simpler
+    ##             no need to double join array of string to txt etc.
+
+    txt_pre =  if lines.is_a?( Array )
+               ## join together with newline
+                 lines.reduce( String.new ) do |mem,line|
+                                               mem << line; mem << "\n"; mem
+                                            end
+               else  ## assume single-all-in-one txt
+                 lines
+               end
+
+    ##  preprocess automagically - why? why not?
+    ##   strip lines with comments and empty lines striped / removed
+    ##      keep empty lines? why? why not?
+    ##      keep leading spaces (indent) - why?
+    txt = String.new
+    txt_pre.each_line do |line|    ## preprocess
+       line = line.strip
+       next if line.empty? || line.start_with?('#')   ###  skip empty lines and comments
+       
+       line = line.sub( /#.*/, '' ).strip             ###  cut-off end-of line comments too
+       
+       txt << line
+       txt << "\n"
+    end
+    
+
+    tokens_by_line = []   ## note: add tokens line-by-line (flatten later)
+    errors         = []   ## keep a list of errors - why? why not?
+  
+    txt.each_line do |line|
+        line = line.rstrip   ## note - MUST remove/strip trailing newline (spaces optional)!!!
+ 
+        more_tokens, more_errors = _tokenize_line( line, debug: debug )
+        
+        tokens_by_line  << more_tokens   
+        errors          += more_errors
+    end # each line
+
+
+
+
+    tokens_by_line = tokens_by_line.map do |tokens|
+        #############
+        ## pass 1
+        ##   replace all texts with keyword matches
+        ##     (e.g. group, round, leg, etc.)
+        tokens = tokens.map do |t|        
+                    if t[0] == :TEXT
+                       text = t[1]
+                       t = if is_group?( text )
+                               [:GROUP, text]
+                             elsif is_round?( text ) || is_leg?( text )
+                               [:ROUND, text]
+                             else
+                               t  ## pass through as-is (1:1)
+                             end
+                    end
+                   t
+                 end
+
+        #################
+        ## pass 2                  
+        ##    transform tokens (using simple patterns) 
+        ##      to help along the (racc look ahead 1 - LA1) parser       
+        nodes = []
+
+        buf = Tokens.new( tokens )
+        ## pp buf
+
+
+    loop do
+          break if buf.eos?
+
+          if buf.pos == 0   ## MUST start line
+            ## check for
+            ##    group def or round def
+            if buf.match?( :ROUND, :'|' )    ## assume round def (change round to round_def)
+                      nodes << [:ROUND_DEF, buf.next[1]]
+                      nodes << buf.next 
+                      nodes += buf.collect
+                      break
+            end
+            if buf.match?( :GROUP, :'|' )    ## assume group def (change group to group_def)
+                      nodes << [:GROUP_DEF, buf.next[1]]
+                      nodes << buf.next 
+                      ## change all text to team - why? why not?
+                      nodes += buf.collect { |t|
+                                t[0] == :TEXT ? [:TEAM, t[1]] : t
+                               }
+                      break
+            end
+          end
+
+
+          if buf.match?( :TEXT, [:SCORE, :VS, :'-'], :TEXT )
+             nodes << [:TEAM, buf.next[1]]
+             nodes << buf.next
+             nodes << [:TEAM, buf.next[1]]
+          elsif buf.match?( :TEXT, :MINUTE )
+             nodes << [:PLAYER, buf.next[1]]
+             nodes << buf.next
+          else
+             ## pass through
+             nodes << buf.next
+          end
+    end  # loop
+    nodes  
+  end  # map tokens_by_line
+
+
+
+    ## flatten tokens
+    tokens = []
+    tokens_by_line.each do |tok|
+         tokens  += tok 
+         tokens  << [:NEWLINE, "\n"]   ## auto-add newlines
+    end
+
+    [tokens,errors]
+end   # method tokenize_with_errors
+
+
+
+def _tokenize_line( line, debug: false )
   tokens = []
   errors = []   ## keep a list of errors - why? why not?
 
@@ -252,11 +483,5 @@ def tokenize_with_errors( line, debug: false )
 end
 
 
-### convience helper - ignore errors by default
-def tokenize(  line, debug: false )
-   tokens, _ = tokenize_with_errors( line, debug: debug )
-   tokens
-end
-
 end  # class Parser
 end # module SportDb

data/lib/sportdb/parser/version.rb

@@ -4,7 +4,7 @@ module SportDb
     module Parser
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 5
-  PATCH = 5
+  PATCH = 6
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/parser.rb

@@ -24,7 +24,9 @@ require_relative 'parser/token-status'
 require_relative 'parser/token'
 require_relative 'parser/tokenizer'
 
-require_relative 'parser/parser'
+require_relative 'parser/parser'   ## auto-generated by racc (from parser.y)
+require_relative 'parser/racc_parser'
+require_relative 'parser/racc_tree'
 
 
 
@@ -44,9 +46,11 @@ end  # module SportDb
 
 
 module SportDb
-
-
-
+###
+##  todo/fix -   use LangHelper or such
+##   e.g.     class Parser
+##                include LangHelper
+##            end
 class Parser
   ## keep "old" access to checking for group, round & friends
   ##    for now for compatibility
@@ -54,302 +58,9 @@ class Parser
   def is_round?( text )  Lang.is_round?( text ); end
   def is_leg?( text )    Lang.is_leg?( text ); end
 end
+end  # module SportDb
 
 
 
-class Tokenizer  
-    
-   attr_reader :tokens
- 
-   def initialize( txt )
-      parser = Parser.new
- 
-      tree = []
-      
-      lines = txt.split( "\n" )
-      lines.each_with_index do |line,i|
-          next if line.strip.empty? || line.strip.start_with?( '#' )
-          ##   support for inline (end-of-line) comments
-          line = line.sub(  /#.*/, '' ).strip
-
-          puts "line >#{line}<"
-          tokens = parser.tokenize( line )
-          pp tokens
-      
-          tree << tokens
-      end
- 
-
-=begin   
-      ## quick hack
-      ##   turn all  text tokens followed by minute token
-      ##     into player tokens!!!
-      ##
-      ##   also auto-convert text tokens into team tokens - why? why not?
-      tree.each do |tokens|
-         tokens.each_with_index do |t0,idx|
-            t1 = tokens[idx+1]
-            if t1 && t1[0] == :minute && t0[0] == :text
-                 t0[0] = :player 
-            end
-         end
-      end
-=end
-
-=begin
-## auto-add/insert start tokens for known line patterns
-##    START_GOALS for  goals_line
-##    why? why not?
-=end
-
-      ## flatten
-      @tokens = []
-      tree.each do |tokens|
-         @tokens += tokens 
-         @tokens  << [:NEWLINE, "\n"]   ## auto-add newlines
-      end
- 
-
-      ## convert to racc format
-      @tokens = @tokens.map do |tok|
-           if tok.size == 1
-             [tok[0].to_s, tok[0].to_s]
-           elsif tok.size == 2
- #############
- ## pass 1
- ##   replace all texts with keyword matches (e.g. group, round, leg, etc.)
-               if tok[0] == :TEXT
-                  text = tok[1]
-                  tok = if parser.is_group?( text )
-                          [:GROUP, text]
-                        elsif parser.is_round?( text ) || parser.is_leg?( text )
-                          [:ROUND, text]
-                        else
-                          tok  ## pass through as-is (1:1)
-                        end
-               end
- ## pass 2
-              tok
-       else
-              raise ArgumentError, "tokens of size 1|2 expected; got #{tok.pretty_inspect}"
-           end
-      end
-   end
- 
- 
-
-   def next_token
-      @tokens.shift
-   end
- end  # class Tokenizer
-end # module SportDb
-
-
-
-####
-#   RaccMatchParser support machinery (incl. node classes/abstract syntax tree)
-
-class RaccMatchParser
-
-
-LineupLine = Struct.new( :team, :lineup ) do
-  def pretty_print( printer )
-    printer.text( "<LineupLine " )
-    printer.text( self.team )
-    printer.text( " lineup=" + self.lineup.pretty_inspect )
-    printer.text( ">" )
-  end
-end
-
-Lineup     = Struct.new( :name, :card, :sub ) do
-  def pretty_print( printer )
-    buf = String.new
-    buf <<  self.name 
-    buf << " card=" + self.card.pretty_inspect    if card
-    buf << " sub=" + self.sub.pretty_inspect      if sub
-    printer.text( buf ) 
-  end
-end
-
-
-Card       = Struct.new( :name, :minute ) do
-  def to_s
-    buf = String.new
-    buf << "#{self.name}"
-    buf << " #{self.minute.to_s}"   if self.minute
-    buf
-  end
-
-  def pretty_print( printer )
-    printer.text( to_s )
-  end  
-end
-
-
-Sub        = Struct.new( :minute, :sub )  do
-  def pretty_print( printer )
-    buf = String.new 
-    buf << "(#{self.minute.to_s} " 
-    buf << self.sub.pretty_inspect  
-    buf << ")"
-    printer.text( buf ) 
-  end
-end
-
-
-
-GroupDef   = Struct.new( :name, :teams ) do
-  def pretty_print( printer )
-    printer.text( "<GroupDef " )
-    printer.text( self.name )
-    printer.text( " teams=" + self.teams.pretty_inspect )
-    printer.text( ">" )
-  end
-end
-
-
-RoundDef   = Struct.new( :name, :date, :duration )  do
-  def pretty_print( printer )
-    printer.text( "<RoundDef " )
-    printer.text( self.name )
-    printer.text( " date=" + self.date.pretty_inspect ) if date
-    printer.text( " durattion=" + self.duration.pretty_inspect ) if duration
-    printer.text( ">" )
-  end
-end
-
-DateHeader = Struct.new( :date ) do
-  def pretty_print( printer )
-    printer.text( "<DateHeader " )
-    printer.text( "#{self.date.pretty_inspect}>" )
-  end
-end
-
-GroupHeader = Struct.new( :name ) do
-  def pretty_print( printer )
-    printer.text( "<GroupHeader " )
-    printer.text( "#{self.name}>" )
-  end
-end
-
-RoundHeader = Struct.new( :names ) do
-  def pretty_print( printer )
-    printer.text( "<RoundHeader " )
-    printer.text( "#{self.names.join(', ')}>" )
-  end
-end
-
-MatchLine   = Struct.new( :ord, :date, :time,
-                          :team1, :team2, :score,
-                          :status, 
-                          :geo,
-                          :timezone )  do   ## change to geos - why? why not?
-
-  def pretty_print( printer )
-    printer.text( "<MatchLine " )
-    printer.text( "#{self.team1} v #{self.team2}")
-    printer.breakable
-
-    members.zip(values) do |name, value|
-      next if [:team1, :team2].include?( name )
-      next if value.nil?
-      
-      printer.text( "#{name}=#{value.pretty_inspect}" )
-    end    
-
-    printer.text( ">" )
-  end  
-
-end
-
-GoalLine    = Struct.new( :goals1, :goals2 ) do
-  def pretty_print( printer )
-    printer.text( "<GoalLine " )
-    printer.text( "goals1=" + self.goals1.pretty_inspect + "," )
-    printer.breakable
-    printer.text( "goals2=" + self.goals2.pretty_inspect + ">" )
-  end  
-end
-
-Goal        = Struct.new( :player, :minutes ) do
-  def to_s
-    buf = String.new
-    buf << "#{self.player}"
-    buf << " "
-    buf << minutes.map { |min| min.to_s }.join(' ')
-    buf
-  end
-
-  def pretty_print( printer )
-    printer.text( to_s )
-  end  
-
-end
-
-
-##
-##  fix - move :og, :pen  to Goal if possible - why? why not?
-##  or change to GoalMinute ???
-Minute      = Struct.new( :m, :offset, :og, :pen )  do
-    def to_s
-      buf = String.new
-      buf << "#{self.m}"
-      buf << "+#{self.offset}"  if self.offset 
-      buf << "'"
-      buf << "(og)"   if self.og
-      buf << "(pen)"  if self.pen
-      buf
-    end
- 
-    def pretty_print( printer ) 
-       printer.text( to_s ) 
-    end  
-end
-
-
-
-
-def initialize(input)
-    puts "==> input:"
-    puts input
-    @tokenizer = SportDb::Tokenizer.new(input)
-  end
-  
-
-  def next_token
-    tok = @tokenizer.next_token
-    puts "next_token => #{tok.pretty_inspect}"
-    tok
-  end
-  
-#  on_error do |error_token_id, error_value, value_stack|
-#      puts "Parse error on token: #{error_token_id}, value: #{error_value}"
-#  end  
-
-  def parse    
-     puts "parse:"
-     @tree = [] 
-     do_parse
-     @tree
-  end
-
-
-  def on_error(*args)
-    puts
-    puts "!! on parse error:"
-    puts "args=#{args.pretty_inspect}"
-    exit 1  ##   exit for now  -  get and print more info about context etc.!!
-  end
-
-
-=begin
-on_error do |error_token_id, error_value, value_stack|
-    puts "Parse error on token: #{error_token_id}, value: #{error_value}"
-end
-=end
-
-end 
-
-
 puts SportDb::Module::Parser.banner    # say hello
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-parser
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-19 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -98,6 +98,8 @@ files:
 - lib/sportdb/parser.rb
 - lib/sportdb/parser/lang.rb
 - lib/sportdb/parser/parser.rb
+- lib/sportdb/parser/racc_parser.rb
+- lib/sportdb/parser/racc_tree.rb
 - lib/sportdb/parser/token-date.rb
 - lib/sportdb/parser/token-score.rb
 - lib/sportdb/parser/token-status.rb