sportdb-parser 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2016adc1039046c3994f4d30cfe9f6b9ab9065c22ca6b07a94429e93ddfbe1bb
-  data.tar.gz: ab301ed8b121015db6f196fc8a5a6988766ace5478ce8538491ed1ed2b7e21db
+  metadata.gz: 810f7cacd444fa67848438b267081211851a2ab8ff8e2da633bdf9c885bf102b
+  data.tar.gz: f15d3dc28d68c4d12737ace20fbc0f1110f1b0b864a96cf33950c6cb6b946a87
 SHA512:
-  metadata.gz: 5fb05929a62c6e99e33d52647f71ed48fd8ec57c4db808b3b5f47d47fa78c3308407dfc3eccd8d2fe2dd37b38863ff75a060d32eb8815ebd56792f5f3edafbb5
-  data.tar.gz: c3b3c924cc2ff525de7c048bf25ffa2d1cf23eac84d6bf4118ec1aa41d234262aeb805515ceb7e89f32fa78fb527888d9abd6fc6d1155ba8eea3bf4779d9e42c
+  metadata.gz: 7ccc2618cfb5400f869a18cb6fcbb5f1f7323515e439983c5ac65fe3c9fbd6a9bb53b501e3196cca01f00db921e1f08153854167d78fa0509da4cd2e99d7445a
+  data.tar.gz: 92395315b0e90b501584b48dfbd1dea206c35e8cf91dae3d2a2357e6d18f8948e5fd5ee3b855c77dd5c201205e0592451cb149487b17315bc58733aa304e8897

data/CHANGELOG.md

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

data/lib/sportdb/parser/lang.rb

@@ -4,7 +4,12 @@
 
 
 module SportDb
-class Parser
+
+## use module or class for Lang namespace??
+##   start with module for now
+
+
+module Lang
 
 ## Group A-Z
 ## Group 1-99
@@ -17,7 +22,7 @@ GROUP_RE = %r{^
                 Group [ ]
                    (?<key>[a-z0-9]+)
               $}ix
-def is_group?( text )
+def self.is_group?( text )
    ## use regex for match
    GROUP_RE.match?( text )
 end
@@ -191,9 +196,8 @@ def self.more_round_names
 end
 
 
-def is_round?( text )
-    ROUND_RE.match?( text ) ||
-    self.class.more_round_names.include?( text )
+def self.is_round?( text )
+    ROUND_RE.match?( text ) || more_round_names.include?( text )
 end
 
 ##
@@ -208,10 +212,10 @@ LEG_RE = %r{^
 $}ix
 
 ### Pair matches/games if marked with leg1 n leg2
-def is_leg?( text )
+def self.is_leg?( text )
    LEG_RE.match?( text )
 end
 
 
-end  # class Parser
+end  # module Lang
 end  # module SportDb

data/lib/sportdb/parser/outline_reader.rb

@@ -2,6 +2,64 @@
 
 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

data/lib/sportdb/parser/parser.rb

