parslet 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94602845df56ad6245d6fe225d5e2e7e79b0e004
-  data.tar.gz: 73a1e12177b7bcd0a6997ac82bc8801694094203
+  metadata.gz: bf32b3cc2b921b4719c37f9db7e0e1449e55cfc2
+  data.tar.gz: 18c1fa21fa37be7feb7c82d835e959e6c892edee
 SHA512:
-  metadata.gz: 55d3142ff71dc7466f10a1c13c99ba0dd25cf400cdea2d260370da4e63d50e5911a658b65bf2e1e88f354c46ff212fd4cc7e1bb4ebebfcfd7916681bb28954d4
-  data.tar.gz: 9eaace33f733d00247396c6697db87d946f6ac51a8f6646ee72e08e9b07fa6bcda3a9c3933188fafb11ffc296ff4ad0805bb683b527ec12bd511a6553914190c
+  metadata.gz: c3f7130bc7fead70924701060a12c884bc1eb350336aa1d2808853fa602b86e9163e6051bdb458def9e16062f894cb4cb1575a3b87b6005a3d2978574076233d
+  data.tar.gz: 0a69e33741168a4048514856b3c60756d92162f21a21f91c1bc8fed688857682fc5ef34281b575021f0f5417629ee175a8f121def608c1c68422f29a87d8fe31

data/HISTORY.txt

@@ -4,6 +4,11 @@
   - prsnt? and absnt? are now finally banned into oblivion. Wasting vocals for
     the win. 
     
+= 1.8.2 / 13Feb2018
+
+  ! Improvements to performance in cases where atoms are dynamically generated
+    (Kevin Olbrich).
+    
 = 1.8.1 / 19Nov2017
 
   - Minor fixes for language compatibility. 

data/LICENSE

@@ -1,4 +1,4 @@
- Copyright (c) 2010-2017 Kaspar Schiess
+ Copyright (c) 2010-2018 Kaspar Schiess
 
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

data/lib/parslet/atoms.rb

@@ -3,18 +3,17 @@
 #
 module Parslet::Atoms
   # The precedence module controls parenthesis during the #inspect printing
-  # of parslets. It is not relevant to other aspects of the parsing. 
+  # of parslets. It is not relevant to other aspects of the parsing.
   #
   module Precedence
-    prec = 0
-    BASE       = (prec+=1)    # everything else
-    LOOKAHEAD  = (prec+=1)    # &SOMETHING
-    REPETITION = (prec+=1)    # 'a'+, 'a'?
-    SEQUENCE   = (prec+=1)    # 'a' 'b'
-    ALTERNATE  = (prec+=1)    # 'a' | 'b'
-    OUTER      = (prec+=1)    # printing is done here.
+    BASE       = 1    # everything else
+    LOOKAHEAD  = 2    # &SOMETHING
+    REPETITION = 3    # 'a'+, 'a'?
+    SEQUENCE   = 4    # 'a' 'b'
+    ALTERNATE  = 5    # 'a' | 'b'
+    OUTER      = 6    # printing is done here.
   end
-  
+
   require 'parslet/atoms/can_flatten'
   require 'parslet/atoms/context'
   require 'parslet/atoms/dsl'
@@ -33,4 +32,3 @@ module Parslet::Atoms
   require 'parslet/atoms/scope'
   require 'parslet/atoms/infix'
 end
-

data/lib/parslet/atoms/alternative.rb

@@ -19,7 +19,6 @@ class Parslet::Atoms::Alternative < Parslet::Atoms::Base
     super()
     
     @alternatives = alternatives
-    @error_msg = "Expected one of #{alternatives.inspect}"
   end
 
   #---
@@ -29,7 +28,11 @@ class Parslet::Atoms::Alternative < Parslet::Atoms::Base
   def |(parslet)
     self.class.new(*@alternatives + [parslet])
   end
-  
+
+  def error_msg
+    @error_msg ||= "Expected one of #{alternatives.inspect}"
+  end
+
   def try(source, context, consume_all)
     errors = alternatives.map { |a|
       success, value = result = a.apply(source, context, consume_all)
@@ -40,7 +43,7 @@ class Parslet::Atoms::Alternative < Parslet::Atoms::Base
     }
     
     # If we reach this point, all alternatives have failed. 
-    context.err(self, source, @error_msg, errors)
+    context.err(self, source, error_msg, errors)
   end
 
   precedence ALTERNATE

data/lib/parslet/atoms/lookahead.rb

@@ -14,9 +14,11 @@ class Parslet::Atoms::Lookahead < Parslet::Atoms::Base
     # Model positive and negative lookahead by testing this flag.
     @positive = positive
     @bound_parslet = bound_parslet
