RubyGems - sportdb-parser - Versions diffs - 0.6.6 → 0.6.7 - Mend

sportdb-parser 0.6.6 → 0.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +1 -1
data/lib/sportdb/parser/parser.rb +353 -356
data/lib/sportdb/parser/racc_tree.rb +3 -2
data/lib/sportdb/parser/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 150ee98d02311f0436226fb662d1cde426c6f91a88e6298257252c58e827cb17
-  data.tar.gz: e06fb067d2ddc317fe4f7ba033b512f378d6fa32da58756238e30d617653755e
+  metadata.gz: 366948a35eecdf2ea0b1e83e48a4ae53b399f5f91436c066e8b3328fb3d9dda4
+  data.tar.gz: 8fba19e829e8d81873f4a263c5d0b2a1db27095fddebb90233a0d075c2ec7ea4
 SHA512:
-  metadata.gz: 95c28de0c34ab52e3ca0f49fdd6ec5634dbaee2cf35e6a3c221d6f38f0d463d0e7e381151cd7572a88026a508f2991e822bf3882c46b7943903bc73a1d7477e6
-  data.tar.gz: 3a5fd4e4dbb4731201f152732791afb544fc05ee7136a8021e98faf7fe6a7fcedd0b22699848e22e9a39fa74dab2a9686f908cde74c8cc50b2e80e2fc491ebd1
+  metadata.gz: d4cc2627f892ab128df8cbccab77117dd97b85ac9b9900f0434f4ada02fdad1ba7a19cf6055aeb7a88fe1dce477190bfa8b028276837e30546bce0656ba4f901
+  data.tar.gz: 671f21e8bdb895223504e2b8776905d169c7ba97086cf843ebcc6e361a074eaad4c2fa62c6296328e265bae511eb4c4574bbdfd3d76ce92649212547898f726a

data/CHANGELOG.md CHANGED Viewed

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

data/lib/sportdb/parser/parser.rb CHANGED Viewed