@@ -9,185 +9,200 @@ class RaccMatchParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-    95,    37,    26,    29,   112,    12,    87,    28,    58,    26,
-    81,    82,    41,    16,    39,    51,   113,    13,    38,    23,
-    14,    15,    61,    20,    22,    52,    56,    57,    12,    61,
-    28,    51,    26,    49,    52,    58,    16,    35,    97,    98,
-    13,    41,    23,    14,    15,    33,    20,    22,    34,    49,
-    52,    64,    54,    56,    57,    22,    68,    70,    71,    72,
-    42,    45,    44,    76,    36,    77,   110,   111,    47,    62,
-    66,    67,    79,    83,    84,    61,    85,    89,    91,    38,
-    92,    93,    41,   100,    41,   102,    33,   104,   105,    76,
-    61,   114,   115,   116,   117,   118,   119,    61,    41,    41,
-    33,   122,    61,   124,   125 ]
+   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 = [
-    59,    15,    16,     1,    78,     1,    49,     1,    23,     1,
-    36,    36,    16,     1,    16,    19,    78,     1,    15,     1,
-     1,     1,    59,     1,     1,    49,    23,    23,     0,    23,
-     0,    46,     0,    19,    19,    47,     0,    13,    61,    61,
-     0,    25,     0,     0,     0,    12,     0,     0,    13,    46,
-    46,    25,    20,    47,    47,    20,    31,    31,    31,    31,
-    17,    17,    17,    33,    14,    33,    77,    77,    18,    24,
-    26,    29,    34,    39,    40,    41,    43,    50,    52,    54,
-    55,    56,    63,    64,    66,    68,    69,    71,    72,    74,
-    76,    80,    83,    84,    88,    90,    93,    95,    99,   101,
-   107,   108,   109,   118,   121 ]
+    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 = [
-    26,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    38,    33,    49,    -3,    -4,    56,    52,    11,
-    34,   nil,   nil,     2,    65,    25,    44,   nil,   nil,    71,
-   nil,    53,   nil,    55,    56,   nil,    -8,   nil,   nil,    62,
-    63,    48,   nil,    59,   nil,   nil,    27,    29,   nil,     2,
-    73,   nil,    62,   nil,    58,    64,    65,   nil,   nil,    -5,
-   nil,    10,   nil,    66,    79,   nil,    68,   nil,    81,    79,
-   nil,    83,    84,   nil,    81,   nil,    63,    54,     0,   nil,
-    87,   nil,   nil,    88,    89,   nil,   nil,   nil,    90,   nil,
-    90,   nil,   nil,    71,   nil,    70,   nil,   nil,   nil,    82,
-   nil,    83,   nil,   nil,   nil,   nil,   nil,    93,    90,    75,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    87,   nil,
-   nil,    95,   nil,   nil,   nil,   nil ]
+    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 ]
 
 racc_action_default = [
-   -83,   -83,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
-   -10,   -11,   -83,   -83,   -41,   -50,   -83,   -83,   -83,   -83,
-   -47,   -49,   -52,   -83,   -83,   -67,   -83,   -72,   -82,   -83,
-    -2,   -83,   -13,   -20,   -83,   -39,   -83,   -37,   -51,   -83,
-   -83,   -83,   -40,   -83,   -43,   -44,   -83,   -83,   -46,   -83,
-   -83,   -56,   -83,   -48,   -50,   -83,   -83,   -63,   -64,   -74,
-   -75,   -78,   -66,   -83,   -70,   -73,   -83,   126,   -83,   -83,
-   -15,   -16,   -18,   -21,   -22,   -24,   -83,   -83,   -83,   -32,
-   -83,   -35,   -36,   -83,   -83,   -42,   -45,   -53,   -83,   -55,
-   -57,   -58,   -60,   -61,   -76,   -83,   -79,   -80,   -81,   -69,
-   -71,   -68,   -12,   -14,   -17,   -19,   -23,   -83,   -83,   -27,
-   -29,   -30,   -31,   -33,   -34,   -38,   -65,   -54,   -83,   -62,
-   -77,   -83,   -26,   -28,   -59,   -25 ]
+   -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 ]
 
 racc_goto_table = [
-    32,    65,    94,    75,    48,    99,     2,    30,   101,     1,
-    31,    69,    73,    74,   108,   109,    78,    80,    43,   107,
-    46,    53,    88,    90,    40,    63,    96,   nil,   nil,   nil,
-   nil,    86,   nil,   nil,   nil,   nil,   nil,   nil,   120,   nil,
-   nil,   nil,   nil,   nil,   106,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   123,   nil,   nil,   nil,   nil,   103,   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,   nil,    65,   nil,    65,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   121 ]
+   nil,   nil,   nil,   131,   nil,   nil,   nil,   nil,   135 ]
 
 racc_goto_check = [
-    13,    35,    18,    17,    27,    33,     2,     2,    33,     1,
-    12,    14,    15,    16,    19,    20,    21,    22,    24,    18,
-    26,    28,    29,    30,    32,    34,    37,   nil,   nil,   nil,
-   nil,    27,   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,
-   nil,   nil,   nil,   nil,    17,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    18,   nil,   nil,   nil,   nil,    13,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    35,   nil,    35,   nil,   nil,
+    26,    13,    38,    18,    17,    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,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    13 ]
+   nil,   nil,   nil,    13,   nil,   nil,   nil,   nil,    26 ]
 
 racc_goto_pointer = [
-   nil,     9,     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    -2,   -12,   -20,   -21,   -20,   -30,   -57,   -63,
-   -62,   -18,   -19,   nil,     1,   nil,     2,   -15,     1,   -27,
-   -29,   nil,     8,   -58,     0,   -24,   nil,   -35 ]
+   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 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     3,     4,     5,     6,     7,     8,     9,
-    10,    11,   nil,   nil,   nil,   nil,   nil,   nil,    60,   nil,
-   nil,   nil,   nil,    17,   nil,    18,    19,   nil,    21,    50,
-   nil,    55,    24,    25,   nil,    27,    59,   nil ]
+    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,
+   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 31, :_reduce_none,
-  2, 31, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
   1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  4, 41, :_reduce_12,
