sportdb-parser 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b299ddece5e64b86bb7ee6b55578099b0624b11d8e5f10721363f45d6ef5d8d8
-  data.tar.gz: 5712c99b200e6116c9f07fba1215a4bf2560e5bd848c3c8cc48959aa17997b85
+  metadata.gz: 85526406c8cd97a5b4e8580e64597b60f2046f4667a97080434238e067be2788
+  data.tar.gz: dcd5e6aaa854654974644c026fb99545c31ef2d5929d0518d8418630b5d6ea76
 SHA512:
-  metadata.gz: 5d2fce54482e12542c35abd46a292d7f5e6b4db894bba3a7f911269f116d9fa530653d36ace4295e2f819bb974093b5567a5494a2d50b54ee3f250b314d40a73
-  data.tar.gz: 7b6ef8aaafa2d20c0356fcdc048211f24a04cc4f95819ad8d225b2c9a4a29e44d8f415190acfbe3e31b2f9cc457a12f8e75c460394e984d5b9b1f476f0f8e30f
+  metadata.gz: fc086846a66d2657d3debae5562fe20fbd2327741c8af1485972dfd0b8f46b3c649c0345ba173f2d3f40622bd4bddecc7ea0072d4d129bc5dc542554c539ebab
+  data.tar.gz: c0c4653cb40cb89e8086b6dc00ed853c62abf75fc18972cf98230a779cd8a7f73d797098ec53c2e942e6271c00c9d11a1da8f6975704141cbfbba599ec741098

data/CHANGELOG.md

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

data/lib/sportdb/parser/lexer.rb

@@ -389,7 +389,9 @@ def _tokenize_line( line )
              puts "!!! TOKENIZE ERROR (PROP_RE) - no match found"
              nil 
          end
-      else  ## assume TOP_LEVEL (a.k.a. RE) machinery
+      ###################################################
+      ## assume TOP_LEVEL (a.k.a. RE) machinery
+      else  
         if m[:space] || m[:spaces]
            nil   ## skip space(s)
         elsif m[:prop_key]
@@ -408,6 +410,11 @@ def _tokenize_line( line )
           else
              [:STATUS, [m[:status], {status: m[:status] } ]]
           end
+        elsif m[:note]
+            ###  todo/check:
+            ##      use value hash - why? why not? or simplify to:
+            ##  [:NOTE, m[:note]] 
+             [:NOTE, [m[:note], {note: m[:note] } ]]
         elsif m[:time]
               ## unify to iso-format
               ###   12.40 => 12:40

data/lib/sportdb/parser/parser.rb

@@ -9,124 +9,126 @@ class RaccMatchParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-    15,    12,    16,   163,    84,   126,   157,    42,    17,    45,
-    74,   109,    75,    72,   110,    21,    81,    32,    33,    18,
-    69,    36,    19,    23,   158,    24,    25,   162,    27,    30,
-    32,    33,    15,    12,    16,    59,    39,    39,    44,    42,
-    17,    47,    70,    59,    82,    77,    78,    21,    42,   166,
-    50,    18,    72,    36,    19,    23,   167,    24,    25,   123,
-    27,    30,    32,    33,    55,    61,    56,   178,    39,    66,
-    44,    50,    64,   152,   167,    98,   101,    99,   100,    44,
-   140,    70,    59,    98,   101,    99,   100,    51,   105,    63,
-   102,   104,   136,    77,    78,    94,    44,    89,   114,   115,
-   138,   139,   155,   156,    52,    53,    59,   -73,   -74,    60,
-    36,    76,    86,    87,    91,    94,    95,   112,   116,   117,
-   119,   120,   -63,   121,    36,   128,   129,   130,    94,    44,
-   133,    44,   142,   143,   144,   145,   146,    50,   148,   149,
-   109,   159,   160,   161,   164,    36,   168,    44,    44,    94,
-   170,   171,   172,   173,    50,   175,   176,   177,    36,   180,
-   181 ]
+    15,    12,    16,    45,    85,   127,   160,    42,    17,    47,
+    75,   110,    76,    73,   111,    21,    82,    32,    33,    18,
+    69,    36,    19,    23,   161,    24,    25,   129,    27,    30,
+    32,    33,    50,    15,    12,    16,    59,    39,    39,    44,
+    42,    17,    70,    72,    59,    83,    78,    79,    21,    42,
+   166,    51,    18,    73,    36,    19,    23,   130,    24,    25,
+   124,    27,    30,    32,    33,    55,    50,    56,   155,    61,
+    39,   169,    44,    66,   139,   165,    64,    95,   170,   182,
+    52,    44,    70,    72,    59,   143,   170,    53,    99,   102,
+   100,   101,    59,    63,    99,   102,   100,   101,   106,   -73,
+   103,   105,    78,    79,    44,    90,   115,   116,   141,   142,
+   158,   159,   -74,    60,    36,    77,    87,    88,    92,    95,
+    96,   113,   117,   118,   120,   121,   -63,   122,    36,   131,
+   132,   133,    95,    44,   136,    44,   145,   146,   147,   148,
+   149,    50,   151,   152,   110,   162,   163,   164,   167,    36,
+   171,   172,    44,    44,    95,   174,   175,   176,   177,    50,
+   179,   180,   181,    36,   184,   185 ]
 
 racc_action_check = [
-     0,     0,     0,   118,    37,    70,   111,     0,     0,     1,
+     0,     0,     0,     1,    37,    70,   112,     0,     0,    16,
     30,    50,    30,    29,    50,     0,    36,    30,    30,     0,
-    29,     0,     0,     0,   111,     0,     0,   118,     0,     0,
-     0,     0,     2,     2,     2,    70,     0,    37,     0,     2,
-     2,    16,    29,    29,    36,    36,    36,     2,    21,   124,
-    17,     2,    67,     2,     2,     2,   124,     2,     2,    67,
-     2,     2,     2,     2,    21,    26,    21,   165,     2,    26,
-     2,   109,    26,   109,   165,    47,    47,    47,    47,    21,
-    96,    67,    67,    96,    96,    96,    96,    18,    48,    26,
-    48,    48,    92,    35,    35,    92,    41,    41,    52,    52,
-    94,    94,   110,   110,    19,    20,    22,    23,    24,    25,
-    28,    33,    39,    40,    42,    44,    45,    51,    54,    57,
-    59,    62,    64,    65,    69,    71,    80,    83,    86,    88,
-    89,    91,    98,    99,   100,   101,   102,   103,   104,   105,
-   107,   113,   116,   117,   120,   123,   127,   132,   134,   136,
-   142,   143,   144,   151,   152,   153,   154,   163,   167,   173,
-   174 ]
+    29,     0,     0,     0,   112,     0,     0,    71,     0,     0,
+     0,     0,    17,     2,     2,     2,    70,     0,    37,     0,
+     2,     2,    29,    29,    29,    36,    36,    36,     2,    21,
+   119,    18,     2,    67,     2,     2,     2,    71,     2,     2,
+    67,     2,     2,     2,     2,    21,   110,    21,   110,    26,
+     2,   125,     2,    26,    93,   119,    26,    93,   125,   168,
+    19,    21,    67,    67,    67,    97,   168,    20,    97,    97,
+    97,    97,    22,    26,    47,    47,    47,    47,    48,    23,
+    48,    48,    35,    35,    41,    41,    52,    52,    95,    95,
+   111,   111,    24,    25,    28,    33,    39,    40,    42,    44,
+    45,    51,    54,    57,    59,    62,    64,    65,    69,    72,
+    81,    84,    87,    89,    90,    92,    99,   100,   101,   102,
+   103,   104,   105,   106,   108,   114,   117,   118,   121,   124,
+   128,   130,   135,   137,   139,   145,   146,   147,   154,   155,
+   156,   157,   166,   170,   177,   178 ]
 
 racc_action_pointer = [
-    -1,     9,    31,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    66,    83,
-   101,    40,    72,    85,    86,   105,    61,   nil,    88,     9,
-   -14,   nil,   nil,    80,   nil,    56,     8,     0,   nil,    73,
-   109,    57,    74,   nil,   101,   116,   nil,    70,    80,   nil,
-    -2,    95,    74,   nil,   101,   nil,   nil,   102,   nil,   114,
-   nil,   nil,    94,   nil,    93,    94,   nil,    48,   nil,   102,
-     1,   121,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   104,   nil,   nil,   105,   nil,   nil,   114,   nil,    90,   126,
-   nil,    92,    81,   nil,    59,   nil,    78,   nil,   126,   127,
-   128,   131,   132,   125,   134,   135,   nil,   127,   nil,    59,
-    84,     2,   nil,   137,   nil,   nil,   138,   139,    -8,   nil,
-   140,   nil,   nil,   123,    45,   nil,   nil,   142,   nil,   nil,
-   nil,   nil,   108,   nil,   109,   nil,   135,   nil,   nil,   nil,
-   nil,   nil,   146,   147,   148,   nil,   nil,   nil,   nil,   nil,
-   nil,   139,   142,   138,   142,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   151,   nil,    63,   nil,   136,   nil,   nil,
-   nil,   nil,   nil,   144,   145,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil ]
+    -1,     3,    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     5,    20,    30,    59,
+    83,    41,    57,    77,    90,   109,    65,   nil,    92,     9,
+   -14,   nil,   nil,    84,   nil,    64,     8,     0,   nil,    76,
+   113,    64,    77,   nil,   105,   120,   nil,    89,    90,   nil,
+    -2,    99,    82,   nil,   105,   nil,   nil,   106,   nil,   118,
+   nil,   nil,    98,   nil,    97,    98,   nil,    49,   nil,   106,
+     1,    23,   125,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   108,   nil,   nil,   109,   nil,   nil,   118,   nil,    93,
+   130,   nil,    95,    63,   nil,    66,   nil,    83,   nil,   130,
+   131,   132,   135,   136,   129,   138,   139,   nil,   131,   nil,
+    54,    92,     2,   nil,   141,   nil,   nil,   142,   143,    39,
+   nil,   144,   nil,   nil,   127,    67,   nil,   nil,   146,   nil,
+   147,   nil,   nil,   nil,   nil,   112,   nil,   113,   nil,   140,
+   nil,   nil,   nil,   nil,   nil,   151,   152,   153,   nil,   nil,
+   nil,   nil,   nil,   nil,   144,   147,   143,   147,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   156,   nil,    75,   nil,
+   141,   nil,   nil,   nil,   nil,   nil,   nil,   149,   150,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -1,  -116,    -2,    -3,    -5,    -6,    -7,    -8,    -9,   -10,
-   -11,   -12,   -13,   -14,   -15,   -16,  -116,  -116,  -116,  -116,
-  -116,  -116,   -51,   -53,   -54,  -116,  -116,   -60,  -116,  -116,
-   -70,   -72,   -75,   -76,   -86,   -87,  -116,  -116,   -96,  -116,
-  -116,  -101,  -116,  -106,  -116,  -116,    -4,  -116,  -116,   -25,
-   -32,  -116,  -116,   -49,  -116,   -53,   -54,  -116,   -52,  -116,
-   -55,   -56,  -116,   -58,   -59,  -116,   -62,  -116,   -65,  -116,
-  -116,  -116,   -81,   -71,   -73,   -74,   -77,   -91,   -92,   -94,
-  -116,   -89,   -90,  -116,   -95,   -97,  -116,  -100,  -116,  -104,
-  -107,  -116,  -108,  -109,  -112,   182,  -116,   -18,  -116,  -116,
-  -116,  -116,  -116,  -116,   -27,   -29,   -31,   -33,   -35,  -116,
-  -116,  -116,   -44,  -116,   -47,   -48,  -116,  -116,   -82,   -84,
-  -116,   -61,   -64,  -116,  -116,   -68,   -78,  -116,   -80,   -88,
-   -93,   -98,  -103,  -105,  -102,  -110,  -116,  -113,  -114,  -115,
-   -17,   -19,  -116,  -116,  -116,   -23,   -24,   -26,   -28,   -30,
-   -34,  -116,  -116,  -116,   -39,   -41,   -42,   -43,   -45,   -46,
-   -50,   -99,   -83,  -116,   -57,  -116,   -67,  -116,   -79,  -111,
-   -20,   -21,   -22,  -116,  -116,   -38,   -40,   -85,   -66,   -69,
-   -36,   -37 ]
+    -1,  -118,    -2,    -3,    -5,    -6,    -7,    -8,    -9,   -10,
+   -11,   -12,   -13,   -14,   -15,   -16,  -118,  -118,  -118,  -118,
+  -118,  -118,   -51,   -53,   -54,  -118,  -118,   -60,  -118,  -118,
+   -70,   -72,   -75,   -76,   -88,   -89,  -118,  -118,   -98,  -118,
+  -118,  -103,  -118,  -108,  -118,  -118,    -4,  -118,  -118,   -25,
+   -32,  -118,  -118,   -49,  -118,   -53,   -54,  -118,   -52,  -118,
+   -55,   -56,  -118,   -58,   -59,  -118,   -62,  -118,   -65,  -118,
+  -118,  -118,  -118,   -83,   -71,   -73,   -74,   -77,   -93,   -94,
+   -96,  -118,   -91,   -92,  -118,   -97,   -99,  -118,  -102,  -118,
+  -106,  -109,  -118,  -110,  -111,  -114,   186,  -118,   -18,  -118,
+  -118,  -118,  -118,  -118,  -118,   -27,   -29,   -31,   -33,   -35,
+  -118,  -118,  -118,   -44,  -118,   -47,   -48,  -118,  -118,   -84,
+   -86,  -118,   -61,   -64,  -118,  -118,   -68,   -78,  -118,   -80,
+  -118,   -82,   -90,   -95,  -100,  -105,  -107,  -104,  -112,  -118,
+  -115,  -116,  -117,   -17,   -19,  -118,  -118,  -118,   -23,   -24,
+   -26,   -28,   -30,   -34,  -118,  -118,  -118,   -39,   -41,   -42,
+   -43,   -45,   -46,   -50,  -101,   -85,  -118,   -57,  -118,   -67,
+  -118,   -79,   -81,  -113,   -20,   -21,   -22,  -118,  -118,   -38,
+   -40,   -87,   -66,   -69,   -36,   -37 ]
 
 racc_goto_table = [
-    67,    49,   108,    90,   124,    93,    97,    68,    58,   132,
-     1,     3,   134,    46,    79,    83,     2,    96,    48,   103,
-   106,   107,   153,   154,   111,   113,    54,    62,    65,    73,
-   118,    80,    85,    57,    88,    92,   137,   nil,   nil,   nil,
-   nil,   125,   nil,   nil,   nil,   122,   nil,   131,   nil,   nil,
-   nil,   nil,   nil,   135,   nil,   141,   127,   nil,   165,   150,
+    67,    49,   109,    91,   125,    94,    98,    58,    68,   135,
+     1,     3,   137,    46,    80,    84,     2,    97,    48,   104,
+   107,   108,   156,   157,   112,   114,    54,    62,    65,    74,
+   119,    81,    86,    57,    89,    93,   140,   nil,   nil,   nil,
+   nil,   126,   nil,   nil,   nil,   nil,   123,   nil,   134,   nil,
+   nil,   nil,   nil,   nil,   138,   128,   144,   nil,   nil,   168,
+   153,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   150,   nil,
+   nil,   nil,   nil,   nil,   154,   nil,   126,    91,   nil,    91,
+   173,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   147,   nil,   nil,
-   nil,   nil,   nil,   151,    90,   125,    90,   169,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   174,   nil,   nil,   179 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   178,
+   nil,   nil,   183 ]
 
 racc_goto_check = [
-    33,    17,    21,    48,    35,    44,    15,    34,    28,    46,
+    33,    17,    21,    48,    35,    44,    15,    28,    34,    46,
      1,     3,    46,     3,    41,    41,     2,    14,    16,    18,
     19,    20,    22,    23,    24,    25,    26,    30,    31,    36,
     37,    40,    43,    45,    47,    49,    50,   nil,   nil,   nil,
-   nil,    33,   nil,   nil,   nil,    34,   nil,    44,   nil,   nil,
-   nil,   nil,   nil,    44,   nil,    15,    28,   nil,    35,    21,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    33,   nil,   nil,   nil,   nil,    34,   nil,    44,   nil,
+   nil,   nil,   nil,   nil,    44,    28,    15,   nil,   nil,    35,
+    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    17,   nil,   nil,
-   nil,   nil,   nil,    17,    48,    33,    48,    44,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    17,   nil,
+   nil,   nil,   nil,   nil,    17,   nil,    33,    48,   nil,    48,
+    44,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    17,   nil,   nil,    33 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    17,
+   nil,   nil,    33 ]
 
 racc_goto_pointer = [
    nil,    10,    16,    11,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   -30,   -41,     1,   -16,   -29,   -30,
-   -29,   -48,   -88,   -87,   -27,   -27,     5,   nil,   -14,   nil,
-     1,     2,   nil,   -28,   -22,   -65,    -1,   -29,   nil,   nil,
-    -5,   -21,   nil,    -5,   -39,    12,   -79,    -7,   -38,    -9,
-   -58 ]
+   -29,   -48,   -89,   -88,   -27,   -27,     5,   nil,   -15,   nil,
+     1,     2,   nil,   -28,   -21,   -65,    -1,   -29,   nil,   nil,
+    -5,   -21,   nil,    -5,   -39,    12,   -80,    -7,   -38,    -9,
+   -59 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,     4,     5,     6,     7,     8,     9,
@@ -138,125 +140,127 @@ racc_goto_default = [
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  0, 44, :_reduce_none,
-  1, 44, :_reduce_none,
+  0, 45, :_reduce_none,
   1, 45, :_reduce_none,
-  2, 45, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
   1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_13,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_none,
-  1, 46, :_reduce_16,
-  4, 55, :_reduce_none,
-  1, 57, :_reduce_none,
-  2, 57, :_reduce_none,
-  3, 58, :_reduce_20,
-  3, 58, :_reduce_21,
-  3, 58, :_reduce_22,
+  2, 46, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_13,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  1, 47, :_reduce_16,
+  4, 56, :_reduce_none,
+  1, 58, :_reduce_none,
   2, 58, :_reduce_none,
-  4, 56, :_reduce_24,
-  1, 59, :_reduce_25,
-  3, 59, :_reduce_26,
-  1, 61, :_reduce_none,
-  2, 61, :_reduce_28,
-  1, 61, :_reduce_none,
-  2, 61, :_reduce_30,
-  2, 60, :_reduce_31,
-  0, 62, :_reduce_32,
-  1, 62, :_reduce_33,
-  2, 62, :_reduce_34,
-  1, 62, :_reduce_35,
-  4, 64, :_reduce_36,
-  4, 64, :_reduce_37,
-  3, 63, :_reduce_38,
-  1, 65, :_reduce_39,
-  2, 65, :_reduce_40,
-  1, 66, :_reduce_none,
-  1, 66, :_reduce_none,
-  4, 50, :_reduce_43,
-  1, 67, :_reduce_44,
-  2, 67, :_reduce_45,
-  4, 51, :_reduce_46,
-  1, 68, :_reduce_47,
-  1, 68, :_reduce_48,
-  2, 47, :_reduce_49,
-  4, 47, :_reduce_50,
-  1, 69, :_reduce_none,
-  2, 69, :_reduce_52,
-  1, 70, :_reduce_53,
-  1, 70, :_reduce_54,
-  2, 48, :_reduce_55,
-  2, 49, :_reduce_56,
-  4, 49, :_reduce_57,
-  1, 73, :_reduce_none,
-  1, 73, :_reduce_none,
-  1, 72, :_reduce_60,
-  3, 72, :_reduce_61,
+  3, 59, :_reduce_20,
+  3, 59, :_reduce_21,
+  3, 59, :_reduce_22,
+  2, 59, :_reduce_none,
+  4, 57, :_reduce_24,
+  1, 60, :_reduce_25,
+  3, 60, :_reduce_26,
+  1, 62, :_reduce_none,
+  2, 62, :_reduce_28,
+  1, 62, :_reduce_none,
+  2, 62, :_reduce_30,
+  2, 61, :_reduce_31,
+  0, 63, :_reduce_32,
+  1, 63, :_reduce_33,
+  2, 63, :_reduce_34,
+  1, 63, :_reduce_35,
+  4, 65, :_reduce_36,
+  4, 65, :_reduce_37,
+  3, 64, :_reduce_38,
+  1, 66, :_reduce_39,
+  2, 66, :_reduce_40,
+  1, 67, :_reduce_none,
+  1, 67, :_reduce_none,
+  4, 51, :_reduce_43,
+  1, 68, :_reduce_44,
+  2, 68, :_reduce_45,
+  4, 52, :_reduce_46,
+  1, 69, :_reduce_47,
+  1, 69, :_reduce_48,
+  2, 48, :_reduce_49,
+  4, 48, :_reduce_50,
+  1, 70, :_reduce_none,
+  2, 70, :_reduce_52,
+  1, 71, :_reduce_53,
+  1, 71, :_reduce_54,
+  2, 49, :_reduce_55,
+  2, 50, :_reduce_56,
+  4, 50, :_reduce_57,
   1, 74, :_reduce_none,
   1, 74, :_reduce_none,
-  3, 52, :_reduce_64,
-  2, 52, :_reduce_65,
-  5, 52, :_reduce_66,
-  4, 52, :_reduce_67,
-  1, 78, :_reduce_68,
-  3, 78, :_reduce_69,
-  1, 75, :_reduce_70,
-  2, 75, :_reduce_71,
+  1, 73, :_reduce_60,
+  3, 73, :_reduce_61,
   1, 75, :_reduce_none,
-  1, 79, :_reduce_73,
-  1, 79, :_reduce_74,
-  1, 79, :_reduce_75,
-  1, 79, :_reduce_76,
-  2, 79, :_reduce_77,
-  2, 77, :_reduce_78,
-  3, 77, :_reduce_79,
-  2, 77, :_reduce_80,
-  1, 77, :_reduce_81,
-  2, 71, :_reduce_82,
-  3, 71, :_reduce_83,
-  1, 80, :_reduce_84,
-  3, 80, :_reduce_85,
-  1, 76, :_reduce_none,
+  1, 75, :_reduce_none,
+  3, 53, :_reduce_64,
+  2, 53, :_reduce_65,
+  5, 53, :_reduce_66,
+  4, 53, :_reduce_67,
+  1, 79, :_reduce_68,
+  3, 79, :_reduce_69,
+  1, 76, :_reduce_70,
+  2, 76, :_reduce_71,
   1, 76, :_reduce_none,
-  3, 82, :_reduce_88,
-  1, 83, :_reduce_none,
-  1, 83, :_reduce_none,
+  1, 80, :_reduce_73,
+  1, 80, :_reduce_74,
+  1, 80, :_reduce_75,
+  1, 80, :_reduce_76,
+  2, 80, :_reduce_77,
+  2, 78, :_reduce_78,
+  3, 78, :_reduce_79,
+  2, 78, :_reduce_80,
+  3, 78, :_reduce_81,
+  2, 78, :_reduce_82,
+  1, 78, :_reduce_83,
+  2, 72, :_reduce_84,
+  3, 72, :_reduce_85,
+  1, 81, :_reduce_86,
+  3, 81, :_reduce_87,
+  1, 77, :_reduce_none,
+  1, 77, :_reduce_none,
+  3, 83, :_reduce_90,
   1, 84, :_reduce_none,
   1, 84, :_reduce_none,
-  3, 81, :_reduce_93,
-  2, 81, :_reduce_94,
-  2, 54, :_reduce_none,
   1, 85, :_reduce_none,
-  2, 85, :_reduce_none,
-  3, 86, :_reduce_none,
-  4, 53, :_reduce_99,
-  2, 53, :_reduce_100,
-  1, 88, :_reduce_101,
-  3, 88, :_reduce_102,
-  3, 88, :_reduce_103,
-  1, 90, :_reduce_none,
-  2, 90, :_reduce_none,
-  1, 89, :_reduce_106,
-  2, 89, :_reduce_107,
-  2, 91, :_reduce_108,
-  1, 92, :_reduce_109,
+  1, 85, :_reduce_none,
+  3, 82, :_reduce_95,
+  2, 82, :_reduce_96,
+  2, 55, :_reduce_none,
+  1, 86, :_reduce_none,
+  2, 86, :_reduce_none,
+  3, 87, :_reduce_none,
+  4, 54, :_reduce_101,
+  2, 54, :_reduce_102,
+  1, 89, :_reduce_103,
+  3, 89, :_reduce_104,
+  3, 89, :_reduce_105,
+  1, 91, :_reduce_none,
+  2, 91, :_reduce_none,
+  1, 90, :_reduce_108,
+  2, 90, :_reduce_109,
   2, 92, :_reduce_110,
-  3, 92, :_reduce_111,
-  1, 87, :_reduce_112,
-  2, 87, :_reduce_113,
-  1, 93, :_reduce_114,
-  1, 93, :_reduce_115 ]
+  1, 93, :_reduce_111,
+  2, 93, :_reduce_112,
+  3, 93, :_reduce_113,
+  1, 88, :_reduce_114,
+  2, 88, :_reduce_115,
+  1, 94, :_reduce_116,
+  1, 94, :_reduce_117 ]
 