@@ -9,155 +9,159 @@ class RaccMatchParser < Racc::Parser
 ##### State transition tables begin ###
 racc_action_table = [
-    18,    12,    19,   158,   101,    71,   188,    72,    20,    51,
-   139,    49,   156,    21,    22,    98,   104,    52,    23,   140,
-    27,    51,   187,    49,    24,    77,    42,    25,    29,    82,
-    30,    31,   109,    33,    36,    38,    39,    80,   159,    18,
+    18,    12,    19,   156,   101,    71,   186,    72,    20,    51,
+   215,    49,   154,    21,    22,    98,   104,   217,    23,    52,
+    27,    51,   185,    49,    24,    77,    42,    25,    29,    82,
+    30,    31,   109,    33,    36,    38,    39,    80,   157,    18,
     12,    19,    45,    45,    51,    47,    49,    20,    75,    99,
-    94,    95,    21,    22,    79,   202,    89,    23,    54,    27,
+    94,    95,    21,    22,    79,   199,    89,    23,    54,    27,
     51,    94,    95,    24,    89,    42,    25,    29,    85,    30,
-    31,   196,    33,    36,    38,    39,   153,   219,   135,    56,
-   201,    45,   218,    51,    47,    49,   134,   132,    66,    59,
-    86,    88,    75,    59,   197,    59,    67,   205,    86,    88,
-    75,    61,    62,   223,    66,    61,    62,    61,    62,   206,
-    91,   194,    92,   124,    68,   206,   130,    38,    39,   126,
-   127,   174,   126,   127,   118,   121,   119,   120,   126,   127,
-   118,   121,   119,   120,   221,   170,    69,   114,   144,   145,
-   172,   173,    75,   -92,   -93,    76,    42,    93,   105,   106,
-    51,   114,   115,   122,   123,   128,   129,   142,   146,   147,
-   149,   150,   -82,   151,    42,   160,   161,   162,    45,   164,
-   114,   166,    51,   168,    51,   176,   177,   178,   179,   180,
-   181,   182,    59,   184,   185,   186,    66,   190,   191,   139,
-   198,   199,   200,   203,    42,   207,   208,   209,    51,   114,
-   211,   212,   213,   214,   215,   216,   217,    66,   222,    42,
-   225,   226,   227 ]
+    31,   193,    33,    36,    38,    39,   151,   168,   135,   114,
+   198,    45,   191,    51,    47,    49,   134,   132,   226,    59,
+    86,    88,    75,    59,   194,    59,    56,   202,    86,    88,
+    75,    61,    62,   220,    66,    61,    62,    61,    62,   203,
+    91,    67,    92,   124,    68,   203,   130,    38,    39,   126,
+   127,   172,   126,   127,   118,   121,   119,   120,   126,   127,
+   118,   121,   119,   120,   218,   142,   143,   170,   171,    69,
+    75,   -91,   -92,    76,    42,    93,   105,   106,    51,   114,
+   115,   122,   123,   128,   129,   138,   140,   144,   145,   147,
+   148,   -81,   149,    42,   158,   159,   160,    45,   162,   114,
+   164,    51,   166,    51,   174,   175,   176,   177,   178,   179,
+   180,    59,   182,   183,   184,    66,   188,   189,   191,   195,
+   196,   197,   200,    42,   204,   205,   206,    51,   114,   208,
+   209,   210,   211,   212,   213,   214,   219,    42,   222,   138,
+   224,    66,   227,   191,   229 ]
 racc_action_check = [
      0,     0,     0,    87,    43,    27,   132,    27,     0,    47,
-    66,    47,    86,     0,     0,    42,    43,     1,     0,    66,
+   191,    47,    86,     0,     0,    42,    43,   191,     0,     1,
      0,    27,   132,    27,     0,    32,     0,     0,     0,    32,
      0,     0,    48,     0,     0,     0,     0,    32,    87,     2,
      2,     2,     0,    43,     0,     0,     0,     2,    86,    42,
-    42,    42,     2,     2,    32,   148,    35,     2,    19,     2,
+    42,    42,     2,     2,    32,   146,    35,     2,    19,     2,
     48,    41,    41,     2,    83,     2,     2,     2,    35,     2,
-     2,   141,     2,     2,     2,     2,    83,   193,    64,    20,
-   148,     2,   193,     2,     2,     2,    64,    64,    23,    21,
-    35,    35,    35,    22,   141,   140,    24,   154,    83,    83,
-    83,    21,    21,   204,   139,    22,    22,   140,   140,   154,
-    36,   139,    36,    57,    25,   204,    63,    36,    36,    57,
-    57,   116,    63,    63,   116,   116,   116,   116,   195,   195,
-    54,    54,    54,    54,   195,   112,    26,   112,    68,    68,
-   114,   114,    28,    29,    30,    31,    34,    39,    45,    46,
-    49,    51,    52,    55,    56,    59,    60,    67,    70,    73,
-    75,    78,    80,    81,    85,    88,    97,   100,   102,   104,
-   105,   107,   108,   109,   111,   118,   119,   120,   121,   122,
-   123,   124,   125,   127,   130,   131,   133,   134,   135,   137,
-   143,   146,   147,   150,   153,   157,   159,   166,   167,   170,
-   176,   177,   178,   181,   186,   187,   188,   194,   202,   206,
-   217,   218,   220 ]
+     2,   139,     2,     2,     2,     2,    83,   112,    64,   112,
+   146,     2,   223,     2,     2,     2,    64,    64,   223,    21,
+    35,    35,    35,    22,   139,   138,    20,   152,    83,    83,
+    83,    21,    21,   201,    23,    22,    22,   138,   138,   152,
+    36,    24,    36,    57,    25,   201,    63,    36,    36,    57,
+    57,   116,    63,    63,   116,   116,   116,   116,   192,   192,
+    54,    54,    54,    54,   192,    68,    68,   114,   114,    26,
+    28,    29,    30,    31,    34,    39,    45,    46,    49,    51,
+    52,    55,    56,    59,    60,    66,    67,    70,    73,    75,
+    78,    80,    81,    85,    88,    97,   100,   102,   104,   105,
+   107,   108,   109,   111,   118,   119,   120,   121,   122,   123,
+   124,   125,   127,   130,   131,   133,   134,   135,   136,   141,
+   144,   145,   148,   151,   155,   157,   164,   165,   168,   174,
+   175,   176,   179,   184,   185,   186,   199,   203,   214,   215,
+   216,   217,   225,   226,   228 ]
 racc_action_pointer = [
-    -1,    17,    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    -1,    19,    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    54,
-    68,    78,    82,    77,    70,    88,   132,   -24,   102,   116,
-   117,   141,    21,   nil,   119,    52,    81,   nil,   nil,   111,
-   nil,    18,     7,     0,   nil,   103,   145,   -36,    15,   105,
-   nil,   133,   152,   nil,   125,   143,   142,   103,   nil,   137,
-   138,   nil,   nil,   106,    70,   nil,    -2,   130,   109,   nil,
-   136,   nil,   nil,   137,   nil,   154,   nil,   nil,   129,   nil,
-   128,   129,   nil,    60,   nil,   137,     8,    -1,   161,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   139,   nil,   nil,
-   140,   nil,   125,   nil,   165,   152,   nil,   161,   127,   169,
-   nil,   129,   119,   nil,    92,   nil,   119,   nil,   169,   170,
-   171,   174,   175,   169,   177,   171,   nil,   179,   nil,   nil,
-   180,   175,     2,   175,   183,   184,   nil,   177,   nil,    93,
-    84,    67,   nil,   186,   nil,   nil,   187,   188,    39,   nil,
-   189,   nil,   nil,   167,    93,   nil,   nil,   191,   nil,   192,
-   nil,   nil,   nil,   nil,   nil,   nil,   193,   153,   nil,   nil,
-   181,   nil,   nil,   nil,   nil,   nil,   196,   197,   198,   nil,
-   nil,   190,   nil,   nil,   nil,   nil,   200,   194,   186,   nil,
-   nil,   nil,   nil,    64,   196,   112,   nil,   nil,   nil,   nil,
-   nil,   nil,   202,   nil,    99,   nil,   182,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   199,   198,   nil,
-   199,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+    85,    78,    82,    93,    85,    88,   135,   -24,   100,   114,
+   115,   139,    21,   nil,   117,    52,    81,   nil,   nil,   109,
+   nil,    18,     7,     0,   nil,   101,   143,   -36,    15,   103,
+   nil,   131,   150,   nil,   125,   141,   140,   103,   nil,   135,
+   136,   nil,   nil,   106,    70,   nil,   134,   129,   106,   nil,
+   135,   nil,   nil,   136,   nil,   153,   nil,   nil,   128,   nil,
+   127,   128,   nil,    60,   nil,   136,     8,    -1,   160,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   138,   nil,   nil,
+   139,   nil,   124,   nil,   164,   151,   nil,   160,   126,   168,
+   nil,   128,    61,   nil,    89,   nil,   119,   nil,   168,   169,
+   170,   173,   174,   168,   176,   170,   nil,   178,   nil,   nil,
+   179,   174,     2,   174,   182,   183,   176,   nil,    84,    67,
+   nil,   185,   nil,   nil,   186,   187,    39,   nil,   188,   nil,
+   nil,   166,    93,   nil,   nil,   190,   nil,   191,   nil,   nil,
+   nil,   nil,   nil,   nil,   192,   152,   nil,   nil,   180,   nil,
+   nil,   nil,   nil,   nil,   195,   196,   197,   nil,   nil,   189,
+   nil,   nil,   nil,   nil,   199,   193,   185,   nil,   nil,   nil,
+   nil,    -1,   112,   nil,   nil,   nil,   nil,   nil,   nil,   200,
+   nil,    99,   nil,   180,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   197,   188,   197,   200,   nil,   nil,
+   nil,   nil,   nil,    70,   nil,   199,   201,   nil,   201,   nil ]
 racc_action_default = [
-    -1,  -142,    -2,    -3,    -5,    -6,    -7,    -8,    -9,   -10,
-   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -19,  -142,
-  -142,  -142,  -142,  -142,  -142,  -142,  -142,  -142,   -70,   -72,
-   -73,  -142,  -142,   -79,  -142,  -142,   -89,   -91,   -94,   -95,
-  -107,  -108,  -142,  -142,  -117,  -142,  -142,  -142,  -127,  -142,
-  -132,  -142,  -142,    -4,  -142,  -142,   -28,  -142,   -32,   -37,
-   -58,   -60,   -61,  -142,   -40,   -43,   -50,  -142,  -142,   -68,
-  -142,   -72,   -73,  -142,   -71,  -142,   -74,   -75,  -142,   -77,
-   -78,  -142,   -81,  -142,   -84,  -142,  -142,  -142,  -142,  -102,
-   -90,   -92,   -93,   -96,  -112,  -113,  -115,  -142,  -110,  -111,
-  -142,  -116,  -142,  -119,  -120,  -122,  -125,  -142,  -142,  -130,
-  -133,  -128,  -134,  -135,  -138,   228,  -142,   -21,  -142,  -142,
-  -142,  -142,  -142,  -142,  -142,  -142,   -34,   -35,   -38,   -59,
-  -142,  -142,  -142,  -142,   -45,   -47,   -49,   -51,   -53,  -142,
-  -142,  -142,   -63,  -142,   -66,   -67,  -142,  -142,  -103,  -105,
-  -142,   -80,   -83,  -142,  -142,   -87,   -97,  -142,   -99,  -142,
-  -101,  -109,  -114,  -118,  -121,  -123,  -142,  -129,  -131,  -136,
-  -142,  -139,  -140,  -141,   -20,   -22,  -142,  -142,  -142,   -26,
-   -27,  -142,   -30,   -33,   -36,   -31,  -142,  -142,  -142,   -44,
-   -46,   -48,   -52,  -142,  -142,  -142,   -62,   -64,   -65,   -69,
-  -124,  -104,  -142,   -76,  -142,   -86,  -142,   -98,  -100,  -126,
-  -137,   -23,   -24,   -25,   -29,   -39,   -41,  -142,  -142,   -55,
-  -142,   -57,  -106,   -85,   -88,   -42,   -54,   -56 ]
+    -1,  -141,    -2,    -3,    -5,    -6,    -7,    -8,    -9,   -10,
+   -11,   -12,   -13,   -14,   -15,   -16,   -17,   -18,   -19,  -141,
+  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,   -69,   -71,
+   -72,  -141,  -141,   -78,  -141,  -141,   -88,   -90,   -93,   -94,
+  -106,  -107,  -141,  -141,  -116,  -141,  -141,  -141,  -126,  -141,
+  -131,  -141,  -141,    -4,  -141,  -141,   -28,  -141,   -32,   -37,
+   -57,   -59,   -60,  -141,   -40,   -43,   -50,  -141,  -141,   -67,
+  -141,   -71,   -72,  -141,   -70,  -141,   -73,   -74,  -141,   -76,
+   -77,  -141,   -80,  -141,   -83,  -141,  -141,  -141,  -141,  -101,
+   -89,   -91,   -92,   -95,  -111,  -112,  -114,  -141,  -109,  -110,
+  -141,  -115,  -141,  -118,  -119,  -121,  -124,  -141,  -141,  -129,
+  -132,  -127,  -133,  -134,  -137,   230,  -141,   -21,  -141,  -141,
+  -141,  -141,  -141,  -141,  -141,  -141,   -34,   -35,   -38,   -58,
+  -141,  -141,  -141,  -141,   -45,   -47,   -52,   -51,  -141,  -141,
+   -62,  -141,   -65,   -66,  -141,  -141,  -102,  -104,  -141,   -79,
+   -82,  -141,  -141,   -86,   -96,  -141,   -98,  -141,  -100,  -108,
+  -113,  -117,  -120,  -122,  -141,  -128,  -130,  -135,  -141,  -138,
+  -139,  -140,   -20,   -22,  -141,  -141,  -141,   -26,   -27,  -141,
+   -30,   -33,   -36,   -31,  -141,  -141,  -141,   -44,   -46,   -48,
+   -49,  -141,  -141,   -61,   -63,   -64,   -68,  -123,  -103,  -141,
+   -75,  -141,   -85,  -141,   -97,   -99,  -125,  -136,   -23,   -24,
+   -25,   -29,   -39,   -41,  -141,   -50,  -141,  -141,   -56,  -105,
+   -84,   -87,   -42,   -52,   -54,  -141,   -52,   -55,  -141,   -53 ]
 racc_goto_table = [
-    83,   113,    65,    57,    63,   110,   138,   154,   117,    74,
-   103,    84,   111,    73,     3,     1,    53,    96,   100,     2,
-   116,    55,   183,    64,   131,   133,   136,   137,   141,   143,
-    70,    78,    81,   107,    90,   148,    97,   102,   108,   112,
-   171,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   155,   nil,   nil,   nil,   165,   nil,   nil,   nil,   152,
-   nil,   nil,   169,   nil,   nil,   nil,   nil,   157,   110,   163,
-   175,   167,   nil,   nil,   nil,   204,   nil,   192,   nil,   nil,
+    65,    83,   136,    57,    63,   113,   110,   152,   117,   103,
+    84,    73,   111,     3,    74,    53,    96,   100,     1,     2,
+   116,    55,   181,    64,   131,   133,   228,   139,   141,    70,
+    78,   107,    81,    90,   146,    97,   102,   108,   112,   169,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   153,   nil,   nil,   nil,   nil,   nil,   150,   163,
+   nil,   nil,   nil,   nil,   nil,   nil,   167,   nil,   161,   110,
+   173,   165,   155,   201,   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,   189,   nil,   nil,   nil,   nil,   nil,   193,   155,
-   210,   nil,   195,   nil,   110,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   187,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   153,   nil,
+   192,   nil,   207,   110,   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,   223,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   216,   nil,
+   221,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   224,   220 ]
+   nil,   nil,   nil,   nil,   225 ]
 racc_goto_check = [
-    40,    52,    25,    20,    20,    56,    29,    42,    18,    35,
-    50,    41,    54,    53,     3,     1,     3,    48,    48,     2,
-    17,    19,    21,    23,    24,    26,    27,    28,    31,    32,
-    33,    37,    38,    53,    43,    44,    47,    51,    55,    57,
-    58,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    40,   nil,   nil,   nil,    52,   nil,   nil,   nil,    41,
-   nil,   nil,    52,   nil,   nil,   nil,   nil,    35,    56,    50,
-    18,    54,   nil,   nil,   nil,    42,   nil,    29,   nil,   nil,
+    25,    40,    27,    20,    20,    52,    56,    42,    18,    50,
+    41,    53,    54,     3,    35,     3,    48,    48,     1,     2,
+    17,    19,    21,    23,    24,    26,    28,    31,    32,    33,
+    37,    53,    38,    43,    44,    47,    51,    55,    57,    58,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    40,   nil,   nil,   nil,   nil,   nil,    41,    52,
+   nil,   nil,   nil,   nil,   nil,   nil,    52,   nil,    50,    56,
+    18,    54,    35,    42,   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,    25,   nil,   nil,   nil,   nil,   nil,    25,    40,
-    52,   nil,    20,   nil,    56,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40,   nil,
+    20,   nil,    52,    56,   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,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,
+    40,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    40,    25 ]
+   nil,   nil,   nil,   nil,    25 ]
 racc_goto_pointer = [
-   nil,    15,    19,    14,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    18,    19,    13,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   -34,   -46,     1,
-   -18,  -103,   nil,     0,   -40,   -21,   -39,   -40,   -39,   -60,
-   nil,   -39,   -39,     3,   nil,   -19,   nil,    -1,     0,   nil,
-   -34,   -24,   -78,    -2,   -40,   nil,   nil,    -6,   -24,   nil,
-   -33,    -6,   -50,   -14,   -37,   -10,   -43,   -12,   -74 ]
+   -18,  -103,   nil,     0,   -40,   -23,   -39,   -64,  -200,   nil,
+   nil,   -40,   -40,     2,   nil,   -14,   nil,    -2,     0,   nil,
+   -33,   -25,   -78,    -3,   -41,   nil,   nil,    -7,   -25,   nil,
+   -34,    -7,   -46,   -16,   -37,   -11,   -42,   -13,   -75 ]
 racc_goto_default = [
    nil,   nil,   nil,   nil,     4,     5,     6,     7,     8,     9,
     10,    11,    13,    14,    15,    16,    17,   nil,   nil,   nil,
-   nil,    58,   125,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    58,   125,   nil,   nil,   nil,   nil,   nil,   190,   137,
     60,   nil,   nil,    26,    28,    87,    32,   nil,   nil,    34,
     35,   nil,   nil,    37,   nil,    40,    41,   nil,   nil,    43,
     44,   nil,   nil,    46,    48,   nil,    50,   nil,   nil ]