-    
-    @error_msgs = {
-      :positive => ["Input should start with ", bound_parslet], 
+  end
+
+  def error_msgs
+    @error_msgs ||= {
+      :positive => ["Input should start with ", bound_parslet],
       :negative => ["Input should not start with ", bound_parslet]
     }
   end
@@ -29,10 +31,10 @@ class Parslet::Atoms::Lookahead < Parslet::Atoms::Base
     
     if positive
       return succ(nil) if success
-      return context.err_at(self, source, @error_msgs[:positive], error_pos)
+      return context.err_at(self, source, error_msgs[:positive], error_pos)
     else
       return succ(nil) unless success
-      return context.err_at(self, source, @error_msgs[:negative], error_pos)
+      return context.err_at(self, source, error_msgs[:negative], error_pos)
     end
     
   # This is probably the only parslet that rewinds its input in #try.
@@ -43,8 +45,8 @@ class Parslet::Atoms::Lookahead < Parslet::Atoms::Base
   
   precedence LOOKAHEAD
   def to_s_inner(prec)
-    char = positive ? '&' : '!'
-    
-    "#{char}#{bound_parslet.to_s(prec)}"
+    @char = positive ? '&' : '!'
+
+    "#{@char}#{bound_parslet.to_s(prec)}"
   end
 end

data/lib/parslet/atoms/re.rb

@@ -14,9 +14,12 @@ class Parslet::Atoms::Re < Parslet::Atoms::Base
 
     @match = match.to_s
     @re    = Regexp.new(self.match, Regexp::MULTILINE)
-    @error_msgs = {
-      :premature  => "Premature end of input", 
-      :failed     => "Failed to match #{match.inspect[1..-2]}"
+  end
+
+  def error_msgs
+    @error_msgs ||= {
+      premature: 'Premature end of input',
+      failed: "Failed to match #{match.inspect[1..-2]}"
     }
   end
 
@@ -24,11 +27,11 @@ class Parslet::Atoms::Re < Parslet::Atoms::Base
     return succ(source.consume(1)) if source.matches?(@re)
     
     # No string could be read
-    return context.err(self, source, @error_msgs[:premature]) \
+    return context.err(self, source, error_msgs[:premature]) \
       if source.chars_left < 1
         
     # No match
-    return context.err(self, source, @error_msgs[:failed])
+    return context.err(self, source, error_msgs[:failed])
   end
 
   def to_s_inner(prec)

data/lib/parslet/atoms/repetition.rb

@@ -17,11 +17,15 @@ class Parslet::Atoms::Repetition < Parslet::Atoms::Base
 
 
     @parslet = parslet
-    @min, @max = min, max
+    @min = min
+    @max = max
     @tag = tag
-    @error_msgs = {
-      :minrep  => "Expected at least #{min} of #{parslet.inspect}", 
-      :unconsumed => "Extra input after last repetition"
+  end
+
+  def error_msgs
+    @error_msgs ||= {
+      minrep: "Expected at least #{min} of #{parslet.inspect}",
+      unconsumed: 'Extra input after last repetition'
     }
   end
   
@@ -51,7 +55,7 @@ class Parslet::Atoms::Repetition < Parslet::Atoms::Base
     return context.err_at(
       self, 
       source, 
-      @error_msgs[:minrep], 
+      error_msgs[:minrep],
       start_pos, 
       [break_on]) if occ < min
       
@@ -66,7 +70,7 @@ class Parslet::Atoms::Repetition < Parslet::Atoms::Base
     return context.err(
       self, 
       source, 
-      @error_msgs[:unconsumed], 
+      error_msgs[:unconsumed], 
       [break_on]) if consume_all && source.chars_left>0
       
     return succ(accum)

data/lib/parslet/atoms/sequence.rb

@@ -10,8 +10,11 @@ class Parslet::Atoms::Sequence < Parslet::Atoms::Base
     super()
 
     @parslets = parslets
-    @error_msgs = {
-      :failed  => "Failed to match sequence (#{self.inspect})"
+  end
+
+  def error_msgs
+    @error_msgs ||= {
+      failed: "Failed to match sequence (#{inspect})"
     }
   end
   
@@ -29,7 +32,7 @@ class Parslet::Atoms::Sequence < Parslet::Atoms::Base
       success, value = p.apply(source, context, child_consume_all) 
 
       unless success
-        return context.err(self, source, @error_msgs[:failed], [value]) 
+        return context.err(self, source, error_msgs[:failed], [value])
       end
 
       result[idx+1] = value

data/lib/parslet/atoms/str.rb

@@ -12,9 +12,12 @@ class Parslet::Atoms::Str < Parslet::Atoms::Base
     @str = str.to_s
     @pat = Regexp.new(Regexp.escape(str))
     @len = str.size
-    @error_msgs = {
-      :premature  => "Premature end of input", 
-      :failed     => "Expected #{str.inspect}, but got "
+  end
+
+  def error_msgs
+    @error_msgs ||= {
+      premature: 'Premature end of input',
+      failed: "Expected #{str.inspect}, but got "
     }
   end
   
@@ -22,14 +25,14 @@ class Parslet::Atoms::Str < Parslet::Atoms::Base
     return succ(source.consume(@len)) if source.matches?(@pat)
     
     # Input ending early:
-    return context.err(self, source, @error_msgs[:premature]) \
+    return context.err(self, source, error_msgs[:premature]) \
       if source.chars_left<@len
     
     # Expected something, but got something else instead:  
     error_pos = source.pos  
     return context.err_at(
       self, source, 
-      [@error_msgs[:failed], source.consume(@len)], error_pos) 
+      [error_msgs[:failed], source.consume(@len)], error_pos) 
   end
   
   def to_s_inner(prec)

data/parslet.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'parslet'
-  s.version = '1.8.1'
+  s.version = '1.8.2'
 
   s.authors = ['Kaspar Schiess']
   s.email = 'kaspar.schiess@absurd.li'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parslet
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Kaspar Schiess
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: kaspar.schiess@absurd.li