fbtok 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7e5c105200820cbce7e9701ed2b8ce0506e366f4215a013288b66b625528ff
-  data.tar.gz: 3f02e52b461d14d014a3a4c3283dd452f0ca6316048969b5cf0af1cd4bd457b8
+  metadata.gz: 15089da91cb8cb9ce5f6905c3714e52758fcf4254c26f978ef1a64ac053caf9d
+  data.tar.gz: 13edb307d1fcbc9b0e30ff80f1764623c5f4a1cc17ef225e61d96e071615bcc6
 SHA512:
-  metadata.gz: e8c77935b70909ac04697276af902f0597f6eed411b8bddee77248a0145c1fb704eb58a59cd49744ac7e93da97fa5410ca5a35825ea3ec4ca0ea4f834d30543f
-  data.tar.gz: 35ef329be9dddaaf94658252e9e2684b4f3f63a89da8484db3507ab36f8afefc319d2ab4f3154389539a7ad6545779dd39e710f0eb7e82990988690cea107458
+  metadata.gz: 2d56318a4f9895dd71b8c6309ba131e2a310e0bc5d799bfe646f67220138ca1351bbde05ee5725bd28676988ccdbca009f0868b8de6f0e9a2ea5923743a2a32f
+  data.tar.gz: a28531c219b2ccf4cd1ee76129dcb8564433b1b3c2bdd1fd439ab44a4be2d04541cb8436cc9daab15c3010b22f590179556acfed1a2d2c8b23243f5156220e01

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.0
+### 0.3.2
 ### 0.0.1 / 2025-01-02
 
 * Everything is new. First release.

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.3.0'
+  self.version = '0.3.2'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -21,7 +21,7 @@ Hoe.spec 'fbtok' do
   self.extra_deps = [
      #  ['sportdb-structs', '>= 0.5.0'],
      #  ['logutils',        '>= 0.6.1'],
-     ['sportdb-parser',  '>= 0.5.4'],
+     ['sportdb-parser',  '>= 0.5.8'],
      ['sportdb-formats', '>= 2.1.2'],
   ]
 

data/bin/fbtok

@@ -10,6 +10,7 @@ args = ARGV
 
 opts = {
     debug: true,
+    warn:  false,
     file:  nil,
 }
 
