sportdb-parser 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ad809654d751437839e7f7bbda6502fb2c4b517c279988c7a3756059eaa9d8
-  data.tar.gz: 6dbacfa44774d32bfaccdb209a195f2f6c6c9ded43280023ffafbe1a3288d310
+  metadata.gz: 6c262398deab4e59ae7f57655a5ab67b03e4ad6290c66aa1b68f082448619c9c
+  data.tar.gz: 4c9b0c700f3bc472b27975cd1c4e7698eabf2e3965e0c1dbbed6feb4271103d6
 SHA512:
-  metadata.gz: 52b60ab7ef460d46007bd135fc0a00d09514b72335941c2d46f06793abc6631f7e2dce2fafefbf83360c672a05d212cf88f56ed3a6b78e803d5e5d76c0dcb38b
-  data.tar.gz: 4e861cefafce9bca2fe9135ae7fdf35a2cdd0d2080fa3f4f2fb900fa0f075752da8647dcb2c6c9e16e99210c4198a63e7202ae3e32cd1b0f049126aac7f3d412
+  metadata.gz: dbfeb90c1e8499e67c653bc313696cdafd18c8f56af2b752aa6466e3ea76515d45ac91433741ba106b0ced8a55178aff54b348bf37463a86ec81127b87bec58d
+  data.tar.gz: f98cb825168e198601b43a70e8e19173ddbec39a93f04f4d277d632dc5d8f45577190e3f780b88fe48c9d6c194e7e59c1caf67897aebcdaa8c9a6527e1bbc2c1

data/CHANGELOG.md

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

data/Manifest.txt

@@ -9,7 +9,6 @@ config/rounds_misc.txt
 config/rounds_pt.txt
 lib/sportdb/parser.rb
 lib/sportdb/parser/lang.rb
-lib/sportdb/parser/outline_reader.rb
 lib/sportdb/parser/parser.rb
 lib/sportdb/parser/token-date.rb
 lib/sportdb/parser/token-score.rb

data/Rakefile

