fbtxt-parser 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c2c69264e5b2d3d51bf412351b1221e65f35273a78e382e59bfeb460a762628
-  data.tar.gz: e844cd20aa7e00cb5c2840d108bd3597efa065867ac0c2dbd7fbd0b4cfa8a9d1
+  metadata.gz: 9d91912300cd9b915825e9ea868e173c83734639a33a400c602b4ed92e818599
+  data.tar.gz: 8186a48db3890066f1092822fd89d1c965608b0876ddb8e60f6184736deeb894
 SHA512:
-  metadata.gz: 46bc709e594ed668fb62c70bd36e96ad212584fc0d9d961d88a81220a6a0586b5c418cc8310f5f0fcba3906fce15a3d5b10837c8be876d0723496e4b23558495
-  data.tar.gz: a30808c1b3815a9bdc74efc59e38354a42da8d6e265ed6283752df5ae6a6ebee2d56265a78d09554267ce6bf7b40091a6733d19c61ef10c3499a591de0a21df7
+  metadata.gz: 6203a05140096ef31c0722673821571c37ef77fc192588bdc9690e33567a8a5e78b13f5b8166b8cbaa5ca1bc11e65284c5db46c42e2d2a27618a8624ce7b253e
+  data.tar.gz: 3191de551cf71adb298a6395af353496c9c2aabf2a91fa0c1473f177c55ea4ae9e4d2d4e2485dfb4e0186c526c8e1e26ca0740b52a9f5a077df287e90407c627

data/CHANGELOG.md

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

data/Manifest.txt

@@ -3,21 +3,6 @@ Manifest.txt
 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
@@ -25,26 +10,4 @@ lib/fbtxt/parser/parse_tree.rb
 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

data/README.md

@@ -1,22 +1,18 @@
-#  fbtxt-parser - football.txt match parser (& tokenizer)
-
+#  fbtxt-parser - football.txt match parser
 
 ## Usage
 
 
 ``` ruby
-result = Fbtxt.lex( txt )       # returns Fbtxt::LexerResult w/ tokens, errors/ok?/nok?/etc.
-result = Fbtxt.parse( txt )     # returns Fbtxt::ParserResult w/ tree, errors/ok?/nok?/etc.
+result = Fbtxt.parse( txt )   # returns Fbtxt::ParserResult w/ tree, errors/ok?/nok?/etc.
 
 
 #-or-
 
-lexer = Fbtxt::Lexer.new(txt)
-tokens, errors = lexer.tokenize_with_errors
-
 parser = Fbtxt::Parser.new(txt)
 tree, errors = parser.parse_with_errors
 ```
 
 
-note - for porcelain / higher-level apis see ``Fbtxt::Document`.
+note - for porcelain / higher-level apis see `Fbtxt::Document`,
+for low-level lexer see `Fbtxt::Lexer`.

data/Rakefile

@@ -21,7 +21,8 @@ Hoe.spec 'fbtxt-parser' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-       ['cocos', '>= 0.4.1'],
+     ['cocos',       '>= 0.4.2'],         ## note - pulled-in by fbtxt-lexer (too)
+     ['fbtxt-lexer', '>= 0.0.1'],
   ]
 
   self.spec_extras = {

data/lib/fbtxt/parser/parse_tree-match.rb

@@ -292,7 +292,9 @@ Minute      = Struct.new( :m, :offset, :secs )  do
     def to_s
       buf = String.new
       buf << "#{m}"
-      buf << "'"
+      ### note - do NOT autoadd minute quote for now
+      ##    make it an option e.g.  to_s( :quote) or such - why? why not?
+      ### buf << "'"
       buf << "+#{offset}"      if offset
       buf << "/#{secs} secs"   if secs
       buf

data/lib/fbtxt/parser/parse_tree-props.rb

@@ -37,6 +37,30 @@ Referee = Struct.new( :name, :country ) do
 end  # Referee
 
 
+## note - support multiple coaches
+CoachLine = Struct.new( :coaches ) do
+  def pretty_print( q )
+    q.group( 4, '<CoachLine ', '>') do
+      q.pp( coaches )
+    end
+  end
+end   # CoachLine
+
+Coach = Struct.new( :name, :country ) do
+  def to_s
+    buf = String.new
+    buf <<  name
+    buf << " (#{country})"    if country
+    buf
+  end
+
+  def pretty_print( q )
+    q.text( to_s )
+  end
+end  # Coach
+
+
+
 AttendanceLine = Struct.new( :att ) do
   def pretty_print( q )
     q.group( 4, '<AttendanceLine ', '>') do
@@ -54,7 +78,7 @@ PenaltiesLine = Struct.new( :penalties ) do
   end
 
   def pretty_print( q )
-    q.group( 4, '< ', '>') do
+    q.group( 4, '<PenaltiesLine ', '>') do
       q.pp( penalties )
     end
   end
@@ -122,7 +146,7 @@ end  # Booking
 
 ##
 ## change :lineup to :lineups  (e.g. requires array of lineups)
-LineupLine = Struct.new( :team, :lineup, :coach ) do
+LineupLine = Struct.new( :team, :lineup, :formation, :coach ) do
   def as_json(*)
     h = { 'team'    => team.as_json,
           'lineups' => lineup.as_json
@@ -137,14 +161,19 @@ LineupLine = Struct.new( :team, :lineup, :coach ) do
       q.text( team )
       q.text( ' ' )
 
-      ##  todo/fix - check for   "flat" items - no formation
-      ##                           or empty lineup (possible?)
-      ## add formation e.g. (1-) 3-4-2-1
-      formation = lineup.map { |item| item.size }
-      ## note - remove first entry (assume it's 1 for goalee!)
-      formation.shift
-      q.text( formation.join('-'))
-      q.text( ' ')
+      if formation
+        q.text( "(#{formation})" )
+        q.text( ' ')
+      else
+        ##  todo/fix - check for   "flat" items - no formation
+        ##                           or empty lineup (possible?)
+        ## add formation e.g. (1-) 3-4-2-1
+        autoformation = lineup.map { |item| item.size }
+        ## note - remove first entry (assume it's 1 for goalee!)
+        autoformation.shift
+        q.text( autoformation.join('-'))
+        q.text( ' ')
+      end
 
       q.pp( lineup )
 

data/lib/fbtxt/parser/parser-top.rb

@@ -2,15 +2,6 @@
 
 module Fbtxt
 
-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
 
 
 class Parser