-racc_reduce_n = 116
+racc_reduce_n = 118
 
-racc_shift_n = 182
+racc_shift_n = 186
 
 racc_token_table = {
   false => 0,
@@ -293,17 +297,18 @@ racc_token_table = {
   :TIME => 31,
   :WDAY => 32,
   :STATUS => 33,
-  "@" => 34,
-  :TIMEZONE => 35,
-  :VS => 36,
-  :SCORE => 37,
-  :SCORE_MORE => 38,
-  :PLAYER => 39,
-  ";" => 40,
-  :OG => 41,
-  :PEN => 42 }
-
-racc_nt_base = 43
+  :NOTE => 34,
+  "@" => 35,
+  :TIMEZONE => 36,
+  :VS => 37,
+  :SCORE => 38,
+  :SCORE_MORE => 39,
+  :PLAYER => 40,
+  ";" => 41,
+  :OG => 42,
+  :PEN => 43 }
+
+racc_nt_base = 44
 
 racc_use_result_var = true
 
@@ -359,6 +364,7 @@ Racc_token_to_s_table = [
   "TIME",
   "WDAY",
   "STATUS",
+  "NOTE",
   "\"@\"",
   "TIMEZONE",
   "VS",
@@ -889,7 +895,7 @@ module_eval(<<'.,.,', 'parser.y', 289)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 295)
+module_eval(<<'.,.,', 'parser.y', 303)
   def _reduce_78(val, _values, result)
                           ## todo - add possible status_notes too!!! 
                       result = { status: val[0][1][:status] }