-  1, 42, :_reduce_13,
-  3, 42, :_reduce_14,
-  2, 42, :_reduce_15,
-  1, 44, :_reduce_none,
-  2, 44, :_reduce_17,
-  1, 44, :_reduce_none,
-  2, 44, :_reduce_19,
-  1, 43, :_reduce_20,
-  2, 43, :_reduce_21,
-  1, 45, :_reduce_22,
-  2, 45, :_reduce_23,
-  1, 45, :_reduce_24,
-  4, 47, :_reduce_25,
-  3, 46, :_reduce_26,
-  1, 49, :_reduce_27,
-  2, 49, :_reduce_28,
-  1, 50, :_reduce_none,
-  1, 50, :_reduce_none,
-  4, 36, :_reduce_31,
-  1, 51, :_reduce_32,
-  2, 51, :_reduce_33,
-  4, 37, :_reduce_34,
-  1, 52, :_reduce_35,
-  1, 52, :_reduce_36,
-  2, 33, :_reduce_37,
-  4, 33, :_reduce_38,
-  2, 34, :_reduce_39,
-  2, 35, :_reduce_40,
-  1, 53, :_reduce_41,
-  3, 53, :_reduce_42,
-  1, 54, :_reduce_none,
-  1, 54, :_reduce_none,
-  3, 38, :_reduce_45,
-  2, 38, :_reduce_46,
-  1, 55, :_reduce_47,
-  2, 55, :_reduce_48,
+  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, 55, :_reduce_none,
-  1, 58, :_reduce_50,
-  2, 58, :_reduce_51,
-  1, 58, :_reduce_52,
-  2, 57, :_reduce_53,
-  3, 57, :_reduce_54,
-  2, 57, :_reduce_55,
-  1, 57, :_reduce_56,
-  2, 59, :_reduce_57,
-  1, 60, :_reduce_58,
-  3, 60, :_reduce_59,
-  3, 56, :_reduce_60,
-  3, 56, :_reduce_61,
-  4, 56, :_reduce_62,
-  1, 61, :_reduce_63,
-  1, 61, :_reduce_64,
-  4, 39, :_reduce_65,
-  2, 39, :_reduce_66,
-  1, 62, :_reduce_67,
-  3, 62, :_reduce_68,
-  3, 62, :_reduce_69,
-  1, 64, :_reduce_none,
-  2, 64, :_reduce_none,
-  1, 63, :_reduce_72,
-  2, 63, :_reduce_73,
-  2, 65, :_reduce_74,
-  1, 66, :_reduce_75,
-  2, 66, :_reduce_76,
-  3, 66, :_reduce_77,
-  1, 48, :_reduce_78,
-  2, 48, :_reduce_79,
-  1, 67, :_reduce_80,
-  1, 67, :_reduce_81,
-  1, 40, :_reduce_82 ]
-
-racc_reduce_n = 83
-
-racc_shift_n = 126
+  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 ]
+
+racc_reduce_n = 90
+
+racc_shift_n = 138
 
 racc_token_table = {
   false => 0,
@@ -214,14 +229,15 @@ racc_token_table = {
   :TIME => 21,
   :STATUS => 22,
   "@" => 23,
-  :VS => 24,
-  :SCORE => 25,
-  ";" => 26,
-  :MINUTE => 27,
-  :OG => 28,
-  :PEN => 29 }
+  :TIMEZONE => 24,
+  :VS => 25,
+  :SCORE => 26,
+  ";" => 27,
+  :MINUTE => 28,
+  :OG => 29,
+  :PEN => 30 }
 