@@ -22,8 +22,7 @@ Hoe.spec 'sportdb-parser' do
 
   self.extra_deps = [
        ['cocos', '>= 0.4.0'],
-       ['season-formats'],
-       ['racc'],
+       ['racc'],   ## maybe inline runtime later if possible - why? why not?
   ]
 
   self.spec_extras = {

data/lib/sportdb/parser/parser.rb

@@ -9,107 +9,103 @@ class RaccMatchParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-   103,    54,    60,   120,    28,    58,    35,    92,    23,   128,
-    80,    60,    81,    60,    43,   121,    41,    39,    38,    52,
-    55,    61,    62,    65,    65,    31,    55,    12,   127,    30,
-    61,    28,    61,    62,    40,    16,    12,    50,    30,    13,
-    28,    25,    14,    15,    16,    21,    23,    54,    13,    37,
-    25,    14,    15,    43,    21,    23,    72,    74,    75,    76,
-    36,    44,    47,    46,    68,    52,    55,    85,    86,   105,
-   106,   118,   119,   129,   130,   137,   130,    56,    66,    70,
-    71,    83,    87,    88,    65,    89,    91,    94,    96,    99,
-    40,   100,   101,    43,   108,    43,   110,    35,   112,   113,
-    80,    65,   122,   123,   124,    99,   126,   132,    65,    43,
-    43,    35,   135,    65,   138,    99,   140,   141 ]
+   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 ]
 
 racc_action_check = [
-    63,    19,    25,    82,    16,    21,    12,    52,    21,    95,
-    35,    99,    35,    50,    16,    82,    16,    15,    14,    19,
-    19,    25,    25,    63,    25,     1,    52,     1,    95,     1,
-    99,     1,    50,    50,    15,     1,     0,    18,     0,     1,
-     0,     1,     1,     1,     0,     1,     1,    48,     0,    13,
-     0,     0,     0,    27,     0,     0,    33,    33,    33,    33,
-    13,    17,    17,    17,    27,    48,    48,    38,    38,    65,
-    65,    81,    81,    97,    97,   125,   125,    20,    26,    28,
-    31,    36,    41,    42,    43,    45,    49,    53,    55,    56,
-    58,    59,    62,    67,    68,    70,    72,    73,    75,    76,
-    78,    80,    84,    87,    88,    91,    93,   100,   103,   107,
-   109,   115,   116,   117,   128,   130,   131,   134 ]
+    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 ]
 
 racc_action_pointer = [
     34,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    -1,    45,     3,    13,    -2,    57,    21,    -3,
-    72,   -13,   nil,   nil,   nil,    -4,    74,    37,    52,   nil,
-   nil,    80,   nil,    53,   nil,     2,    65,   nil,    49,   nil,
-   nil,    71,    72,    56,   nil,    68,   nil,   nil,    43,    81,
-     7,   nil,     3,    83,   nil,    72,    73,   nil,    69,    75,
-   nil,   nil,    76,    -5,   nil,    40,   nil,    77,    90,   nil,
-    79,   nil,    92,    90,   nil,    94,    95,   nil,    92,   nil,
-    73,    59,    -1,   nil,    98,   nil,   nil,    99,   100,   nil,
-   nil,    89,   nil,   102,   nil,     4,   nil,    69,   nil,     5,
-    81,   nil,   nil,    80,   nil,   nil,   nil,    93,   nil,    94,
-   nil,   nil,   nil,   nil,   nil,   104,   101,    85,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    71,   nil,   nil,    98,   nil,
-    99,   100,   nil,   nil,   108,   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 ]
 
 racc_action_default = [
    -90,   -90,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
    -10,   -11,   -90,   -90,   -41,   -54,   -90,   -90,   -90,   -90,
-   -66,   -51,   -53,   -56,   -65,   -90,   -90,   -74,   -90,   -79,
+   -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,   -66,
-   -90,   -46,   -90,   -90,   -60,   -90,   -90,   -52,   -54,   -90,
+   -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,   142,   -90,   -90,   -15,   -16,   -18,   -21,   -22,   -24,
+   -90,   138,   -90,   -90,   -15,   -16,   -18,   -21,   -22,   -24,
    -90,   -90,   -90,   -32,   -90,   -35,   -36,   -90,   -90,   -42,
-   -45,   -90,   -57,   -90,   -59,   -61,   -63,   -90,   -49,   -90,
-   -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,   -58,   -62,   -90,   -48,
-   -90,   -90,   -71,   -84,   -90,   -26,   -28,   -47,   -64,   -50,
-   -67,   -25 ]
+   -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 ]
 
 racc_goto_table = [
-    49,    34,    69,   102,    79,    97,    51,   107,     2,    32,
-   109,     1,    33,    73,    77,    78,   116,   117,    82,    84,
-   115,    45,    48,    57,    93,    95,   131,    42,    67,   104,
-   nil,   nil,   nil,   nil,   nil,    90,   nil,   nil,    98,   nil,
-   125,   nil,   nil,   133,   nil,   nil,   nil,   114,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   136,   nil,   nil,
-   nil,   nil,   111,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    98,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    69,   nil,    69,   nil,   nil,   nil,   nil,   nil,
+    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,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   134,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   139 ]
+   nil,   nil,   nil,   131,   nil,   nil,   nil,   nil,   135 ]
 
 racc_goto_check = [
-    28,    13,    38,    18,    17,    29,    27,    36,     2,     2,
+    26,    13,    38,    18,    17,    28,    27,    36,     2,     2,
     36,     1,    12,    14,    15,    16,    19,    20,    21,    22,
-    18,    24,    26,    30,    31,    32,    34,    35,    37,    40,
-   nil,   nil,   nil,   nil,   nil,    27,   nil,   nil,    28,   nil,
-    29,   nil,   nil,    18,   nil,   nil,   nil,    17,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,   nil,
+    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,    28,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    38,   nil,    38,   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,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28 ]
+   nil,   nil,   nil,    13,   nil,   nil,   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,     4,   -13,   -18,   -51,
-     2,   -28,   -30,   nil,   -73,    11,   -60,     1,   -25,   nil,
-   -36 ]
+   -64,   -18,   -19,   nil,     4,   nil,   -18,   -13,   -46,     2,
+   -29,   -31,   nil,   nil,   nil,     9,   -60,    -1,   -25,   nil,
+   -38 ]
 
 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,    20,   nil,