@@ -898,7 +904,7 @@ module_eval(<<'.,.,', 'parser.y', 295)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 300)
+module_eval(<<'.,.,', 'parser.y', 308)
   def _reduce_79(val, _values, result)
                          result = { status: val[0][1][:status] }.merge( val[1] ) 
 
@@ -906,54 +912,68 @@ module_eval(<<'.,.,', 'parser.y', 300)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 302)
+module_eval(<<'.,.,', 'parser.y', 310)
   def _reduce_80(val, _values, result)
      result = {}.merge( val[0] )
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 303)
+module_eval(<<'.,.,', 'parser.y', 311)
   def _reduce_81(val, _values, result)
-     result = {}
+     result = {}.merge( val[0] )
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 309)
+module_eval(<<'.,.,', 'parser.y', 312)
   def _reduce_82(val, _values, result)
-     result = { geo: val[1] }
+     result = {}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 310)
+module_eval(<<'.,.,', 'parser.y', 313)
   def _reduce_83(val, _values, result)
-     result = { geo: val[1], timezone: val[2] }
+     result = {}
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 313)
+module_eval(<<'.,.,', 'parser.y', 319)
   def _reduce_84(val, _values, result)
-      result = val
+     result = { geo: val[1] }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 314)
+module_eval(<<'.,.,', 'parser.y', 320)
   def _reduce_85(val, _values, result)