-racc_nt_base = 30
+racc_nt_base = 31
 
 racc_use_result_var = true
 
@@ -267,6 +283,7 @@ Racc_token_to_s_table = [
   "TIME",
   "STATUS",
   "\"@\"",
+  "TIMEZONE",
   "VS",
   "SCORE",
   "\";\"",
@@ -301,10 +318,13 @@ Racc_token_to_s_table = [
   "match_opts",
   "match",
   "more_match_opts",
+  "more_matches",
   "date_opts",
   "geo_opts",
   "geo_values",
-  "score_value",
+  "match_result",
+  "match_fixture",
+  "match_sep",
   "goal_lines_body",
   "goals",
   "goal_sep",
@@ -573,19 +593,14 @@ module_eval(<<'.,.,', 'parser.y', 165)
 
 module_eval(<<'.,.,', 'parser.y', 176)
   def _reduce_45(val, _values, result)
-                           puts "match:"
-                       pp val[1]
-                       puts "more match opts:"
-                       pp val[2]  
-
-                       kwargs = {}.merge( val[0], val[1], val[2] )
+                           kwargs = {}.merge( val[0], val[1], val[2] )
                        @tree << MatchLine.new( **kwargs )
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 186)
+module_eval(<<'.,.,', 'parser.y', 181)
   def _reduce_46(val, _values, result)
                           kwargs = {}.merge( val[0], val[1] )
                       @tree << MatchLine.new( **kwargs )
@@ -594,141 +609,189 @@ module_eval(<<'.,.,', 'parser.y', 186)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 191)
+module_eval(<<'.,.,', 'parser.y', 189)
   def _reduce_47(val, _values, result)
-       result = { ord: val[0][1][:value] }
+                          kwargs = {}.merge( val[0], val[1] )
+                      @tree << MatchLine.new( **kwargs )
+                     
+                      ## add more match fixtures
+                      val[3].each do |kwargs|
+                         @tree << MatchLine.new( **kwargs)
+                      end
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 192)
+module_eval(<<'.,.,', 'parser.y', 199)
   def _reduce_48(val, _values, result)
-       result = { ord: val[0][1][:value] }.merge( val[1] )
+                          kwargs = val[0]
+                      @tree << MatchLine.new( **kwargs )
+ 
+                      ## add more match fixtures
+                      val[2].each do |kwargs|
+                         @tree << MatchLine.new( **kwargs)
+                      end
+
     result
   end
 .,.,
 
-# reduce 49 omitted
+module_eval(<<'.,.,', 'parser.y', 213)
+  def _reduce_49(val, _values, result)
+                                        puts "  REDUCE => more_match_fixtures : match_fixture" 
+                                    result = val
 
-module_eval(<<'.,.,', 'parser.y', 196)
-  def _reduce_50(val, _values, result)
-       result = { date: val[0][1]}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 197)
-  def _reduce_51(val, _values, result)
-       result = { date: val[0][1], time: val[1][1] }
+module_eval(<<'.,.,', 'parser.y', 218)
+  def _reduce_50(val, _values, result)
+                                         puts "  REDUCE => more_match_fixtures : more_match_fixtures ',' match_fixture " 
+                                     result.push( val[2] )
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 198)
-  def _reduce_52(val, _values, result)
-       result = { time: val[0][1]}
+module_eval(<<'.,.,', 'parser.y', 224)
+  def _reduce_51(val, _values, result)
+       result = { ord: val[0][1][:value] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 204)
-  def _reduce_53(val, _values, result)
-                          ## todo - add possible status_notes too!!! 
-                      result = { status: val[0][1][:status] }
-
+module_eval(<<'.,.,', 'parser.y', 225)
+  def _reduce_52(val, _values, result)
+       result = { ord: val[0][1][:value] }.merge( val[1] )
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 209)
-  def _reduce_54(val, _values, result)
-                         result = { status: val[0][1][:status], 
-                                geo:    val[1] } 
+# reduce 53 omitted
 
+module_eval(<<'.,.,', 'parser.y', 229)
+  def _reduce_54(val, _values, result)
+       result = { date: val[0][1]}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 212)
+module_eval(<<'.,.,', 'parser.y', 230)
   def _reduce_55(val, _values, result)
-     result = { geo: val[0] }
+       result = { date: val[0][1], time: val[1][1] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 213)
+module_eval(<<'.,.,', 'parser.y', 231)
   def _reduce_56(val, _values, result)
-     result = {}
+       result = { time: val[0][1]}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 218)
+module_eval(<<'.,.,', 'parser.y', 237)
   def _reduce_57(val, _values, result)
-     result = val[1]
+                          ## todo - add possible status_notes too!!! 
+                      result = { status: val[0][1][:status] }
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 221)
+module_eval(<<'.,.,', 'parser.y', 242)
   def _reduce_58(val, _values, result)
-      result = val
+                         result = { status: val[0][1][:status] }.merge( val[1] ) 
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 222)
+module_eval(<<'.,.,', 'parser.y', 244)
   def _reduce_59(val, _values, result)
-      result.push( val[2] )
+     result = {}.merge( val[0] )
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 227)
+module_eval(<<'.,.,', 'parser.y', 245)
   def _reduce_60(val, _values, result)
-                             result = { team1: val[0],
-                                    team2: val[2]
-                                  }.merge( val[1] )   
-
+     result = {}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 233)
+module_eval(<<'.,.,', 'parser.y', 251)
   def _reduce_61(val, _values, result)
-                             result = { team1: val[0], team2: val[2] }   
-
+     result = { geo: val[1] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 237)
+module_eval(<<'.,.,', 'parser.y', 252)
   def _reduce_62(val, _values, result)
-                             result = { team1: val[0], 
-                                    team2: val[2],
-                                    score: val[3][1] 
-                                  }
-
+     result = { geo: val[1], timezone: val[2] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 243)
+module_eval(<<'.,.,', 'parser.y', 255)
   def _reduce_63(val, _values, result)
-      result = { score: val[0][1] }
+      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 244)
+module_eval(<<'.,.,', 'parser.y', 256)
   def _reduce_64(val, _values, result)
-      result = {}
+      result.push( val[2] )
+    result
+  end
+.,.,
+
+# reduce 65 omitted
+
+# reduce 66 omitted
+
+module_eval(<<'.,.,', 'parser.y', 264)
+  def _reduce_67(val, _values, result)
+                                   puts "  RECUDE match_fixture"
+                               result = { team1: val[0],
+                                          team2: val[2] }   
+
+    result
+  end
+.,.,
+
+# reduce 68 omitted
+
+# reduce 69 omitted
+
+module_eval(<<'.,.,', 'parser.y', 275)
+  def _reduce_70(val, _values, result)
+                               puts "  REDUCE => match_result : TEXT  SCORE  TEXT"
+                           result = { team1: val[0],
+                                      team2: val[2],
+                                      score: val[1][1]
+                                    }   
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 283)
+  def _reduce_71(val, _values, result)
+                              puts "  REDUCE  => match_result : match_fixture SCORE"
+                          result = { score: val[1][1] }.merge( val[0] )  
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 261)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 302)
+  def _reduce_72(val, _values, result)
                            kwargs = val[1]
                        @tree << GoalLine.new( **kwargs )
 
@@ -736,8 +799,8 @@ module_eval(<<'.,.,', 'parser.y', 261)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 266)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 307)
+  def _reduce_73(val, _values, result)
                              kwargs = val[0]
                          @tree << GoalLine.new( **kwargs )
 