-    22,    53,   nil,    24,    59,    26,    27,   nil,    29,    63,
+   nil,   nil,   nil,    17,   nil,    18,    19,   nil,   nil,    21,
+    53,   nil,    23,    24,    59,    26,    27,   nil,    29,    63,
    nil ]
 
 racc_reduce_table = [
@@ -162,29 +158,29 @@ racc_reduce_table = [
   2, 39, :_reduce_46,
   5, 39, :_reduce_47,
   4, 39, :_reduce_48,
-  1, 60, :_reduce_49,
-  3, 60, :_reduce_50,
+  1, 59, :_reduce_49,
+  3, 59, :_reduce_50,
   1, 56, :_reduce_51,
   2, 56, :_reduce_52,
   1, 56, :_reduce_none,
-  1, 61, :_reduce_54,
-  2, 61, :_reduce_55,
-  1, 61, :_reduce_56,
+  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, 62, :_reduce_61,
-  3, 62, :_reduce_62,
-  1, 63, :_reduce_63,
-  3, 63, :_reduce_64,
+  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, 59, :_reduce_67,
+  3, 64, :_reduce_67,
   1, 65, :_reduce_none,
   1, 65, :_reduce_none,
-  3, 64, :_reduce_70,
-  4, 64, :_reduce_71,
+  3, 63, :_reduce_70,
+  2, 63, :_reduce_71,
   4, 40, :_reduce_72,
   2, 40, :_reduce_73,
   1, 66, :_reduce_74,
@@ -206,7 +202,7 @@ racc_reduce_table = [
 
 racc_reduce_n = 90
 
-racc_shift_n = 142
+racc_shift_n = 138
 
 racc_token_table = {
   false => 0,
@@ -322,12 +318,12 @@ Racc_token_to_s_table = [
   "match_opts",
   "match",
   "more_match_opts",
-  "match_fixture",
-  "more_match_fixtures",
+  "more_matches",
   "date_opts",
   "geo_opts",
   "geo_values",
   "match_result",
+  "match_fixture",
   "match_sep",
   "goal_lines_body",
   "goals",
@@ -761,7 +757,7 @@ module_eval(<<'.,.,', 'parser.y', 256)
 
 module_eval(<<'.,.,', 'parser.y', 264)
   def _reduce_67(val, _values, result)
-                                   puts "  match MATCH_FIXTURE"
+                                   puts "  RECUDE match_fixture"
                                result = { team1: val[0],
                                           team2: val[2] }   
 
@@ -775,29 +771,26 @@ module_eval(<<'.,.,', 'parser.y', 264)
 
 module_eval(<<'.,.,', 'parser.y', 275)
   def _reduce_70(val, _values, result)
-                             puts "  match TEXT  SCORE  TEXT"
-                         result = { team1: val[0],
-                                    team2: val[2],
-                                    score: val[1][1]
-                                  }   
+                               puts "  REDUCE => match_result : TEXT  SCORE  TEXT"
+                           result = { team1: val[0],
+                                      team2: val[2],
+                                      score: val[1][1]
+                                    }   
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 289)
+module_eval(<<'.,.,', 'parser.y', 283)
   def _reduce_71(val, _values, result)
-                             puts "  match TEXT match_sep TEXT SCORE"
-                         result = { team1: val[0], 
-                                    team2: val[2],
-                                    score: val[3][1] 
-                                  }
+                              puts "  REDUCE  => match_result : match_fixture SCORE"
+                          result = { score: val[1][1] }.merge( val[0] )  
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 311)
+module_eval(<<'.,.,', 'parser.y', 302)
   def _reduce_72(val, _values, result)
                            kwargs = val[1]
                        @tree << GoalLine.new( **kwargs )
@@ -806,7 +799,7 @@ module_eval(<<'.,.,', 'parser.y', 311)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 316)
+module_eval(<<'.,.,', 'parser.y', 307)
   def _reduce_73(val, _values, result)
                              kwargs = val[0]
                          @tree << GoalLine.new( **kwargs )
@@ -815,7 +808,7 @@ module_eval(<<'.,.,', 'parser.y', 316)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 321)
+module_eval(<<'.,.,', 'parser.y', 312)
   def _reduce_74(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: [] } 
@@ -824,7 +817,7 @@ module_eval(<<'.,.,', 'parser.y', 321)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 324)
+module_eval(<<'.,.,', 'parser.y', 315)
   def _reduce_75(val, _values, result)
       result = { goals1: [],
                                                               goals2: val[2] } 
@@ -833,7 +826,7 @@ module_eval(<<'.,.,', 'parser.y', 324)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 327)
+module_eval(<<'.,.,', 'parser.y', 318)
   def _reduce_76(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: val[2] }
@@ -846,51 +839,51 @@ module_eval(<<'.,.,', 'parser.y', 327)
 
 # reduce 78 omitted
 
-module_eval(<<'.,.,', 'parser.y', 341)
+module_eval(<<'.,.,', 'parser.y', 332)
   def _reduce_79(val, _values, result)
      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 342)
+module_eval(<<'.,.,', 'parser.y', 333)
   def _reduce_80(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 347)
+module_eval(<<'.,.,', 'parser.y', 349)
   def _reduce_81(val, _values, result)
