sportdb-parser 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2e6a1f243cdd9e255d659ffd616e875d3baf978edada8e663eb54e9bff35df
-  data.tar.gz: 76ddc2f54d6ac9e117963e15ae5fa3cadfbaebce8d942021efcd849aaed7811d
+  metadata.gz: '0902e4f811d2584b7c7360f00557d979579d5df8b48e3370ace0d3e7d211c45d'
+  data.tar.gz: e03327cfb9f33e39c3cc44063f9915ccc48d1c78b8076ee9fd7ba511d7b7bdc5
 SHA512:
-  metadata.gz: 750b13d813a7fddf80b991c4fdb244856b4bd7d07410caa75cacabcd8cc724631b87eb15b3f61de0e84c378475a1dbc42529933997389102378527b623c39f90
-  data.tar.gz: a88f83b33728a761cbb44c134456aeb3b49f003b422a42b30642c43a95514f8a2825929b56d7d54d788f4c197f680e7830d4dffcb7728ab284ea6e23bae64877
+  metadata.gz: 14e1f06f0fd5137208cce8a26f9a534317f0538a59f1701ae0140914afae9bed2963979df71d1032771798983dcf5ee5197c0105c6fb040c0e72052b86d282b5
+  data.tar.gz: e8b973f129cf11f951ba5629b81c53896bec02b949b4eb8d7c175b5fae54e33e31788cdfc18985f0d2759dfc473758512523adddf122e4c5293ce2c45d28543f

data/CHANGELOG.md

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

data/config/rounds_en.txt

@@ -18,6 +18,7 @@ Minor Semi-Final
 
 
 1/8 Finals
+Qualifying Round
 
 
 

data/lib/sportdb/parser/lexer.rb

@@ -413,6 +413,7 @@ def _tokenize_line( line )
   end
 
 
+  old_pos = -1   ## allows to backtrack to old pos (used in geo)
 
   while m = @re.match( line, pos )
     # if debug?
@@ -431,12 +432,14 @@ def _tokenize_line( line )
       log( msg )
     end
 
+
     ##
     ## todo/fix - also check if possible
     ##   if no match but not yet end off string!!!!
     ##    report skipped text run too!!!
 
-    pos = offsets[1]
+    old_pos = pos
+    pos     = offsets[1]
 
 #    pp offsets   if debug?
 
@@ -444,7 +447,46 @@ def _tokenize_line( line )
     ## note: racc requires pairs e.g. [:TOKEN, VAL]
     ##         for VAL use "text" or ["text", { opts }]  array
 
-  t = if @re == PROP_CARDS_RE 
+  t = if @re == GEO_RE
+         ### note - possibly end inline geo on [ (and others?? in the future
+         if m[:space] || m[:spaces]
+            nil    ## skip space(s)
+         elsif m[:text]
+            [:GEO, m[:text]]   ## keep pos - why? why not?
+         elsif m[:timezone]
+            [:TIMEZONE, m[:timezone]]
+         elsif m[:sym]
+            sym = m[:sym]
+            ## return symbols "inline" as is - why? why not?
+            ## (?<sym>[;,@|\[\]-])
+   
+            case sym
+            when ',' then [:',']
+            when '[' then
+                 ## get out-off geo mode and backtrack (w/ next)
+                 puts "  LEAVE GEO_RE MODE, BACK TO TOP_LEVEL/RE"  if debug?
+                 @re = RE
+                 pos = old_pos
+                 next   ## backtrack (resume new loop step)                 
+            else
+              puts "!!! TOKENIZE ERROR (sym) - ignore sym >#{sym}<"
+              nil  ## ignore others (e.g. brackets [])
+            end
+          elsif m[:any]
+             ## todo/check log error
+             msg = "parse error (tokenize geo) - skipping any match>#{m[:any]}< @#{offsets[0]},#{offsets[1]} in line >#{line}<"
+             puts "!! WARN - #{msg}"
+  
+             errors << msg
+             log( "!! WARN - #{msg}" )
+       
+             nil   
+          else
+            ## report error/raise expection
+             puts "!!! TOKENIZE ERROR - no match found"
+             nil 
+          end
+      elsif @re == PROP_CARDS_RE 
         if m[:space] || m[:spaces]
               nil    ## skip space(s)
          elsif m[:prop_name]
@@ -669,8 +711,10 @@ def _tokenize_line( line )
         elsif m[:note]
             ###  todo/check:
             ##      use value hash - why? why not? or simplify to:
-            ##  [:NOTE, m[:note]] 
-             [:NOTE, [m[:note], {note: m[:note] } ]]
+            ## [:NOTE, [m[:note], {note: m[:note] } ]]
+             [:NOTE, m[:note]] 
+        elsif m[:score_note]
+             [:SCORE_NOTE, m[:score_note]]
         elsif m[:time]
               ## unify to iso-format
               ###   12.40 => 12:40
@@ -701,8 +745,6 @@ def _tokenize_line( line )
             date[:wday] = DAY_MAP[ m[:day_name].downcase ]   if m[:day_name]
             ## note - for debugging keep (pass along) "literal" date
             [:DATE, [m[:date], date]]
-        elsif m[:timezone]
-          [:TIMEZONE, m[:timezone]]
         elsif m[:duration]
             ## todo/check/fix - if end: works for kwargs!!!!!
             duration = { start: {}, end: {}}
@@ -758,10 +800,13 @@ def _tokenize_line( line )
           ## (?<sym>[;,@|\[\]-])
  
           case sym
+          when '@'    ##  enter geo mode
+            puts "  ENTER GEO_RE MODE"  if debug?
+            @re = GEO_RE
+            [:'@']
           when ',' then [:',']
           when ';' then [:';']
           when '/' then [:'/']
-          when '@' then [:'@']
           when '|' then [:'|']
           when '[' then [:'[']
           when ']' then [:']']
@@ -814,6 +859,11 @@ def _tokenize_line( line )
      @re = RE 
    end
  
+   if @re == GEO_RE   ### ALWAYS switch back to top level mode
+     puts "  LEAVE GEO_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