sxp 0.0.7 → 0.0.8

data/README

@@ -19,7 +19,7 @@ Examples
 
     require 'sxp'
 
-### Parsing S-expressions using universal syntax
+### Parsing basic S-expressions
 
     SXP.read "(* 6 7)"  #=> [:*, 6, 7]
 
@@ -35,15 +35,15 @@ Examples
                 1,
                 [:*, :n, [:fact, [:-, :n, 1]]]]]
 
-### Parsing S-expressions using Scheme syntax
+### Parsing Scheme S-expressions
 
     SXP::Reader::Scheme.read %q((and #t #f))             #=> [:and, true, false]
 
-### Parsing S-expressions using Common Lisp syntax
+### Parsing Common Lisp S-expressions
 
     SXP::Reader::CommonLisp.read %q((or t nil))          #=> [:or, true, nil]
 
-### Parsing S-expressions using SPARQL syntax
+### Parsing SPARQL S-expressions
 
     SXP::Reader::SPARQL.read %q((base <http://ar.to/>))  #=> [:base, RDF::URI('http://ar.to/')]
 

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/sxp.rb

@@ -85,4 +85,4 @@ module SXP
     alias_method :parse_uri,   :read_url # @deprecated
     alias_method :read_uri,    :read_url # @deprecated
   end
-end # module SXP
+end # SXP

data/lib/sxp/generator.rb

@@ -86,5 +86,5 @@ module SXP
     def decrease_indent!
       @indent -= 1
     end
-  end # class Generator
-end # module SXP
+  end # Generator
+end # SXP

data/lib/sxp/list.rb

@@ -498,5 +498,5 @@ module SXP
     def values_at(*selector)
       self.class.new(to_a.values_at(*selector))
     end
-  end # class List
-end # module SXP
+  end # List
+end # SXP

data/lib/sxp/pair.rb

@@ -60,5 +60,5 @@ module SXP
           "(#{head.inspect} . #{tail.inspect})"
       end
     end
-  end # class Pair
-end # module SXP
+  end # Pair
+end # SXP

data/lib/sxp/reader.rb

@@ -258,5 +258,5 @@ module SXP
     def eof?
       @input.eof?
     end
-  end # class Reader
-end # module SXP
+  end # Reader
+end # SXP

data/lib/sxp/reader/basic.rb

@@ -2,12 +2,12 @@ module SXP; class Reader
   ##
   # A basic S-expression parser.
   class Basic < Reader
-    LPARENS  = [?(].freeze
-    RPARENS  = [?)].freeze
-    ATOM     = /^[^\s()]+/.freeze
-    RATIONAL = /^([+-]?\d+)\/(\d+)$/.freeze
-    DECIMAL  = /^[+-]?(\d*)?\.\d*$/.freeze
-    INTEGER  = /^[+-]?\d+$/.freeze
+    LPARENS  = [?(]
+    RPARENS  = [?)]
+    ATOM     = /^[^\s()]+/
+    RATIONAL = /^([+-]?\d+)\/(\d+)$/
+    DECIMAL  = /^[+-]?(\d*)?\.\d*$/
+    INTEGER  = /^[+-]?\d+$/
 
     ##
     # @return [Object]
@@ -72,5 +72,5 @@ module SXP; class Reader
       buffer << read_char while !eof? && peek_char.chr =~ grammar
       buffer
     end
-  end # class Basic
-end; end # class SXP::Reader
+  end # Basic
+end; end # SXP::Reader

data/lib/sxp/reader/common_lisp.rb

@@ -123,5 +123,5 @@ module SXP; class Reader
         end
       end
     end
-  end # class CommonLisp
-end; end # class SXP::Reader
+  end # CommonLisp
+end; end # SXP::Reader

data/lib/sxp/reader/extended.rb

@@ -2,9 +2,9 @@ module SXP; class Reader
   ##
   # An extended S-expression parser.
   class Extended < Basic
-    LPARENS  = [?(, ?[].freeze
-    RPARENS  = [?), ?]].freeze
-    ATOM     = /^[^\s()\[\]]+/.freeze
+    LPARENS  = [?(, ?[]
+    RPARENS  = [?), ?]]
+    ATOM     = /^[^\s()\[\]]+/
 
     ##
     # @return [Object]
@@ -26,5 +26,5 @@ module SXP; class Reader
         end
       end
     end
-  end # class Extended
-end; end # class SXP::Reader
+  end # Extended
+end; end # SXP::Reader

data/lib/sxp/reader/scheme.rb

@@ -4,12 +4,12 @@ module SXP; class Reader
   #
   # @see http://people.csail.mit.edu/jaffer/r4rs_9.html#SEC65
   class Scheme < Extended
-    DECIMAL         = /^[+-]?(\d*)?\.\d*$/.freeze
-    INTEGER_BASE_2  = /^[+-]?[01]+$/.freeze
-    INTEGER_BASE_8  = /^[+-]?[0-7]+$/.freeze
-    INTEGER_BASE_10 = /^[+-]?\d+$/.freeze
-    INTEGER_BASE_16 = /^[+-]?[\da-z]+$/i.freeze
-    RATIONAL        = /^([+-]?\d+)\/(\d+)$/.freeze
+    DECIMAL         = /^[+-]?(\d*)?\.\d*$/
+    INTEGER_BASE_2  = /^[+-]?[01]+$/
+    INTEGER_BASE_8  = /^[+-]?[0-7]+$/
+    INTEGER_BASE_10 = /^[+-]?\d+$/
+    INTEGER_BASE_16 = /^[+-]?[\da-z]+$/i
+    RATIONAL        = /^([+-]?\d+)\/(\d+)$/
 
     ##
     # Initializes the reader.
@@ -60,5 +60,5 @@ module SXP; class Reader
         else raise Error, "invalid sharp-sign read syntax: ##{char.chr}"
       end
     end
-  end # class Scheme
-end; end # class SXP::Reader
+  end # Scheme
+end; end # SXP::Reader

data/lib/sxp/reader/sparql.rb

@@ -8,10 +8,12 @@ module SXP; class Reader
   #
   # @see http://openjena.org/wiki/SSE
   class SPARQL < Extended
-    BNODE_ID  = /^_:([A-Za-z][A-Za-z0-9]*)/.freeze # FIXME
-    BNODE_NEW = /^_:$/.freeze
-    VARIABLE  = /^\?([A-Za-z][A-Za-z0-9]*)/.freeze # FIXME
-    URIREF    = /^<([^>]+)>/.freeze
+    BNODE_ID  = /^_:([A-Za-z][A-Za-z0-9]*)/ # FIXME
+    BNODE_NEW = /^_:$/
+    VAR_ID    = /^\?([A-Za-z][A-Za-z0-9]*)/ # FIXME
+    VAR_GEN   = /^\?\?([0-9]+)/
+    VAR_NEW   = '??'
+    URIREF    = /^<([^>]+)>/
 
     ##
     # @return [Object]
@@ -44,7 +46,7 @@ module SXP; class Reader
     def read_rdf_uri
       buffer = String.new
       skip_char # '<'
-      return :< if (char = peek_char).nil? || char !~ ATOM # FIXME: nasty special case for '< symbol
+      return :< if (char = peek_char).nil? || char.chr !~ ATOM # FIXME: nasty special case for '< symbol
       until peek_char == ?>
         buffer << read_char # TODO: unescaping
       end
@@ -61,7 +63,9 @@ module SXP; class Reader
         when INTEGER   then RDF::Literal(Integer(buffer))
         when BNODE_ID  then RDF::Node($1)
         when BNODE_NEW then RDF::Node.new
-        when VARIABLE  then RDF::Query::Variable.new($1)
+        when VAR_ID    then RDF::Query::Variable.new($1)
+        when VAR_GEN   then RDF::Query::Variable.new("?#{$1}") # FIXME?
+        when VAR_NEW   then RDF::Query::Variable.new
         else buffer.to_sym
       end
     end
@@ -78,5 +82,5 @@ module SXP; class Reader
         end
       end
     end
-  end # class SPARQL
-end; end # class SXP::Reader
+  end # SPARQL
+end; end # SXP::Reader

data/lib/sxp/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Arto Bendiken