-                    result = Goal.new( player:  val[0],
-                                   minutes: val[1] )   
+                      result = Goal.new( player:  val[0],
+                                     minutes: val[1] )   
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 354)
+module_eval(<<'.,.,', 'parser.y', 361)
   def _reduce_82(val, _values, result)
      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 355)
+module_eval(<<'.,.,', 'parser.y', 362)
   def _reduce_83(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 356)
+module_eval(<<'.,.,', 'parser.y', 363)
   def _reduce_84(val, _values, result)
      result.push( val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 362)
+module_eval(<<'.,.,', 'parser.y', 369)
   def _reduce_85(val, _values, result)
                             kwargs = {}.merge( val[0][1] )
                         result = Minute.new( **kwargs )
@@ -899,7 +892,7 @@ module_eval(<<'.,.,', 'parser.y', 362)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 367)
+module_eval(<<'.,.,', 'parser.y', 374)
   def _reduce_86(val, _values, result)
                             kwargs = { }.merge( val[0][1] ).merge( val[1] )
                         result = Minute.new( **kwargs )
@@ -908,21 +901,21 @@ module_eval(<<'.,.,', 'parser.y', 367)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 371)
+module_eval(<<'.,.,', 'parser.y', 378)
   def _reduce_87(val, _values, result)
       result = { og: true }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 372)
+module_eval(<<'.,.,', 'parser.y', 379)
   def _reduce_88(val, _values, result)
       result = { pen: true }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 377)
+module_eval(<<'.,.,', 'parser.y', 384)
   def _reduce_89(val, _values, result)
      puts '  MATCH empty_line'
     result

data/lib/sportdb/parser/token-score.rb

@@ -25,7 +25,7 @@ class Parser
              )?             # note: make penalty (P) score optional for now
             (?<et1>\d{1,2}) - (?<et2>\d{1,2})
                [ ]* #{ET_EN}
-               (?=[ \]]|$)
+               (?=[ ,\]]|$)
         )}ix
                 ## todo/check:  remove loakahead assertion here - why require space?
                 ## note: \b works only after non-alphanum e.g. )
@@ -38,7 +38,7 @@ class Parser
            \b
               (?<p1>\d{1,2}) - (?<p2>\d{1,2})
                 [ ]* #{P_EN}
-                (?=[ \]]|$)
+                (?=[ ,\]]|$)
          )}ix
                 ## todo/check:  remove loakahead assertion here - why require space?
                 ## note: \b works only after non-alphanum e.g. )
@@ -71,7 +71,7 @@ class Parser
                     )?
                 )?              # note: make half time (HT) score optional for now
               \)
-             (?=[ \]]|$)
+             (?=[ ,\]]|$)
             )}ix       ## todo/check:  remove loakahead assertion here - why require space?
                                ## note: \b works only after non-alphanum e.g. )
 
@@ -94,7 +94,7 @@ class Parser
          )?
      )?              # note: make half time (HT) score optional for now
    \)
-  (?=[ \]]|$)
+  (?=[ ,\]]|$)
     )}ix    ## todo/check:  remove loakahead assertion here - why require space?
             ## note: \b works only after non-alphanum e.g. )
 
@@ -112,7 +112,7 @@ class Parser
                 (?<ht1>\d{1,2}) - (?<ht2>\d{1,2})
                    [ ]* \)
                )?   # note: make half time (HT) score optional for now
-             (?=[ \]]|$)
+             (?=[ ,\]]|$)
              )}ix    ## todo/check:  remove loakahead assertion here - why require space?
                     ## note: \b works only after non-alphanum e.g. )
 

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 = 3
+  PATCH = 5
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/parser.rb

@@ -1,8 +1,5 @@
 ## pulls in
 require 'cocos'
-require 'season/formats'  # e.g. Season() support machinery
-
-
 
 
 ####
@@ -30,12 +27,6 @@ require_relative 'parser/tokenizer'
 require_relative 'parser/parser'
 
 
-####
-##  todo/check - move outline reader upstream to cocos - why? why not?
-##       use  read_outline(), parse_outline()  - why? why not?
-require_relative 'parser/outline_reader'
-
-
 
 ###
 #  make parser api (easily) available - why? why not?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-parser
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-18 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: season-formats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +97,6 @@ files:
 - config/rounds_pt.txt
 - lib/sportdb/parser.rb
 - lib/sportdb/parser/lang.rb
-- lib/sportdb/parser/outline_reader.rb
 - lib/sportdb/parser/parser.rb
 - lib/sportdb/parser/token-date.rb
 - lib/sportdb/parser/token-score.rb

data/lib/sportdb/parser/outline_reader.rb

@@ -1,155 +0,0 @@
-
-
-module SportDb
-
-###
-#  add a simple Outline convenience class
-#            for processing OUtlines with OUtlineReader
-
-class QuickMatchOutline
-   def self.read( path )
-       nodes = OutlineReader.read( path )
-       new( nodes )
-   end      
-
-   def initialize( nodes )
-      @nodes = nodes
-   end
-
-   def each_para( &blk )
-     ## note: every (new) read call - resets errors list to empty
-     ### @errors = []
-
-     ##  process nodes
-     h1 = nil
-     h2 = nil
-     orphans = 0    ## track paragraphs's with no heading
-
-     @nodes.each do |node|
-        type = node[0]
-
-        if type == :h1
-           h1 = node[1]  ## get heading text
-           puts "  = Heading 1 >#{node[1]}<"
-        elsif type == :h2
-           if h1.nil?
-             puts "!! WARN - no heading for subheading; skipping processing"
-             next
-           end
-           h2 = node[1]  ## get heading text
-           puts "  == Heading 2 >#{node[1]}<"
-        elsif type == :p
-           if h1.nil?
-             orphans += 1    ## only warn once
-             puts "!! WARN - no heading for #{orphans} text paragraph(s); skipping parse"
-             next
-           end
-
-           lines = node[1]
-           blk.call( lines )
-        else
-          pp node
-          raise ArgumentError, "unsupported (node) type >#{type}<"
-        end
-     end  # each node
-   end  # each_para
-   alias_method :each_paragraph, :each_para
-   alias_method :each_p,         :each_para
-end   # class QuickMatchOutline
-
-
-
-
-class OutlineReader
-
-  def self.debug=(value) @@debug = value; end
-  def self.debug?() @@debug ||= false; end
-  def debug?()  self.class.debug?; end
-
-
-
-  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
-    txt = File.open( path, 'r:utf-8' ) {|f| f.read }
-    parse( txt )
-  end
-
-  def self.parse( txt )
-    new( txt ).parse
-  end
-
-  def initialize( txt )
-    @txt = txt
-  end
-
-  ## note: skip "decorative" only heading e.g. ========
-  ##  todo/check:  find a better name e.g. HEADING_EMPTY_RE or HEADING_LINE_RE or ???
-  HEADING_BLANK_RE = %r{\A
-                        ={1,}
-                        \z}x
-
-  ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
-  HEADING_RE = %r{\A
-                  (?<marker>={1,})       ## 1. leading ======
-                    [ ]*
-                  (?<text>[^=]+)         ## 2. text   (note: for now no "inline" = allowed)
-                    [ ]*
-                    =*                   ## 3. (optional) trailing ====
-                  \z}x
-
-  def parse
-    outline=[]   ## outline structure
-    start_para = true      ## start new para(graph) on new text line?
-
-    @txt.each_line do |line|
-        line = line.strip      ## todo/fix: keep leading and trailing spaces - why? why not?
-
-        if line.empty?    ## todo/fix: keep blank line nodes?? and just remove comments and process headings?! - why? why not?
-          start_para = true
-          next
-        end
-
-        break if line == '__END__'
-
-        next if line.start_with?( '#' )   ## skip comments too
-        ## strip inline (until end-of-line) comments too
-        ##  e.g Eupen | KAS Eupen ## [de]
-        ##   => Eupen | KAS Eupen
-        ##  e.g bq   Bonaire,  BOE        # CONCACAF
-        ##   => bq   Bonaire,  BOE
-        line = line.sub( /#.*/, '' ).strip
-        pp line    if debug?
-
-        ## todo/check: also use heading blank as paragraph "breaker" or treat it like a comment ?? - why? why not?
-        next if HEADING_BLANK_RE.match( line )  # skip "decorative" only heading e.g. ========
-
-         ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
-        if m=HEADING_RE.match( line )
-           start_para = true
-
-           heading_marker = m[:marker]
-           heading_level  = heading_marker.length   ## count number of = for heading level
-           heading        = m[:text].strip
-
-           puts "heading #{heading_level} >#{heading}<"   if debug?
-           outline << [:"h#{heading_level}", heading]
-        else    ## assume it's a (plain/regular) text line
-           if start_para
-             outline << [:p, [line]]
-             start_para = false
-           else
-             node = outline[-1]    ## get last entry
-             if node[0] == :p      ##  assert it's a p(aragraph) node!!!
-                node[1] << line    ## add line to p(aragraph)
-             else
-               puts "!! ERROR - invalid outline state / format - expected p(aragraph) node; got:"
-               pp node
-               exit 1
-             end
-           end
-        end
-    end
-    outline
-  end # method read
-end # class OutlineReader
-
-end # module SportDb