sxp 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/sxp/reader.rb

@@ -18,6 +18,7 @@ module SXP
   # @param  [Hash{Symbol => Object}] options
   # @return [Enumerable<Object>]
   def self.read_files(*filenames)
+    options = filenames.last.is_a?(Hash) ? filenames.pop : {}
     filenames.map { |filename| read_file(filename, options) }.inject { |sxps, sxp| sxps + sxp }
   end
 
@@ -73,7 +74,7 @@ module SXP
     INTEGER_BASE_10 = /^[+-]?\d+$/
     INTEGER_BASE_16 = /^[+-]?[\da-z]+$/i
     RATIONAL        = /^([+-]?\d+)\/(\d+)$/
-    ATOM            = /^[^\s()]+/
+    ATOM            = /^[^\s()\[\]]+/
 
     attr_reader :input
 
@@ -95,43 +96,48 @@ module SXP
 
     def read_all(options = {})
       list = []
-      catch (:eof) { list << read(options.merge(:eof => :throw)) until eof? }
+      catch (:eof) do
+        list << read(options.merge(:eof => :throw)) until eof?
+      end
       list
     end
 
     def read(options = {})
+      skip_comments
       token, value = read_token
       case token
         when :eof
           throw :eof if options[:eof] == :throw
           raise EOF, 'unexpected end of input'
         when :list
-          if value == ?(
+          if value == ?( || value == ?[
             read_list
           else
-            throw :eol if options[:eol] == :throw
-            raise Error, 'unexpected list terminator: ?)'
+            throw :eol if options[:eol] == :throw # end of list
+            raise Error, "unexpected list terminator: ?#{value.chr}"
           end
         else value
       end
     end
 
-    alias skip read
+    alias_method :skip, :read
 
     def read_token
-      skip_comments
       case peek_char
-        when nil then :eof
+        when nil    then :eof
         when ?(, ?) then [:list, read_char]
-        when ?# then [:atom, read_sharp]
-        when ?" then [:atom, read_string]
+        when ?[, ?] then [:list, read_char]
+        when ?"     then [:atom, read_string]
+        when ?#     then [:atom, read_sharp]
         else [:atom, read_atom]
       end
     end
 
     def read_list
       list = []
-      catch (:eol) { list << read(:eol => :throw) while true }
+      catch (:eol) do
+        list << read(:eol => :throw) while true
+      end
       list
     end
 
@@ -147,6 +153,7 @@ module SXP
         when ?x then read_integer(16)
         when ?\\ then read_character
         when ?; then skip; read
+        when ?! then skip_line # shebang
         else raise Error, "invalid sharp-sign read syntax: ##{char.chr}"
       end
     end
@@ -161,9 +168,10 @@ module SXP
 
     def read_atom
       case buffer = read_literal
-        when FLOAT then buffer.to_f
+        when '.'             then buffer.to_sym
+        when FLOAT           then buffer.to_f
         when INTEGER_BASE_10 then buffer.to_i
-        when RATIONAL then Rational($1.to_i, $2.to_i)
+        when RATIONAL        then Rational($1.to_i, $2.to_i)
         else buffer.to_sym
       end
     end
@@ -204,7 +212,7 @@ module SXP
     def skip_comments
       until eof?
         case (char = peek_char).chr
-          when /;/ then loop { break if eof? || read_char.chr == $/ }
+          when /;/   then skip_line
           when /\s+/ then skip_char
           else break
         end
@@ -223,7 +231,13 @@ module SXP
       char
     end
 
-    alias skip_char read_char
+    def skip_line
+      loop do
+        break if eof? || read_char.chr == $/
+      end
+    end
+
+    alias_method :skip_char, :read_char
 
     def peek_char
       char = @input.getc

data/lib/sxp/version.rb

@@ -2,7 +2,7 @@ module SXP
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +02:00
+date: 2010-05-14 00:00:00 +02:00
 default_executable: sxp2rdf
 dependencies: 
 - !ruby/object:Gem::Dependency