@@ -745,8 +808,8 @@ module_eval(<<'.,.,', 'parser.y', 266)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 271)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 312)
+  def _reduce_74(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: [] } 
 
@@ -754,8 +817,8 @@ module_eval(<<'.,.,', 'parser.y', 271)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 274)
-  def _reduce_68(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 315)
+  def _reduce_75(val, _values, result)
       result = { goals1: [],
                                                               goals2: val[2] } 
 
@@ -763,8 +826,8 @@ module_eval(<<'.,.,', 'parser.y', 274)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 277)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 318)
+  def _reduce_76(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: val[2] }
 
@@ -772,56 +835,56 @@ module_eval(<<'.,.,', 'parser.y', 277)
   end
 .,.,
 
-# reduce 70 omitted
+# reduce 77 omitted
 
-# reduce 71 omitted
+# reduce 78 omitted
 
-module_eval(<<'.,.,', 'parser.y', 291)
-  def _reduce_72(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 332)
+  def _reduce_79(val, _values, result)
      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 292)
-  def _reduce_73(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 333)
+  def _reduce_80(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 297)
-  def _reduce_74(val, _values, result)
-                    result = Goal.new( player:  val[0],
-                                   minutes: val[1] )   
+module_eval(<<'.,.,', 'parser.y', 349)
+  def _reduce_81(val, _values, result)
+                      result = Goal.new( player:  val[0],
+                                     minutes: val[1] )   
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 304)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 361)
+  def _reduce_82(val, _values, result)
      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 305)
-  def _reduce_76(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 362)
+  def _reduce_83(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 306)
-  def _reduce_77(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 363)
+  def _reduce_84(val, _values, result)
      result.push( val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 312)
-  def _reduce_78(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 369)
+  def _reduce_85(val, _values, result)
                             kwargs = {}.merge( val[0][1] )
                         result = Minute.new( **kwargs )
 
@@ -829,8 +892,8 @@ module_eval(<<'.,.,', 'parser.y', 312)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 317)
-  def _reduce_79(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 374)
+  def _reduce_86(val, _values, result)
                             kwargs = { }.merge( val[0][1] ).merge( val[1] )
                         result = Minute.new( **kwargs )
 
@@ -838,22 +901,22 @@ module_eval(<<'.,.,', 'parser.y', 317)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 321)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 378)
+  def _reduce_87(val, _values, result)
       result = { og: true }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 322)
-  def _reduce_81(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 379)
+  def _reduce_88(val, _values, result)
       result = { pen: true }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 327)
-  def _reduce_82(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 384)
+  def _reduce_89(val, _values, result)
      puts '  MATCH empty_line'
     result
   end

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

data/lib/sportdb/parser.rb

@@ -17,6 +17,9 @@ require 'season/formats'  # e.g. Season() support machinery
 
 
 require_relative 'parser/version'
+
+require_relative 'parser/lang'
+
 require_relative 'parser/token-score'
 require_relative 'parser/token-date'
 require_relative 'parser/token-text'
@@ -24,7 +27,6 @@ require_relative 'parser/token-status'
 require_relative 'parser/token'
 require_relative 'parser/tokenizer'
 
-require_relative 'parser/lang'
 require_relative 'parser/parser'
 
 
@@ -51,6 +53,19 @@ end  # module SportDb
 
 
 module SportDb
+
+
+
+class Parser
+  ## keep "old" access to checking for group, round & friends
+  ##    for now for compatibility
+  def is_group?( text )  Lang.is_group?( text ); end
+  def is_round?( text )  Lang.is_round?( text ); end
+  def is_leg?( text )    Lang.is_leg?( text ); end
+end
+
+
+
 class Tokenizer  
     
    attr_reader :tokens
@@ -236,7 +251,8 @@ end
 MatchLine   = Struct.new( :ord, :date, :time,
                           :team1, :team2, :score,
                           :status, 
-                          :geo )  do   ## change to geos - why? why not?
+                          :geo,
+                          :timezone )  do   ## change to geos - why? why not?
 
   def pretty_print( printer )
     printer.text( "<MatchLine " )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-parser
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos