sportdb-parser 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ec5bcacfe56b29e9589507c11d3bfe361caed4b45ebdfa3b05901c8229b019
-  data.tar.gz: bd36a9b6c0b84a9a033d721c4adf086ff25703ed31dde3fc8265c421ba6273c1
+  metadata.gz: 150ee98d02311f0436226fb662d1cde426c6f91a88e6298257252c58e827cb17
+  data.tar.gz: e06fb067d2ddc317fe4f7ba033b512f378d6fa32da58756238e30d617653755e
 SHA512:
-  metadata.gz: db5568eb30b924f0e963402ed3089edc1b1cdbcf31cfaa4177da6215b82e0646badd428e94a14a42abfbb4688c7543f8b04f698eb1551082e9731b1937a23e19
-  data.tar.gz: d3619f1ea496cf4fdc08d0904afee295679d6f1aa0c35aacd09ccf8e19ad00beb78f832efef3f24189b8793b0dd24064544854e84d7d26653398962d79bda311
+  metadata.gz: 95c28de0c34ab52e3ca0f49fdd6ec5634dbaee2cf35e6a3c221d6f38f0d463d0e7e381151cd7572a88026a508f2991e822bf3882c46b7943903bc73a1d7477e6
+  data.tar.gz: 3a5fd4e4dbb4731201f152732791afb544fc05ee7136a8021e98faf7fe6a7fcedd0b22699848e22e9a39fa74dab2a9686f908cde74c8cc50b2e80e2fc491ebd1

data/CHANGELOG.md

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

data/lib/sportdb/parser/lexer.rb

@@ -327,9 +327,27 @@ def _tokenize_line( line )
     if m
       ###  switch into new mode
       ##  switch context  to PROP_RE
-        @re = PROP_RE
         puts "  ENTER PROP_RE MODE"   if debug?
-        tokens << [:PROP, m[:key]]
+        key = m[:key]
+
+
+        ### todo - add prop yellow/red cards too - why? why not?
+        if ['sent off', 'red cards'].include?( key.downcase) 
+          @re = PROP_CARDS_RE    ## use CARDS_RE ???
+          tokens << [:PROP_REDCARDS, m[:key]]
+        elsif ['yellow cards'].include?( key.downcase )
+          @re = PROP_CARDS_RE  
+          tokens << [:PROP_YELLOWCARDS, m[:key]]
+        elsif ['ref', 'referee'].include?( key.downcase )
+          @re = PROP_RE     ## (re)use prop setup for now - why? why not?
+          tokens << [:PROP_REFEREE, m[:key]]
+        elsif ['goals'].include?( key.downcase )
+          @re = PROP_GOAL_RE
+          tokens << [:PROP_GOALS, m[:key]]
+        else   ## assume (team) line-up
+          @re = PROP_RE           ## use LINEUP_RE ???
+          tokens << [:PROP, m[:key]]
+        end
 
         offsets = [m.begin(0), m.end(0)]
         pos = offsets[1]    ## update pos
@@ -420,10 +438,44 @@ def _tokenize_line( line )
     ## note: racc requires pairs e.g. [:TOKEN, VAL]
     ##         for VAL use "text" or ["text", { opts }]  array
 
-
-  t = if @re == PROP_RE
+  t = if @re == PROP_CARDS_RE 
+        if m[:space] || m[:spaces]
+              nil    ## skip space(s)
+         elsif m[:prop_name]
+              [:PROP_NAME, m[:name]]
+         elsif m[:minute]
+              minute = {}
+              minute[:m]      = m[:value].to_i(10)
+              minute[:offset] = m[:value2].to_i(10)   if m[:value2]
+             ## note - for debugging keep (pass along) "literal" minute
+             [:MINUTE, [m[:minute], minute]]
+         elsif m[:sym]
+            sym = m[:sym]
+            case sym
+            when ',' then [:',']
+            when ';' then [:';']
+            when '-' then [:'-']
+            else
+              nil  ## ignore others (e.g. brackets [])
+            end
+         else
+            ## report error
+             puts "!!! TOKENIZE ERROR (PROP_CARDS_RE) - no match found"
+             nil 
+         end    
+      elsif @re == PROP_RE   ### todo/fix - change to LINEUP_RE !!!!
          if m[:space] || m[:spaces]
               nil    ## skip space(s)
+         elsif m[:prop_key]   ## check for inline prop keys
+              key = m[:key]   
+              ##  supported for now coach/trainer (add manager?)
+              if ['coach', 
+                  'trainer'].include?( key.downcase )
+                [:COACH, m[:key]]   ## use COACH_KEY or such - why? why not?
+              else
+                ## report error - for unknown (inline) prop key in lineup
+                nil
+              end
          elsif m[:prop_name]
                if m[:name] == 'Y'
                  [:YELLOW_CARD, m[:name]]
@@ -451,11 +503,6 @@ def _tokenize_line( line )
             when '(' then [:'(']
             when ')' then [:')']
             when '-' then [:'-']
-           # when '.' then 
-           #     ## switch back to top-level mode!!
-           #     puts "  LEAVE PROP_RE MODE, BACK TO TOP_LEVEL/RE"  if debug?
-           #     @re = RE 
-           #     [:'.']
             else
               nil  ## ignore others (e.g. brackets [])
             end
@@ -464,7 +511,7 @@ def _tokenize_line( line )
              puts "!!! TOKENIZE ERROR (PROP_RE) - no match found"
              nil 
          end
-      elsif @re == GOAL_RE
+      elsif @re == GOAL_RE || @re == PROP_GOAL_RE
          if m[:space] || m[:spaces]
               nil    ## skip space(s)
          elsif m[:prop_name]    ## note - change prop_name to player
@@ -660,11 +707,16 @@ def _tokenize_line( line )
   end
 
 
+   if @re == GOAL_RE   ### ALWAYS switch back to top level mode
+     puts "  LEAVE GOAL_RE MODE, BACK TO TOP_LEVEL/RE"  if debug?
+     @re = RE 
+   end
+ 
    ##
    ## if in prop mode continue if   last token is [,-]
    ##        otherwise change back to "standard" mode
-   if @re == PROP_RE
-     if [:',', :'-'].include?( tokens[-1][0] )
+   if @re == PROP_RE || @re == PROP_CARDS_RE || @re == PROP_GOAL_RE
+     if [:',', :'-', :';'].include?( tokens[-1][0] )
         ## continue/stay in PROP_RE mode
         ##  todo/check - auto-add PROP_CONT token or such
         ##                to help parser with possible NEWLINE
@@ -678,11 +730,6 @@ def _tokenize_line( line )
      end
    end
 
-
-   if @re == GOAL_RE   ### ALWAYS switch back to top level mode
-     puts "  LEAVE GOAL_RE MODE, BACK TO TOP_LEVEL/RE"  if debug?
-     @re = RE 
-   end
   
   [tokens,errors]
 end