+     result = { geo: val[1], timezone: val[2] }
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 323)
+  def _reduce_86(val, _values, result)
+      result = val
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 324)
+  def _reduce_87(val, _values, result)
       result.push( val[2] )
     result
   end
 .,.,
 
-# reduce 86 omitted
+# reduce 88 omitted
 
-# reduce 87 omitted
+# reduce 89 omitted
 
-module_eval(<<'.,.,', 'parser.y', 322)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 332)
+  def _reduce_90(val, _values, result)
                                    trace( "RECUDE match_fixture" )
                                result = { team1: val[0],
                                           team2: val[2] }   
@@ -962,16 +982,16 @@ module_eval(<<'.,.,', 'parser.y', 322)
   end
 .,.,
 
-# reduce 89 omitted
-
-# reduce 90 omitted
-
 # reduce 91 omitted
 
 # reduce 92 omitted
 
-module_eval(<<'.,.,', 'parser.y', 336)
-  def _reduce_93(val, _values, result)
+# reduce 93 omitted
+
+# reduce 94 omitted
+
+module_eval(<<'.,.,', 'parser.y', 346)
+  def _reduce_95(val, _values, result)
                                trace( "REDUCE => match_result : TEAM score TEAM" )
                            result = { team1: val[0],
                                       team2: val[2],
@@ -982,8 +1002,8 @@ module_eval(<<'.,.,', 'parser.y', 336)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 344)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 354)
+  def _reduce_96(val, _values, result)
                               trace( "REDUCE  => match_result : match_fixture score" )
                           result = { score: val[1][1] }.merge( val[0] )  
 
@@ -991,16 +1011,16 @@ module_eval(<<'.,.,', 'parser.y', 344)
   end
 .,.,
 
-# reduce 95 omitted
-
-# reduce 96 omitted
-
 # reduce 97 omitted
 
 # reduce 98 omitted
 
-module_eval(<<'.,.,', 'parser.y', 376)
-  def _reduce_99(val, _values, result)
+# reduce 99 omitted
+
+# reduce 100 omitted
+
+module_eval(<<'.,.,', 'parser.y', 386)
+  def _reduce_101(val, _values, result)
                            kwargs = val[1]
                        @tree << GoalLine.new( **kwargs )
 
@@ -1008,8 +1028,8 @@ module_eval(<<'.,.,', 'parser.y', 376)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 381)
-  def _reduce_100(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 391)
+  def _reduce_102(val, _values, result)
                              kwargs = val[0]
                          @tree << GoalLine.new( **kwargs )
 
@@ -1017,8 +1037,8 @@ module_eval(<<'.,.,', 'parser.y', 381)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 386)
-  def _reduce_101(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 396)
+  def _reduce_103(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: [] } 
 
@@ -1026,8 +1046,8 @@ module_eval(<<'.,.,', 'parser.y', 386)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 389)
-  def _reduce_102(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 399)
+  def _reduce_104(val, _values, result)
       result = { goals1: [],
                                                               goals2: val[2] } 
 
@@ -1035,8 +1055,8 @@ module_eval(<<'.,.,', 'parser.y', 389)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 392)
-  def _reduce_103(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 402)
+  def _reduce_105(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: val[2] }
 
@@ -1044,26 +1064,26 @@ module_eval(<<'.,.,', 'parser.y', 392)
   end
 .,.,
 
-# reduce 104 omitted
+# reduce 106 omitted
 
-# reduce 105 omitted
+# reduce 107 omitted
 
-module_eval(<<'.,.,', 'parser.y', 406)
-  def _reduce_106(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 416)
+  def _reduce_108(val, _values, result)
      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 407)
-  def _reduce_107(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 417)
+  def _reduce_109(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 423)
-  def _reduce_108(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 433)
+  def _reduce_110(val, _values, result)
                       result = Goal.new( player:  val[0],
                                      minutes: val[1] )   
 
@@ -1071,29 +1091,29 @@ module_eval(<<'.,.,', 'parser.y', 423)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 435)
-  def _reduce_109(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 445)
+  def _reduce_111(val, _values, result)
      result = val
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 436)
-  def _reduce_110(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 446)
+  def _reduce_112(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 437)
-  def _reduce_111(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 447)
+  def _reduce_113(val, _values, result)
      result.push( val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 443)
-  def _reduce_112(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 453)
+  def _reduce_114(val, _values, result)
                             kwargs = {}.merge( val[0][1] )
                         result = Minute.new( **kwargs )
 
@@ -1101,8 +1121,8 @@ module_eval(<<'.,.,', 'parser.y', 443)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 448)
-  def _reduce_113(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 458)
+  def _reduce_115(val, _values, result)
                             kwargs = { }.merge( val[0][1] ).merge( val[1] )
                         result = Minute.new( **kwargs )
 
@@ -1110,15 +1130,15 @@ module_eval(<<'.,.,', 'parser.y', 448)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 452)
-  def _reduce_114(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 462)
+  def _reduce_116(val, _values, result)
       result = { og: true }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 453)
-  def _reduce_115(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 463)
+  def _reduce_117(val, _values, result)
       result = { pen: true }
     result
   end

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

@@ -26,14 +26,29 @@ GOAL_OG_RE = %r{
 }ix
 
 
+## minute variant for  N/A not/available
+##     todo/check - find a better syntax - why? why not?
+##
+##   note  "??".to_i(10) returns 0 or
+##         "__".to_i(10) returns 0
+##   quick hack - assume 0 for n/a for now 
+
+MINUTE_NA_RE = %r{
+   (?<minute>
+      (?<=[ (])	 # positive lookbehind for space or opening 
+        (?<value> \?{2} | _{2} )
+        '   ## must have minute marker!!!!
+    )
+}ix
+
 MINUTE_RE = %r{
      (?<minute>
        (?<=[ (])	 # positive lookbehind for space or opening ( e.g. (61') required
                      #    todo - add more lookbehinds e.g.  ,) etc. - why? why not?
-           (?<value>\d{1,3})      ## constrain numbers to 0 to 999!!!
-        (?: \+
-            (?<value2>\d{1,3})   
-        )?
+             (?<value>\d{1,3})      ## constrain numbers to 0 to 999!!!
+                   (?: \+
+                     (?<value2>\d{1,3})   
+                   )?           
         '     ## must have minute marker!!!!
      )
 }ix

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

@@ -12,10 +12,33 @@ STATUS_RE = %r{
       (?:    
             ### opt 1 - allow long forms with note/comment for some stati
            (?: (?<status> awarded
+             ## e.g. [awarded match to Leones Negros by undue alignment; original result 1-2]
+             ##     [awarded 3-0 to Cafetaleros by undue alignment; originally ended 2-0]
+             ##     [awarded 3-0; originally 0-2, América used ineligible player (Federico Viñas)]
                             |
                           annulled
                             |
                           abandoned
+             ## e.g. [abandoned at 1-1 in 65' due to cardiac arrest Luton player Tom Lockyer]
+             ##      [abandoned at 0-0 in 6' due to waterlogged pitch]
+             ##     [abandoned at 5-0 in 80' due to attack on assistant referee by Cerro; result stood]
+             ##    [abandoned at 1-0 in 31']
+             ##    [abandoned at 0-1' in 85 due to crowd trouble]
+                            |
+                          postponed
+             ## e.g. [postponed due to problems with the screen of the stadium]
+             ##      [postponed by storm]
+             ##      [postponed due to tropical storm "Hanna"]
+             ##      [postponed from Sep 10-12 due to death Queen Elizabeth II]
+                           |
+                        suspended
+             ## e.g. [suspended at 0-0 in 12' due to storm]  
+             ##      [suspended at 84' by storm; result stood]
+                           |
+                         verified
+             ## e.g.  [verified 2:0 wo.]
+   
+
                ) [ ;,]* (?<status_note> [^\]]+ )
                  [ ]*
             )
@@ -34,12 +57,98 @@ STATUS_RE = %r{
                replay
                  |
                annulled
+                 |
+               suspended    ### todo/fix - add status upstream - why? why not?
+                            ###  move to note(s) - do NOT interpret as status - why? why not?
+                 |
+               verified     ### todo/fix - add status upstream (same as ??) - why? why not? 
+                            ###  move to note(s) - do NOT interpret as status - why? why not?
             )
       )
     \]
 }ix
 
 
+
+
+###
+## todo/fix - move to token-note.rb (standalone) file 
+
+NOTE_RE = %r{
+    \[ 
+   (?<note>
+     (?:  ##  starting with ___   PLUS requiring more text
+       (?:
+          nb:
+          ##  e.g. [NB: between top-8 of regular season]
+          #        [NB: América, Morelia and Tigres qualified on better record regular season]
+          #        [NB: Celaya qualified on away goals]
+          #        [NB: Alebrijes qualified on away goal]
+          #        [NB: Leones Negros qualified on away goals]
+          #
+          # todo/fix:
+          # add "top-level" NB: version
+          ##   with full (end-of) line note - why? why not?
+          |
+          (?: originally[ ])? scheduled
+          ## e.g. [originally scheduled to play in Mexico City] 
+          |
+          rescheduled
+          ## e.g.  [Rescheduled due to earthquake occurred in Mexico on September 19]
+          |
+          remaining
+          ## e.g. [remaining 79']   
+          ##      [remaining 84'] 
+          ##      [remaining 59']   
+          ##      [remaining 5']
+          |
+          played  
+          ## e.g. [played in Macaé-RJ]
+          ##      [played in Caxias do Sul-RS]
+          ##      [played in Sete Lagoas-MG]
+          ##      [played in Uberlândia-MG]
+          ##      [played in Brasília-DF]
+          ##      [played in Vöcklabruck]
+          ##      [played in Pasching]
+          |
+          declared
+          ## e.g.  [declared void]
+          |
+          inter-group
+          ## e.g. [inter-group A-B]
+          ##      [inter-group C-D]
+       )
+      [ ]
+      [^\]]+?    ## slurp all to next ] - (use non-greedy) 
+     )
+      |
+     (?:
+       ## starting with in  - do NOT allow digits
+       ##   name starting with in possible - why? why not?
+           in[ ]
+            [^0-9\]]+?
+       ## e.g. [In Estadio La Corregidora] 
+       ##      [in Unidad Deportiva Centenario]
+       ##      [in Estadio Olímpico Universitario]
+       ##      [in Estadio Victoria]
+       ##      [in UD José Brindis]
+       ##      [in Colomos Alfredo "Pistache" Torres stadium]
+     )
+       |
+      (?:
+         ## e.g. Spain wins on penalties
+         ##       1860 München wins on penalties etc.
+         ##   must start with digit 1-9 or letter
+         ##     todo - add more special chars - why? why not?
+            [1-9\p{L}][0-9\p{L} .-]+?    
+            [ ]wins[ ]on[ ]penalties
+             [^\]]*?   ## use non-greedy
+      )
+   )
+   \] 
+}ix    
+
+
 end  #  class Lexer
 end  # module SportDb
   

data/lib/sportdb/parser/token.rb

@@ -127,6 +127,7 @@ BASICS_RE = %r{
 
 RE = Regexp.union(  PROP_KEY_RE, ##  start with prop key (match will/should switch into prop mode!!!)
                     STATUS_RE,
+                    NOTE_RE,
                     TIMEZONE_RE,
                      TIME_RE,
                      DURATION_RE,  # note - duration MUST match before date
@@ -136,6 +137,7 @@ RE = Regexp.union(  PROP_KEY_RE, ##  start with prop key (match will/should swit
                     SCORE_RE,   ## note basic score e.g. 1-1 must go after SCORE_MORE_RE!!!
                     BASICS_RE, 
                     MINUTE_RE,
+                    MINUTE_NA_RE,   ## note - add/allow not/available (n/a,na) minutes hack for now
                     GOAL_OG_RE, GOAL_PEN_RE,
                      TEXT_RE )
 

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

metadata

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