@@ -18,13 +19,17 @@ parser = OptionParser.new do |parser|
 
 
   parser.on( "-q", "--quiet",
-             "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+             "less debug output/messages (default: #{!opts[:debug]})" ) do |debug|
     opts[:debug] = false
   end
   parser.on( "--verbose", "--debug",
                "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
     opts[:debug] = true
   end
+  parser.on( "-w", "--warn",
+              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+    opts[:warn] = true
+  end
 
 =begin
   parser.on( "--metal",
@@ -51,11 +56,13 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-
-  SportDb::Parser::Linter.debug = true    
-  SportDb::Parser::Opts.debug   = true
 end
 
+SportDb::Parser::Linter.debug = opts[:debug]    
+SportDb::Parser::Opts.debug   = opts[:debug]
+
+SportDb::Parser::Linter.warn  = opts[:warn]    
+
 
 
 ## todo/check - use packs or projects or such
@@ -87,7 +94,9 @@ specs.each_with_index do |spec,i|
 
    paths.each_with_index do |path,j|
       puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{paths.size}] reading >#{path}<..."
-      linter.read( path, parse: false )  ## only tokenize (do NOT parse)
+      tokens =  linter.read( path, parse: false )  ## only tokenize (do NOT parse)
+
+      puts "   #{tokens.size} token(s)"    
 
       errors += linter.errors    if linter.errors?
    end

data/bin/fbtree

@@ -10,6 +10,7 @@ args = ARGV
 
 opts = {
     debug: true,
+    warn:  false,
     file:  nil,
 }
 
@@ -18,13 +19,18 @@ parser = OptionParser.new do |parser|
 
 
   parser.on( "-q", "--quiet",
-             "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+             "less debug output/messages (default: #{!opts[:debug]})" ) do |debug|
     opts[:debug] = false
   end
   parser.on( "--verbose", "--debug",
                "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
     opts[:debug] = true
   end
+  parser.on( "-w", "--warn",
+              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+    opts[:warn] = true
+  end
+
 
   parser.on( "-f FILE", "--file FILE",
                 "read datafiles (pathspecs) via .csv file") do |file|
@@ -42,11 +48,12 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-
-  SportDb::Parser::Linter.debug = true    
-  SportDb::Parser::Opts.debug   = true
 end
 
+SportDb::Parser::Linter.debug = opts[:debug]    
+SportDb::Parser::Opts.debug   = opts[:debug]
+
+SportDb::Parser::Linter.warn  = opts[:warn]    
 
 
 

data/lib/fbtok/linter.rb

@@ -10,49 +10,59 @@ def self.debug=(value) @@debug = value; end
 def self.debug?()      @@debug ||= false; end  ## note: default is FALSE
 def debug?()  self.class.debug?; end
 
+##  turn warn(ings) into errors (default is false)
+def self.warn=(value) @@warn = value; end
+def self.warn?()      @@warn ||= false; end  ## note: default is FALSE
+def warn?()   self.class.warn?; end
 
 
 attr_reader :errors
 
 def initialize
   @errors = []
-  @parser = Parser.new   ## use own parser instance (not shared) - why? why not?
 end
 
 
 def errors?() @errors.size > 0; end
 
 
+
 #########
 ## parse - false (default) - tokenize (only)
 ##       - true            - tokenize & parse
 def read( path, parse: true )
   ## note: every (new) read call - resets errors list to empty
   @errors = []
-
-  @tree = []
+  @tree   = []
 
   outline = QuickMatchOutline.read( path )
 
   outline.each_para do |lines|
-
-     if parse
+  
        ## flatten lines (array of strings) into all-in-one string
        txt  = lines.reduce( String.new ) do |mem, line|
-                                            mem << line
-                                            mem << "\n"
-                                            mem
-                                        end
-    
+         mem << line
+         mem << "\n"
+         mem
+       end
+
+     if parse
        if debug?
          puts "lines:"
          pp txt   
        end
  
-       ## todo/fix -  add/track parse errors!!!!!!
        ##   pass along debug flag to parser (& tokenizer)?
        parser = RaccMatchParser.new( txt )   ## use own parser instance (not shared) - why? why not?
-       tree = parser.parse
+       tree, errors = parser.parse_with_errors
+
+         if errors.size > 0
+            ## add to "global" error list
+            ##   make a triplet tuple (file / msg / line text)
+            errors.each do |msg|
+                @errors << [path, msg]
+            end
+         end
 
        if debug?
          puts "parse tree:"
@@ -62,32 +72,44 @@ def read( path, parse: true )
        @tree += tree   ## add nodes
 
      else   ## process for tokenize only
-       lines.each_with_index do |line,i|
 
         if debug?
-         puts
-         puts "line >#{line}<"
+          puts "lines:"
+          pp txt   
         end
 
-        t, error_messages  =  @parser.tokenize_with_errors( line )
+##
+##   add (bakc) a line-by-line tracing (debug) option - why? why not?
+##      now debug output is by section (not line-by-line)
+
+        lexer = Lexer.new( txt )
+        t, errors  =  lexer.tokenize_with_errors
                             
-         if error_messages.size > 0
+         if errors.size > 0
             ## add to "global" error list
             ##   make a triplet tuple (file / msg / line text)
-            error_messages.each do |msg|
-                @errors << [ path,
-                             msg,
-                             line
-                           ]
+            errors.each do |msg|
+                @errors << [path, msg]
             end
          end
 
-         pp t   if debug?
-       end  # each line
+         if debug?
+           puts "tokens:"
+           pp t   
+         end
+
+         @tree += t   ## add tokens to "tree"
       end   # parse? (or tokenize?) 
    end  # each para (node)
 
-   ## note - only returns pare tree for now; no tokens (on parse=false)
+
+   ##
+   ## auto-add error if no tokens/tree nodes
+   ##   note - do NOT report empty file error by default 
+   if @tree.empty? && warn?  ## @tree.size == 0
+      @errors << [path, "empty; no #{parse ? 'parse tree nodes' : 'tokens'}"]
+   end
+
    @tree   ## return parse tree 
 end  # method read
 end  # class Linter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement