fbtxt-parser 0.9.0 → 0.9.1

data/lib/fbtxt/parser/version.rb

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

data/lib/fbtxt/parser.rb

@@ -1,83 +1,13 @@
-require 'cocos'
-
 
+####
+#  quick hack - always auto-add latest lexer if present for now
+$LOAD_PATH.unshift( '../lexer/lib' )
+require 'fbtxt/lexer'
 
 
 require_relative 'parser/version'
 
 
-require_relative 'parser/debuggable'    ## generic debug/logger helper
-
-
-
-##
-## add shared/most basic regexes here
-## todo - use ANY_RE  to token_commons or such - for shared by many?
-module Fbtxt
-class Lexer
-
-## general catch-all  (RECOMMENDED (ALWAYS) use as last entry in union)
-##   to avoid advance of pos match!!!
-ANY_RE = %r{
-               (?<any> .)
-          }ix
-
-SPACES_RE = %r{
-                  (?<spaces> [ ]{2,})
-                | (?<space>  [ ])
-             }ix
-
-
-end # class Lexer
-end # module Fbtxt
-
-
-require_relative 'parser/token-score'
-require_relative 'parser/token-score_full'
-require_relative 'parser/token-score_fuller'
-require_relative 'parser/token-score_legs'
-require_relative 'parser/token-score--helpers'
-
-require_relative 'parser/token-time'
-require_relative 'parser/token-date--names'
-require_relative 'parser/token-date'
-require_relative 'parser/token-date_duration'
-require_relative 'parser/token-date--helpers'
-
-require_relative 'parser/token-text'
-require_relative 'parser/token-prop'    ## team prop(erty) mode (note - must be before token)
-require_relative 'parser/token-prop_name'    ## a.k.a token-text_ii
-require_relative 'parser/token-status'
-require_relative 'parser/token-status_inline'
-require_relative 'parser/token-note'
-require_relative 'parser/token-goals'
-require_relative 'parser/token-goals--helpers'
-require_relative 'parser/token-geo'
-require_relative 'parser/token-group'
-require_relative 'parser/token-round'
-require_relative 'parser/token'
-
-
-
-
-
-require_relative 'parser/lexer_buffer'   ## incl. Tokens (aka TokenBuffer)
-require_relative 'parser/lexer_token'
-
-require_relative 'parser/lexer-prep_doc'
-require_relative 'parser/lexer-prep_line'
-
-require_relative 'parser/lexer-logger'   ## e.g. _trace, _warn, _info, etc.
-require_relative 'parser/lexer-tokenize'
-require_relative 'parser/lexer-on_round_def'
-require_relative 'parser/lexer-on_group_def'
-require_relative 'parser/lexer-on_prop_misc'
-require_relative 'parser/lexer-on_prop_lineup'
-require_relative 'parser/lexer-on_prop_penalties'
-require_relative 'parser/lexer-on_goal'
-require_relative 'parser/lexer-on_top'
-require_relative 'parser/lexer'
-
 
 ## note - use "embeded" racc parser runtime
 ##    MUST uncomment  require 'racc/parser'  in generated parser!!!
@@ -114,15 +44,18 @@ RaccMatchParser = Fbtxt::Parser
 ##           or return a Result struct - why? why not?
 
 
-
 module Fbtxt
 
-def self.lex( txt, flatten: true )      ## returns Fbtxt::LexerResult (ok?/tokens/errors)
-  lexer = Lexer.new( txt )
-  ## move "wrapping" into result obj inside lexer - why? why not?
-  tokens, errors = lexer.tokenize_with_errors( flatten: flatten )
-  LexerResult.new( tokens, errors )
-end
+class ParserResult
+   attr_reader :tree, :errors
+   def initialize( tree, errors=[] )
+       @tree, @errors = tree, errors
+   end
+
+   def ok?()  @errors.size == 0; end
+   def nok?() !ok?; end
+end  # class ParserResult
+
 
 def self.parse( txt )   ## returns Fbtxt::ParserResult (ok?/tree/errors)
   parser = Parser.new( txt )
@@ -136,5 +69,4 @@ end #  module Fbtxt
 
 
 
-
 puts Fbtxt::Module::Parser.banner    # say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtxt-parser
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-07 00:00:00.000000000 Z
+date: 2026-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: fbtxt-lexer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,21 +86,6 @@ files:
 - README.md
 - Rakefile
 - lib/fbtxt/parser.rb
-- lib/fbtxt/parser/debuggable.rb
-- lib/fbtxt/parser/lexer-logger.rb
-- lib/fbtxt/parser/lexer-on_goal.rb
-- lib/fbtxt/parser/lexer-on_group_def.rb
-- lib/fbtxt/parser/lexer-on_prop_lineup.rb
-- lib/fbtxt/parser/lexer-on_prop_misc.rb
-- lib/fbtxt/parser/lexer-on_prop_penalties.rb
-- lib/fbtxt/parser/lexer-on_round_def.rb
-- lib/fbtxt/parser/lexer-on_top.rb
-- lib/fbtxt/parser/lexer-prep_doc.rb
-- lib/fbtxt/parser/lexer-prep_line.rb
-- lib/fbtxt/parser/lexer-tokenize.rb
-- lib/fbtxt/parser/lexer.rb
-- lib/fbtxt/parser/lexer_buffer.rb
-- lib/fbtxt/parser/lexer_token.rb
 - lib/fbtxt/parser/parse_tree--core.rb
 - lib/fbtxt/parser/parse_tree-match.rb
 - lib/fbtxt/parser/parse_tree-props.rb
@@ -94,28 +93,6 @@ files:
 - lib/fbtxt/parser/parser-runtime.rb
 - lib/fbtxt/parser/parser-top.rb
 - lib/fbtxt/parser/parser.rb
-- lib/fbtxt/parser/token-date--helpers.rb
-- lib/fbtxt/parser/token-date--names.rb
-- lib/fbtxt/parser/token-date.rb
-- lib/fbtxt/parser/token-date_duration.rb
-- lib/fbtxt/parser/token-geo.rb
-- lib/fbtxt/parser/token-goals--helpers.rb
-- lib/fbtxt/parser/token-goals.rb
-- lib/fbtxt/parser/token-group.rb
-- lib/fbtxt/parser/token-note.rb
-- lib/fbtxt/parser/token-prop.rb
-- lib/fbtxt/parser/token-prop_name.rb
-- lib/fbtxt/parser/token-round.rb
-- lib/fbtxt/parser/token-score--helpers.rb
-- lib/fbtxt/parser/token-score.rb
-- lib/fbtxt/parser/token-score_full.rb
-- lib/fbtxt/parser/token-score_fuller.rb
-- lib/fbtxt/parser/token-score_legs.rb
-- lib/fbtxt/parser/token-status.rb
-- lib/fbtxt/parser/token-status_inline.rb
-- lib/fbtxt/parser/token-text.rb
-- lib/fbtxt/parser/token-time.rb
-- lib/fbtxt/parser/token.rb
 - lib/fbtxt/parser/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:

data/lib/fbtxt/parser/debuggable.rb

@@ -1,53 +0,0 @@
-###
-## debugg(able) mix-in helper
-##      used for lexer & parser
-
-module Debuggable
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def debug=(value)
-        raise ArgumentError, "true|false required for debug flag; got #{value}"  unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
-        @debug=value;
-    end
-    def debug()  @debug || false; end    ## note - default to false
-
-    def debug?() @debug == true; end
-  end
-
-
-  ########
-  ##  InstanceMethods
-  def debug?() self.class.debug?; end
-
-  ##
-  ## todo/check - allow/support multiple msg args - why? why not?
-
-  ##  note - use trace for debug for now - why? why not?
-  def _trace( *args )  __log__( :DEBUG, *args ); end
-
-  def _info( *args )   __log__( :INFO, *args );  end
-  def _warn( *args)    __log__( :WARN, *args ); end
-  def _error( *args )  __log__( :ERROR, *args ); end
-
-
-
-private
-  def __log__( level, *args )   ## :DEBUG, :INFO, :WARN, :ERROR, :FATAL etc.
-
-    if level == :DEBUG && !debug?
-        ## print nothing
-    else
-      msg = args.map do |arg|
-                arg.to_str
-               end.join(' | ')
-
-      fout =  level == :WARN || level == :ERROR || level == :FATAL ? STDERR : STDOUT
-
-      ## todo/check/fix - add/use/check for "local" logger
-      fout.puts "#{level} [#{self.class.name}] -- #{msg}"
-    end
-  end
-end  # module Debuggable

data/lib/fbtxt/parser/lexer-logger.rb

@@ -1,20 +0,0 @@
-
-module Fbtxt
-class Lexer
-
-
-def log( msg )
-   ## append msg to ./logs.txt
-   ##     use ./errors.txt - why? why not?
-   ##
-   ##  change to ./logs_lexer.txt or such - why? why not?
-   ##    auto-add/prepend  [Lexer] and timestamp!!!  to msg - why? why not?
-   File.open( './logs.txt', 'a:utf-8' ) do |f|
-     f.write( "[Lexer] " + msg )
-     f.write( "\n" )
-   end
-end
-
-
-end   # class Lexer
-end   # module Fbtxt

data/lib/fbtxt/parser/lexer-on_goal.rb

@@ -1,167 +0,0 @@
-module Fbtxt
-class Lexer
-
-
-
-
-GOAL_RE = Regexp.union(
-    SPACES_RE,
-    GOAL_MINUTE_RE,
-    GOAL_MINUTE_NA_RE,
-    GOAL_COUNT_RE,
-    PROP_NAME_RE,    ## note - (re)use prop name for now for (player) name
-    GOAL_SEP_ALT_RE,   ##  note - add dash (-) with (required) spaces
-    /  (?<sym> [;,)])  /x
-    ## todo/fix - add ANY_RE !!!!
-)
-
-
-def _on_goal( m, ctx: )
-
-         if m[:space] || m[:spaces]
-              nil    ## skip space(s)
-         elsif m[:goal_sep_alt]
-             # was: [:GOAL_SEP_ALT, "<|GOAL_SEP_ALT|>" ]   ## e.g. dash (-) WITH leading & trailing space required
-             Token.new( :GOAL_SEP_ALT, m[:goal_sep_alt],
-                              lineno: ctx.lineno, offset: m.offset(:goal_sep_alt))
-         elsif m[:prop_name]    ## note - change prop_name to player
-             Token.new( :PLAYER, m[:name],
-                              lineno: ctx.lineno, offset: m.offset(:name))
-         elsif m[:goal_minute]
-             Token.new( :GOAL_MINUTE, m[:goal_minute],
-                              lineno: ctx.lineno, offset: m.offset(:goal_minute),
-                              value: _build_goal_minute( m ))
-         elsif m[:goal_minute_na]
-              ## note -  (re)use GOAL_MINUTE token; no extra GOAL_MINUTE_NA or such - why? why not?
-              ##          make sure to handle 'm' => nil upstream!!!
-              ##                     change to  999 or -1 or such - why? why not?
-             Token.new( :GOAL_MINUTE, m[:goal_minute_na],
-                               lineno: ctx.lineno, offset: m.offset(:goal_minute_na),
-                                value: _build_goal_minute_na( m ))
-         elsif m[:goal_count]
-              Token.new( :GOAL_COUNT, m[:goal_count],
-                                lineno: ctx.lineno, offset: m.offset(:goal_count),
-                                value: _build_goal_count( m ))
-         elsif m[:sym]
-            case m[:sym]
-            when ')'  ## leave goal mode!!
-                _trace( "LEAVE GOAL_RE MODE" )
-                @re = RE
-                ##  note - use/return GOAL_END token   - change to GOAL_END_PAREN(THESIS)
-                ##                                or GOAL_PAREN_CLOSE/END ???
-                ##   fix - use ) too - why? why not?
-                ## was: [:GOALS_END, '<|GOALS_END|>']
-                Token.virtual( :GOALS_END, lineno: ctx.lineno  )
-            else
-                Token.literal( m[:sym], lineno: ctx.lineno, offset: m.offset(:sym))
-            end
-         else
-            ctx.warn_on_else( m, mode: 'GOAL' )
-            nil
-         end
-end
-
-
-
-
-GOAL_ALT_RE = Regexp.union(
-    SPACES_RE,
-    SCORE_RE,        ## e.g.  1-0, 0-1, etc.
-    GOAL_MINUTE_RE,
-    GOAL_TYPE_RE,
-    PROP_NAME_RE,    ## note - (re)use prop name for now for (player) name
-    /  (?<sym> [,)])  /x    ## note - no semicolon (;)
-    ## todo/fix - add ANY_RE !!!!
-)
-
-def _on_goal_alt( m, ctx: )
-
-         if m[:space] || m[:spaces]
-              nil    ## skip space(s)
-         elsif m[:prop_name]    ## note - change prop_name to player
-             Token.new(:PLAYER, m[:name],
-                           lineno: ctx.lineno, offset: m.offset(:name))
-         elsif m[:goal_minute]
-             Token.new( :GOAL_MINUTE, m[:goal_minute],
-                              lineno: ctx.lineno, offset: m.offset(:goal_minute),
-                              value: _build_goal_minute( m ))
-         elsif m[:goal_type]
-             Token.new( :GOAL_TYPE,m[:goal_type],
-                              lineno: ctx.lineno, offset: m.offset(:goal_type),
-                              value: _build_goal_type( m ))
-         elsif m[:score]
-             Token.new( :SCORE, m[:score],
-                              lineno: ctx.lineno, offset: m.offset(:score),
-                              value: _build_score( m ))
-         elsif m[:sym]
-            case m[:sym]
-            when ')'  ## leave goal mode!!
-                _trace( "LEAVE GOAL_ALT_RE MODE" )
-                @re = RE
-                ##  note - use/return GOAL_END token   - change to GOAL_END_PAREN(THESIS)
-                ##                                or GOAL_PAREN_CLOSE/END ???
-                ## [:GOALS_END, '<|GOALS_END|>']
-                Token.virtual( :GOALS_END, lineno: ctx.lineno  )
-            else
-                Token.literal( m[:sym], lineno: ctx.lineno, offset: m.offset(:sym))
-            end
-         else
-            ctx.warn_on_else( m, mode: 'GOAL_ALT' )
-            nil
-         end
-end
-
-
-
-GOAL_COMPAT_RE = Regexp.union(
-    SPACES_RE,
-    SCORE_RE,        ## e.g.  1-0, 0-1, etc.
-    MINUTE_RE,          ## note - matches minute e.g.  92, 7, 7' 7+3, etc.
-    GOAL_TYPE_RE,
-    PROP_NAME_RE,    ## note - (re)use prop name for now for (player) name
-    /  (?<sym> [,)])  /x    ## note - no semicolon (;)
-    ## todo/fix - add ANY_RE !!!!
-)
-
-
-def _on_goal_compat( m, ctx: )      ## note - m is MatchData object
-
-         if m[:space] || m[:spaces]
-              nil    ## skip space(s)
-         elsif m[:prop_name]    ## note - change prop_name to player
-             Token.new(:PLAYER, m[:name],
-                           lineno: ctx.lineno, offset: m.offset(:name))
-         elsif m[:minute]
-             Token.new(:MINUTE, m[:minute],
-                           lineno: ctx.lineno, offset: m.offset(:minute),
-                           value: _build_minute( m ))
-         elsif m[:goal_type]
-             Token.new( :GOAL_TYPE,m[:goal_type],
-                              lineno: ctx.lineno, offset: m.offset(:goal_type),
-                              value: _build_goal_type( m ))
-
-         elsif m[:score]
-             Token.new( :SCORE, m[:score],
-                              lineno: ctx.lineno, offset: m.offset(:score),
-                              value: _build_score( m ))
-         elsif m[:sym]
-            case m[:sym]
-            when ')'  ## leave goal mode!!
-                _trace( "LEAVE GOAL_COMPAT_RE MODE" )
-                @re = RE
-                ##  note - use/return GOAL_END token   - change to GOAL_END_PAREN(THESIS)
-                ##                                or GOAL_PAREN_CLOSE/END ???
-                ## [:GOALS_END, '<|GOALS_END|>']
-                Token.virtual( :GOALS_END, lineno: ctx.lineno  )
-            else
-                Token.literal( m[:sym], lineno: ctx.lineno, offset: m.offset(:sym))
-            end
-         else
-            ctx.warn_on_else( m, mode: 'GOAL_COMPAT' )
-            nil
-         end
-end
-
-
-end ## class Lexer
-end ## module Fbtxt

data/lib/fbtxt/parser/lexer-on_group_def.rb

@@ -1,31 +0,0 @@
-module Fbtxt
-class Lexer
-
-
-
-### note - add comma (,) as optional separator
-GROUP_DEF_RE = Regexp.union(  SPACES_RE,
-                              TEXT_RE,
-                              / (?<sym> [:|,] )  /x,
-                              ANY_RE,
-                           )
-
-
-def _on_group_def( m, ctx: )      ## note - m is MatchData object
-
-           if m[:spaces] || m[:space]
-               nil    ## skip spaces
-           elsif m[:text]
-               Token.new(:TEAM,  m[:text],
-                 lineno: ctx.lineno, offset: m.offset(:text))
-           elsif m[:sym]
-                Token.literal( m[:sym], lineno: ctx.lineno, offset: m.offset(:sym))
-           else
-              ctx.warn_on_else( m, mode: 'GROUP_DEF' )
-              nil
-           end
-end
-
-
-end ## class Lexer
-end ## module Fbtxt

data/lib/fbtxt/parser/lexer-on_prop_lineup.rb

@@ -1,79 +0,0 @@
-module Fbtxt
-class Lexer
-
-
-
-PROP_LINEUP_RE = Regexp.union(
-   SPACES_RE,
-   MINUTE_RE,   ## e.g.  44 or 44' or 45+1 or 45+1' etc.
-
-   INLINE_CAPTAIN,  ## e.g. [c]
-   INLINE_YELLOW,   ## e.g. [Y] or [Y 44] or [Y 44'] or [Y 45+1']
-   INLINE_YELLOW_RED,  ## e.g. [Y/R] or [Y/R 78]
-   INLINE_RED,         ## e.g. [R] or [R 42] or [R 42']
-
-   PROP_KEY_INLINE_RE,
-   PROP_NAME_RE,
-   /  (?<sym>  [;,()\[\]-]) /x
-   ## todo/fix - add ANY_RE here too!!!
-)
-
-
-def _on_prop_lineup( m, ctx: )      ## note - m is MatchData object
-
-         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 )
-                ## use PROP_COACH or COACH_KEY or such - why? why not?
-                Token.new(:COACH, m[:key],
-                             lineno: ctx.lineno, offset: m.offset(:key))
-              else
-                ## report error - for unknown (inline) prop key in lineup
-                nil
-              end
-         elsif m[:inline_captain]
-              Token.new(:INLINE_CAPTAIN, m[:inline_captain],
-                            lineno: ctx.lineno, offset: m.offset(:inline_captain))
-         elsif m[:inline_yellow]
-              card = {}
-              card[:m]      = m[:minute].to_i(10)  if m[:minute]
-              card[:offset] = m[:offset].to_i(10)  if m[:offset]
-              Token.new(:INLINE_YELLOW, m[:inline_yellow],
-                               lineno: ctx.lineno, offset: m.offset(:inline_yellow),
-                                value: card)
-         elsif m[:inline_red]
-              card = {}
-              card[:m]      = m[:minute].to_i(10)  if m[:minute]
-              card[:offset] = m[:offset].to_i(10)  if m[:offset]
-              Token.new(:INLINE_RED, m[:inline_red],
-                              lineno: ctx.lineno, offset: m.offset(:inline_red),
-                              value: card)
-         elsif m[:inline_yellow_red]
-              card = {}
-              card[:m]      = m[:minute].to_i(10)  if m[:minute]
-              card[:offset] = m[:offset].to_i(10)  if m[:offset]
-              Token.new(:INLINE_YELLOW_RED, m[:inline_yellow_red],
-                               lineno: ctx.lineno, offset: m.offset(:inline_yellow_red),
-                               value: card)
-         elsif m[:prop_name]
-              Token.new(:PROP_NAME, m[:name],
-                               lineno: ctx.lineno, offset: m.offset(:prop_name))
-         elsif m[:minute]
-              Token.new(:MINUTE, m[:minute],
-                           lineno: ctx.lineno, offset: m.offset(:minute),
-                           value: _build_minute( m ))
-         elsif m[:sym]
-              Token.literal( m[:sym], lineno: ctx.lineno, offset: m.offset(:sym))
-         else
-             ctx.warn_on_else( m, mode: 'PROP_LINEUP' )
-             nil
-         end
-end
-
-
-end ## class Lexer
-end ## module Fbtxt