@@ -212,103 +216,102 @@ racc_reduce_table = [
   2, 76, :_reduce_46,
   1, 76, :_reduce_none,
   2, 76, :_reduce_48,
-  2, 75, :_reduce_49,
+  3, 75, :_reduce_49,
   0, 77, :_reduce_50,
   1, 77, :_reduce_51,
-  2, 77, :_reduce_52,
-  1, 77, :_reduce_53,
-  4, 79, :_reduce_54,
-  3, 79, :_reduce_55,
-  4, 79, :_reduce_56,
-  3, 78, :_reduce_57,
-  1, 70, :_reduce_58,
-  2, 70, :_reduce_59,
+  0, 78, :_reduce_52,
+  6, 78, :_reduce_53,
+  3, 78, :_reduce_54,
+  4, 78, :_reduce_55,
+  3, 79, :_reduce_56,
+  1, 70, :_reduce_57,
+  2, 70, :_reduce_58,
   1, 80, :_reduce_none,
   1, 80, :_reduce_none,
-  4, 57, :_reduce_62,
-  1, 81, :_reduce_63,
-  2, 81, :_reduce_64,
-  4, 58, :_reduce_65,
+  4, 57, :_reduce_61,
+  1, 81, :_reduce_62,
+  2, 81, :_reduce_63,
+  4, 58, :_reduce_64,
+  1, 82, :_reduce_65,
   1, 82, :_reduce_66,
-  1, 82, :_reduce_67,
-  2, 54, :_reduce_68,
-  4, 54, :_reduce_69,
+  2, 54, :_reduce_67,
+  4, 54, :_reduce_68,
   1, 83, :_reduce_none,
-  2, 83, :_reduce_71,
+  2, 83, :_reduce_70,
+  1, 84, :_reduce_71,
   1, 84, :_reduce_72,
-  1, 84, :_reduce_73,
-  2, 55, :_reduce_74,
-  2, 56, :_reduce_75,
-  4, 56, :_reduce_76,
+  2, 55, :_reduce_73,
+  2, 56, :_reduce_74,
+  4, 56, :_reduce_75,
   1, 87, :_reduce_none,
   1, 87, :_reduce_none,
-  1, 86, :_reduce_79,
-  3, 86, :_reduce_80,
+  1, 86, :_reduce_78,
+  3, 86, :_reduce_79,
   1, 88, :_reduce_none,
   1, 88, :_reduce_none,
-  3, 59, :_reduce_83,
-  2, 59, :_reduce_84,
-  5, 59, :_reduce_85,
-  4, 59, :_reduce_86,
-  1, 92, :_reduce_87,
-  3, 92, :_reduce_88,
-  1, 89, :_reduce_89,
-  2, 89, :_reduce_90,
+  3, 59, :_reduce_82,
+  2, 59, :_reduce_83,
+  5, 59, :_reduce_84,
+  4, 59, :_reduce_85,
+  1, 92, :_reduce_86,
+  3, 92, :_reduce_87,
+  1, 89, :_reduce_88,
+  2, 89, :_reduce_89,
   1, 89, :_reduce_none,
+  1, 93, :_reduce_91,
   1, 93, :_reduce_92,
   1, 93, :_reduce_93,
   1, 93, :_reduce_94,
-  1, 93, :_reduce_95,
-  2, 93, :_reduce_96,
-  2, 91, :_reduce_97,
-  3, 91, :_reduce_98,
-  2, 91, :_reduce_99,
-  3, 91, :_reduce_100,
-  2, 91, :_reduce_101,
-  1, 91, :_reduce_102,
-  2, 85, :_reduce_103,
-  3, 85, :_reduce_104,
-  1, 94, :_reduce_105,
-  3, 94, :_reduce_106,
+  2, 93, :_reduce_95,
+  2, 91, :_reduce_96,
+  3, 91, :_reduce_97,
+  2, 91, :_reduce_98,
+  3, 91, :_reduce_99,
+  2, 91, :_reduce_100,
+  1, 91, :_reduce_101,
+  2, 85, :_reduce_102,
+  3, 85, :_reduce_103,
+  1, 94, :_reduce_104,
+  3, 94, :_reduce_105,
   1, 90, :_reduce_none,
   1, 90, :_reduce_none,
-  3, 96, :_reduce_109,
+  3, 96, :_reduce_108,
   1, 97, :_reduce_none,
   1, 97, :_reduce_none,
   1, 98, :_reduce_none,
   1, 98, :_reduce_none,
-  3, 95, :_reduce_114,
-  2, 95, :_reduce_115,
-  2, 61, :_reduce_116,
-  1, 99, :_reduce_117,
-  3, 99, :_reduce_118,
-  2, 99, :_reduce_119,
+  3, 95, :_reduce_113,
+  2, 95, :_reduce_114,
+  2, 61, :_reduce_115,
+  1, 99, :_reduce_116,
+  3, 99, :_reduce_117,
+  2, 99, :_reduce_118,
   1, 101, :_reduce_none,
   2, 101, :_reduce_none,
-  2, 100, :_reduce_122,
-  3, 100, :_reduce_123,
-  4, 60, :_reduce_124,
-  2, 60, :_reduce_125,
-  4, 60, :_reduce_126,
-  1, 103, :_reduce_127,
-  2, 103, :_reduce_128,
-  3, 103, :_reduce_129,
+  2, 100, :_reduce_121,
+  3, 100, :_reduce_122,
+  4, 60, :_reduce_123,
+  2, 60, :_reduce_124,
+  4, 60, :_reduce_125,
+  1, 103, :_reduce_126,
+  2, 103, :_reduce_127,
+  3, 103, :_reduce_128,
   1, 105, :_reduce_none,
   2, 105, :_reduce_none,
-  1, 104, :_reduce_132,
-  2, 104, :_reduce_133,
-  2, 106, :_reduce_134,
-  1, 107, :_reduce_135,
-  2, 107, :_reduce_136,
-  3, 107, :_reduce_137,
-  1, 102, :_reduce_138,
-  2, 102, :_reduce_139,
-  1, 108, :_reduce_140,
-  1, 108, :_reduce_141 ]
+  1, 104, :_reduce_131,
+  2, 104, :_reduce_132,
+  2, 106, :_reduce_133,
+  1, 107, :_reduce_134,
+  2, 107, :_reduce_135,
+  3, 107, :_reduce_136,
+  1, 102, :_reduce_137,
+  2, 102, :_reduce_138,
+  1, 108, :_reduce_139,
+  1, 108, :_reduce_140 ]
-racc_reduce_n = 142
+racc_reduce_n = 141
-racc_shift_n = 228
+racc_shift_n = 230
 racc_token_table = {
   false => 0,
@@ -461,9 +464,9 @@ Racc_token_to_s_table = [
   "coach_opt",
   "lineup_name",
   "lineup_sep",
-  "lineup_name_opts",
+  "lineup_card_opts",
+  "lineup_sub_opts",
   "card",
-  "lineup_sub",
   "card_type",
   "team_values",
   "round_date_opts",
@@ -725,7 +728,7 @@ module_eval(<<'.,.,', 'parser.y', 139)
 module_eval(<<'.,.,', 'parser.y', 144)
   def _reduce_49(val, _values, result)
-                                  kwargs = { name: val[0] }.merge( val[1] )
+                                  kwargs = { name: val[0] }.merge( val[1] ).merge( val[2] )
                               result = Lineup.new( **kwargs )
     result
@@ -739,60 +742,54 @@ module_eval(<<'.,.,', 'parser.y', 148)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 151)
+module_eval(<<'.,.,', 'parser.y', 149)
   def _reduce_51(val, _values, result)
-                                  result = { card: val[0] }
+     result = { card: val[0] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 155)
+module_eval(<<'.,.,', 'parser.y', 166)
   def _reduce_52(val, _values, result)
-                                  result = { card: val[0], sub: val[1] }
+     result = {}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 159)
+module_eval(<<'.,.,', 'parser.y', 169)
   def _reduce_53(val, _values, result)
-                                  result = { sub: val[0] }
+                                  kwargs = { name: val[1] }.merge( val[2] ).merge( val[4] )
+                              sub    = Sub.new( sub:    Lineup.new( **kwargs ),
+                                                minute: Minute.new(val[3][1])
+                                              )
+                              result = { sub: sub }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 165)
+module_eval(<<'.,.,', 'parser.y', 177)
   def _reduce_54(val, _values, result)
-                                  result = Sub.new( sub:    val[1],
-                                                minute: Minute.new(val[2][1])
-                                              )
+                                  sub = Sub.new( sub: val[1] )
+                              result = { sub: sub }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 171)
+module_eval(<<'.,.,', 'parser.y', 183)
   def _reduce_55(val, _values, result)
-                                  result = Sub.new( sub:    val[1] )
+                                  sub = Sub.new( sub:    val[2],
+                                             minute: Minute.new(val[1][1])
+                                            )
+                              result = { sub: sub }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 176)
+module_eval(<<'.,.,', 'parser.y', 193)
   def _reduce_56(val, _values, result)
-                                  result = Sub.new( sub:    val[2],
-                                                minute: Minute.new(val[1][1])
-                                              )
-    result
-  end
-.,.,
-module_eval(<<'.,.,', 'parser.y', 184)
-  def _reduce_57(val, _values, result)
                                   kwargs = val[1]
                               result = Card.new( **kwargs )
@@ -800,15 +797,15 @@ module_eval(<<'.,.,', 'parser.y', 184)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 189)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 198)
+  def _reduce_57(val, _values, result)
      result = { name: val[0] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 192)
-  def _reduce_59(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 201)
+  def _reduce_58(val, _values, result)
      result = { name: val[0],
                                         minute: Minute.new(val[1][1]) }
@@ -816,12 +813,12 @@ module_eval(<<'.,.,', 'parser.y', 192)
   end
 .,.,
-# reduce 60 omitted
+# reduce 59 omitted
-# reduce 61 omitted
+# reduce 60 omitted
-module_eval(<<'.,.,', 'parser.y', 206)
-  def _reduce_62(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 215)
+  def _reduce_61(val, _values, result)
                           @tree << GroupDef.new( name:  val[0],
                                              teams: val[2] )
@@ -829,8 +826,8 @@ module_eval(<<'.,.,', 'parser.y', 206)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 212)
-  def _reduce_63(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 221)
+  def _reduce_62(val, _values, result)
                                                    result = val
                                                ## e.g. val is ["Austria"]
@@ -838,16 +835,16 @@ module_eval(<<'.,.,', 'parser.y', 212)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 216)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 225)
+  def _reduce_63(val, _values, result)
                                                    result.push( val[1] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 225)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 234)
+  def _reduce_64(val, _values, result)
                           kwargs = { name: val[0] }.merge( val[2] )
                       @tree<< RoundDef.new( **kwargs )
@@ -855,22 +852,22 @@ module_eval(<<'.,.,', 'parser.y', 225)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 230)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 239)
+  def _reduce_65(val, _values, result)
      result = { date: val[0][1] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 231)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 240)
+  def _reduce_66(val, _values, result)
      result = { duration: val[0][1] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 237)
-  def _reduce_68(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 246)
+  def _reduce_67(val, _values, result)
                          kwargs = {}.merge( val[0] )
                      @tree <<  DateHeader.new( **kwargs )
@@ -878,8 +875,8 @@ module_eval(<<'.,.,', 'parser.y', 237)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 242)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 251)
+  def _reduce_68(val, _values, result)
                          kwargs = {}.merge( val[1] )
                      @tree <<  DateHeader.new( **kwargs )
@@ -887,77 +884,77 @@ module_eval(<<'.,.,', 'parser.y', 242)
   end
 .,.,
-# reduce 70 omitted
+# reduce 69 omitted
-module_eval(<<'.,.,', 'parser.y', 248)
-  def _reduce_71(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 257)
+  def _reduce_70(val, _values, result)
       result = {}.merge( val[0], val[1] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 251)
-  def _reduce_72(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 260)
+  def _reduce_71(val, _values, result)
        result = { date: val[0][1]}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 252)
-  def _reduce_73(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 261)
+  def _reduce_72(val, _values, result)
        result = {}.merge( val[0][1] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 259)
-  def _reduce_74(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 268)
+  def _reduce_73(val, _values, result)
                          @tree <<  GroupHeader.new( name: val[0] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 270)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 279)
+  def _reduce_74(val, _values, result)
                          @tree <<  RoundHeader.new( names: val[0] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 274)
-  def _reduce_76(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 283)
+  def _reduce_75(val, _values, result)
                         @tree <<  RoundHeader.new( names: val[0], group: val[2] )
     result
   end
 .,.,
-# reduce 77 omitted
+# reduce 76 omitted
-# reduce 78 omitted
+# reduce 77 omitted
-module_eval(<<'.,.,', 'parser.y', 279)
-  def _reduce_79(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 288)
+  def _reduce_78(val, _values, result)
       result = val
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 280)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 289)
+  def _reduce_79(val, _values, result)
        result.push( val[2] )
     result
   end
 .,.,
-# reduce 81 omitted
+# reduce 80 omitted
-# reduce 82 omitted
+# reduce 81 omitted
-module_eval(<<'.,.,', 'parser.y', 290)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 299)
+  def _reduce_82(val, _values, result)
                            kwargs = {}.merge( val[0], val[1], val[2] )
                        @tree << MatchLine.new( **kwargs )
@@ -965,8 +962,8 @@ module_eval(<<'.,.,', 'parser.y', 290)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 295)
-  def _reduce_84(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 304)
+  def _reduce_83(val, _values, result)
                           kwargs = {}.merge( val[0], val[1] )
                       @tree << MatchLine.new( **kwargs )
@@ -974,8 +971,8 @@ module_eval(<<'.,.,', 'parser.y', 295)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 303)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 312)
+  def _reduce_84(val, _values, result)
                           kwargs = {}.merge( val[0], val[1] )
                       @tree << MatchLine.new( **kwargs )
@@ -988,8 +985,8 @@ module_eval(<<'.,.,', 'parser.y', 303)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 313)
-  def _reduce_86(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 322)
+  def _reduce_85(val, _values, result)
                           kwargs = val[0]
                       @tree << MatchLine.new( **kwargs )
@@ -1002,8 +999,8 @@ module_eval(<<'.,.,', 'parser.y', 313)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 327)
-  def _reduce_87(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 336)
+  def _reduce_86(val, _values, result)
                                         trace( "REDUCE => more_matches : match" )
                                     result = val
@@ -1011,8 +1008,8 @@ module_eval(<<'.,.,', 'parser.y', 327)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 332)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 341)
+  def _reduce_87(val, _values, result)
                                          trace( "REDUCE => more_matches : more_matches ',' match" )
                                      result.push( val[2] )
@@ -1020,59 +1017,59 @@ module_eval(<<'.,.,', 'parser.y', 332)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 338)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 347)
+  def _reduce_88(val, _values, result)
        result = { ord: val[0][1][:value] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 339)
-  def _reduce_90(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 348)
+  def _reduce_89(val, _values, result)
        result = { ord: val[0][1][:value] }.merge( val[1] )
     result
   end
 .,.,
-# reduce 91 omitted
+# reduce 90 omitted
-module_eval(<<'.,.,', 'parser.y', 343)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 352)
+  def _reduce_91(val, _values, result)
        result = { date: val[0][1]}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 344)
-  def _reduce_93(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 353)
+  def _reduce_92(val, _values, result)
        result = {}.merge( val[0][1] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 345)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 354)
+  def _reduce_93(val, _values, result)
        result = { time: val[0][1]}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 346)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 355)
+  def _reduce_94(val, _values, result)
        result = { wday: val[0][1]}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 347)
-  def _reduce_96(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 356)
+  def _reduce_95(val, _values, result)
        result = { wday: val[0][1], time: val[1][1] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 361)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 370)
+  def _reduce_96(val, _values, result)
                           ## todo - add possible status_notes too!!!
                       result = { status: val[0][1][:status] }
@@ -1080,76 +1077,76 @@ module_eval(<<'.,.,', 'parser.y', 361)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 366)
-  def _reduce_98(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 375)
+  def _reduce_97(val, _values, result)
                          result = { status: val[0][1][:status] }.merge( val[1] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 368)
-  def _reduce_99(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 377)
+  def _reduce_98(val, _values, result)
      result = {}.merge( val[0] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 369)
-  def _reduce_100(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 378)
+  def _reduce_99(val, _values, result)
      result = {}.merge( val[0] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 370)
-  def _reduce_101(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 379)
+  def _reduce_100(val, _values, result)
      result = {}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 371)
-  def _reduce_102(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 380)
+  def _reduce_101(val, _values, result)
      result = {}
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 377)
-  def _reduce_103(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 386)
+  def _reduce_102(val, _values, result)
      result = { geo: val[1] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 378)
-  def _reduce_104(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 387)
+  def _reduce_103(val, _values, result)
      result = { geo: val[1], timezone: val[2] }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 381)
-  def _reduce_105(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 390)
+  def _reduce_104(val, _values, result)
       result = val
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 382)
-  def _reduce_106(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 391)
+  def _reduce_105(val, _values, result)
       result.push( val[2] )
     result
   end
 .,.,
-# reduce 107 omitted
+# reduce 106 omitted
-# reduce 108 omitted
+# reduce 107 omitted
-module_eval(<<'.,.,', 'parser.y', 390)
-  def _reduce_109(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 399)
+  def _reduce_108(val, _values, result)
                                    trace( "RECUDE match_fixture" )
                                result = { team1: val[0],
                                           team2: val[2] }
@@ -1158,16 +1155,16 @@ module_eval(<<'.,.,', 'parser.y', 390)
   end
 .,.,
+# reduce 109 omitted
 # reduce 110 omitted
 # reduce 111 omitted
 # reduce 112 omitted
-# reduce 113 omitted
-module_eval(<<'.,.,', 'parser.y', 404)
-  def _reduce_114(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 413)
+  def _reduce_113(val, _values, result)
                                trace( "REDUCE => match_result : TEAM score TEAM" )
                            result = { team1: val[0],
                                       team2: val[2],
@@ -1178,8 +1175,8 @@ module_eval(<<'.,.,', 'parser.y', 404)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 412)
-  def _reduce_115(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 421)
+  def _reduce_114(val, _values, result)
                               trace( "REDUCE  => match_result : match_fixture score" )
                           result = { score: val[1][1] }.merge( val[0] )
@@ -1187,41 +1184,41 @@ module_eval(<<'.,.,', 'parser.y', 412)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 437)
-  def _reduce_116(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 446)
+  def _reduce_115(val, _values, result)
                                  @tree << GoalLineAlt.new( goals: val[0] )
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 441)
-  def _reduce_117(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 450)
+  def _reduce_116(val, _values, result)
      result = val
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 443)
-  def _reduce_118(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 452)
+  def _reduce_117(val, _values, result)
      result.push( val[2])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 445)
-  def _reduce_119(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 454)
+  def _reduce_118(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
-# reduce 120 omitted
+# reduce 119 omitted
-# reduce 121 omitted
+# reduce 120 omitted
-module_eval(<<'.,.,', 'parser.y', 453)
-  def _reduce_122(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 462)
+  def _reduce_121(val, _values, result)
                                result = GoalAlt.new( score:   val[0],
                                                  player:  val[1] )
@@ -1229,8 +1226,8 @@ module_eval(<<'.,.,', 'parser.y', 453)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 458)
-  def _reduce_123(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 467)
+  def _reduce_122(val, _values, result)
                                result = GoalAlt.new( score:  val[0],
                                                  player: val[1],
                                                  minute: val[2] )
@@ -1239,8 +1236,8 @@ module_eval(<<'.,.,', 'parser.y', 458)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 470)
-  def _reduce_124(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 479)
+  def _reduce_123(val, _values, result)
                            kwargs = val[1]
                        @tree << GoalLine.new( **kwargs )
@@ -1248,8 +1245,8 @@ module_eval(<<'.,.,', 'parser.y', 470)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 475)
-  def _reduce_125(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 484)
+  def _reduce_124(val, _values, result)
                              kwargs = val[0]
                          @tree << GoalLine.new( **kwargs )
@@ -1257,8 +1254,8 @@ module_eval(<<'.,.,', 'parser.y', 475)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 480)
-  def _reduce_126(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 489)
+  def _reduce_125(val, _values, result)
                              kwargs = val[1]
                          @tree << GoalLine.new( **kwargs )
@@ -1266,8 +1263,8 @@ module_eval(<<'.,.,', 'parser.y', 480)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 485)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 494)
+  def _reduce_126(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: [] }
@@ -1275,8 +1272,8 @@ module_eval(<<'.,.,', 'parser.y', 485)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 488)
-  def _reduce_128(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 497)
+  def _reduce_127(val, _values, result)
       result = { goals1: [],
                                                               goals2: val[1] }
@@ -1284,8 +1281,8 @@ module_eval(<<'.,.,', 'parser.y', 488)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 491)
-  def _reduce_129(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 500)
+  def _reduce_128(val, _values, result)
       result = { goals1: val[0],
                                                               goals2: val[2] }
@@ -1293,26 +1290,26 @@ module_eval(<<'.,.,', 'parser.y', 491)
   end
 .,.,
-# reduce 130 omitted
+# reduce 129 omitted
-# reduce 131 omitted
+# reduce 130 omitted
-module_eval(<<'.,.,', 'parser.y', 507)
-  def _reduce_132(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 516)
+  def _reduce_131(val, _values, result)
      result = val
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 508)
-  def _reduce_133(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 517)
+  def _reduce_132(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 524)
-  def _reduce_134(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 533)
+  def _reduce_133(val, _values, result)
                       result = Goal.new( player:  val[0],
                                      minutes: val[1] )
@@ -1320,29 +1317,29 @@ module_eval(<<'.,.,', 'parser.y', 524)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 536)
-  def _reduce_135(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 545)
+  def _reduce_134(val, _values, result)
      result = val
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 537)
-  def _reduce_136(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 546)
+  def _reduce_135(val, _values, result)
      result.push( val[1])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 538)
-  def _reduce_137(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 547)
+  def _reduce_136(val, _values, result)
      result.push( val[2])
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 544)
-  def _reduce_138(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 553)
+  def _reduce_137(val, _values, result)
                             kwargs = {}.merge( val[0][1] )
                         result = Minute.new( **kwargs )
@@ -1350,8 +1347,8 @@ module_eval(<<'.,.,', 'parser.y', 544)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 549)
-  def _reduce_139(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 558)
+  def _reduce_138(val, _values, result)
                             kwargs = { }.merge( val[0][1] ).merge( val[1] )
                         result = Minute.new( **kwargs )
@@ -1359,15 +1356,15 @@ module_eval(<<'.,.,', 'parser.y', 549)
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 553)
-  def _reduce_140(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 562)
+  def _reduce_139(val, _values, result)
       result = { og: true }
     result
   end
 .,.,
-module_eval(<<'.,.,', 'parser.y', 554)
-  def _reduce_141(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 563)
+  def _reduce_140(val, _values, result)
       result = { pen: true }
     result
   end

data/lib/sportdb/parser/racc_tree.rb CHANGED Viewed

@@ -77,8 +77,9 @@ end
 Sub        = Struct.new( :minute, :sub )  do
   def pretty_print( printer )
     buf = String.new
-    buf << "(#{self.sub.pretty_inspect}"
-    buf << " #{self.minute.to_s}"   if self.minute
+    buf << "("    ## note - possibly recursive (thus, let minute go first/print first/upfront)
+    buf << "#{self.minute.to_s} "   if self.minute
+    buf << "#{self.sub.pretty_inspect}"
     buf << ")"
     printer.text( buf )
   end

data/lib/sportdb/parser/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

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