rubysl-scanf 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed897434fc0fa9f3bfd5140a40a5e22f7d27d16
-  data.tar.gz: 961948512402b24eb0d7bf8f35133ec125bcfeb7
+  metadata.gz: 69abe82c76d0d2fe7294188cfbec985533eda22c
+  data.tar.gz: 9faecde899f413b13324b92d776d5a8260de7afe
 SHA512:
-  metadata.gz: b5d25523fd14c89c3dd7fac10e788868b051ebd8960dec0b927cc829e11e76d7fab0a126bcb7b04b2c89a318777ca9d58c1e712b6f8bb8144dcec7e9407a8e28
-  data.tar.gz: d78c75093ba32f6a69647140b223a8f3426b523051ed1b54ddcf2cf427cd2e98def5fbac2914c4bab5c9660bcf6aeb28616246ea573759662ec334828c040ca6
+  metadata.gz: ee7c4bfe9c6d50663afda1d5d069c8511fb6acf785f39904164374d1444c62821ed4cc6b5f2a4c130471bc1d07773564da8420cebc64ab7a28fba159fc8ef79d
+  data.tar.gz: 5b56ac91953cdf593fef407dd86b6532495b7ce9c8e01c4cbf98b176c1c67fb64642999c54193d9055a4f9f91a9dd393fff05d6f1bd02095a23d42a0f28aa706

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/scanf/scanf.rb

@@ -1,9 +1,9 @@
 # scanf for Ruby
 #
-# $Revision: 21682 $
-# $Id: scanf.rb 21682 2009-01-20 03:23:46Z shyouhei $
-# $Author: shyouhei $
-# $Date: 2009-01-19 19:23:46 -0800 (Mon, 19 Jan 2009) $
+# $Release Version: 1.1.2 $
+# $Revision: 27139 $
+# $Id: scanf.rb 27139 2010-04-01 04:32:22Z naruse $
+# $Author: naruse $
 #
 # A product of the Austin Ruby Codefest (Austin, Texas, August 2002)
 
@@ -63,7 +63,7 @@ to the beginning of the format string, and yields a new array of
 conversions to the block every time the format string is matched
 (including partial matches, but not including complete failures).  The
 actual return value of scanf when called with a block is an array
-containing the results of all the executions of the block. 
+containing the results of all the executions of the block.
 
    str = "123 abc 456 def 789 ghi"
    str.scanf("%d%s") { |num,str| [ num * 2, str.upcase ] }
@@ -100,7 +100,7 @@ and <tt>tests/scanftests.rb</tt> for examples.)
 [u]
   Same as d.
 
-[i] 
+[i]
   Matches an optionally signed integer. The integer is read in base
   16 if it begins with `0x' or `0X', in base 8 if it begins with `0',
   and in base 10 other- wise. Only characters that correspond to the
@@ -112,7 +112,7 @@ and <tt>tests/scanftests.rb</tt> for examples.)
 [x,X]
   Matches an optionally signed hexadecimal integer,
 
-[f,g,e,E]
+[a,e,f,g,A,E,F,G]
   Matches an optionally signed floating-point number.
 
 [s]
@@ -280,7 +280,7 @@ Project contributors:: Nolan Darilek, Jason Johnston
 
 Thanks to Hal Fulton for hosting the Codefest.
 
-Thanks to Matz for suggestions about the class design.  
+Thanks to Matz for suggestions about the class design.
 
 Thanks to Gavin Sinclair for some feedback on the documentation.
 
@@ -309,7 +309,22 @@ module Scanf
 
     def skip;  /^\s*%\*/.match(@spec_string); end
 
-    def extract_float(s); s.to_f if s &&! skip; end
+    def extract_float(s)
+      return nil unless s &&! skip
+      if /\A(?<sign>[-+]?)0[xX](?<frac>\.\h+|\h+(?:\.\h*)?)[pP](?<exp>[-+]\d+)/ =~ s
+        f1, f2 = frac.split('.')
+        f = f1.hex
+        if f2
+          len = f2.length
+          if len > 0
+            f += f2.hex / (16.0 ** len)
+          end
+        end
+        (sign == ?- ? -1 : 1) * Math.ldexp(f, exp.to_i)
+      else
+        s.to_f
+      end
+    end
     def extract_decimal(s); s.to_i if s &&! skip; end
     def extract_hex(s); s.hex if s &&! skip; end
     def extract_octal(s); s.oct if s &&! skip; end
@@ -325,14 +340,14 @@ module Scanf
     end
 
     def count_space?
-      /(?:\A|\S)%\*?\d*c|\[/.match(@spec_string)
+      /(?:\A|\S)%\*?\d*c|%\d*\[/.match(@spec_string)
     end
 
     def initialize(str)
       @spec_string = str
       h = '[A-Fa-f0-9]'
 
-      @re_string, @handler = 
+      @re_string, @handler =
         case @spec_string
 
           # %[[:...:]]
@@ -409,12 +424,13 @@ module Scanf
           [ "([-+][0-7]{1,#{$1.to_i-1}}|[0-7]{1,#{$1}})", :extract_octal ]
 
           # %f
-        when /%\*?f/
-          [ '([-+]?((\d+(?>(?=[^\d.]|$)))|(\d*(\.(\d*([eE][-+]?\d+)?)))))', :extract_float ]
+        when /%\*?[aefgAEFG]/
+          [ '([-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))', :extract_float ]
 
           # %5f
-        when /%\*?(\d+)f/
-          [ "(\\S{1,#{$1}})", :extract_float ]
+        when /%\*?(\d+)[aefgAEFG]/
+          [ '(?=[-+]?(?:0[xX](?:\.\h+|\h+(?:\.\h*)?)[pP][-+]\d+|\d+(?![\d.])|\d*\.\d*(?:[eE][-+]?\d+)?))' +
+            "(\\S{1,#{$1}})", :extract_float ]
 
           # %5s
         when /%\*?(\d+)s/
@@ -466,11 +482,11 @@ module Scanf
     end
 
     def letter
-      /%\*?\d*([a-z\[])/.match(@spec_string).to_a[1]
+      @spec_string[/%\*?\d*([a-z\[])/, 1]
     end
 
     def width
-      w = /%\*?(\d+)/.match(@spec_string).to_a[1]
+      w = @spec_string[/%\*?(\d+)/, 1]
       w && w.to_i
     end
 
@@ -482,7 +498,7 @@ module Scanf
 
       return width_left || cc_no_width
     end
-    
+
   end
 
   class FormatString
@@ -490,7 +506,7 @@ module Scanf
     attr_reader :string_left, :last_spec_tried,
                 :last_match_tried, :matched_count, :space
 
-    SPECIFIERS = 'diuXxofeEgsc'
+    SPECIFIERS = 'diuXxofFeEgGscaA'
     REGEX = /
         # possible space, followed by...
           (?:\s*
@@ -542,7 +558,7 @@ module Scanf
       @matched_count = 0
 
       @specs.each_with_index do |spec,i|
-        @i = i
+        @i=i
         @last_spec_tried = spec
         @last_match_tried = spec.match(@string_left)
         break unless @last_match_tried
@@ -672,10 +688,10 @@ class String
     if b
       block_scanf(fstr,&b)
     else
-      fs = 
+      fs =
         if fstr.is_a? Scanf::FormatString
-          fstr 
-        else 
+          fstr
+        else
           Scanf::FormatString.new(fstr)
         end
       fs.match(self)

data/lib/rubysl/scanf/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Scanf
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-scanf.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-scanf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library scanf.
 email:
 - brixen@gmail.com