sexp 0.1 → 0.2

data/sexp.rb

@@ -1,105 +1,5 @@
-#!/usr/bin/ruby
-
-require 'rubygems'
-require_gem 'multi'
-require 'smulti'
-
-module SExpressionParser
-  class Base
-    def initialize(text, *start)
-      @list = start
-      parse(text)
-    end
-    
-    def add(item)
-      @list.push(item)
-    end
-
-    def leave(text)
-      @unwanted = text
-    end
-
-    def unwanted
-      return @unwanted
-    end
-    
-    def add_parse(item, rest)
-      add(item)
-      return parse(rest)
-    end
-
-    def add_leave(item, rest)
-      add(item)
-      leave(rest)
-    end
-  end
-
-  SymbolRE     = /[\w\-\+\/\*\?\!]/
-  SymbolREMany = /[\w\-\+\/\*\?\!]*/
-  NumberRE     = /[\d\.]/
-  NumberREMany = /[\d\.]*/
-
-  class Main
-    def initialize(text)
-      smulti(:parse, /\s/)     {|c, rest| parse(rest)                }
-      smulti(:parse, /\(/)     {|c, rest| @res = List.new(rest)      }
-      smulti(:parse, /\"/)     {|c, rest| @res = String.new(rest)    }
-      smulti(:parse, NumberRE) {|c, rest| @res = Number.new(rest, c) }
-      smulti(:parse, SymbolRE) {|c, rest| @res = Symbol.new(rest, c) }
-      parse(text)
-    end
-
-    def unwanted; return @res.unwanted(); end
-    def value;    return @res.value()   ; end
-  end
-  
-  class List < Base
-    def initialize(*args)
-      smulti(:parse, /\)/  ) {|s, rest| leave(rest) }
-      smulti(:parse, /\s+/ ) {|s, rest| parse(rest) }
-      smulti(:parse, //    ) {|s, rest|
-        item = Main.new(rest)
-        add(item.value)
-        parse(item.unwanted)
-      }
-      super(*args)
-    end
-
-    def value; @list; end
-  end
-  
-  class String < Base
-    def initialize(*args)
-      smulti(:parse, '\"')   {|s, rest| add_parse(s, rest) }
-      smulti(:parse, '"' )   {|s, rest| leave(rest)        }
-      smulti(:parse, /./ )   {|s, rest| add_parse(s, rest) }
-      smulti(:parse, //  )   { throw "Couldn't parse string" }
-      super(*args)
-    end
-
-    def value; @list.join(''); end
-  end
-  
-  class Symbol < Base
-    def initialize(*args)
-      smulti(:parse, SymbolREMany) {|s, rest| add_leave(s, rest) }
-      super(*args)
-    end
-
-    def value; @list.join('').to_sym; end
-  end
-  
-  class Number < Base
-    def initialize(*args)
-      smulti(:parse, NumberREMany) {|s, rest| add_leave(s, rest) }
-      super(*args)
-    end
-
-    def value; @list.join('').to_f; end
-  end
-end
-
-class Object; def to_sexp; inspect(); end; end
-class Symbol; def to_sexp; id2name(); end; end
-class Array;  def to_sexp; "(#{map{|x| x.to_sexp }.join(' ')})"; end; end
-class String; def parse_sexp; SExpressionParser::Main.new(self).value ; end; end
+# This library used to supply 'sexp', but ParseTree also
+# supplies a file named sexp.rb and comes earlier in the
+# load order. I've switched this lib to the more verbose
+# 'sexpressions', but this file is for compatibility.
+require 'sexpressions'

data/sexpressions.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'rparsec'
+
+module SExpressionParser
+  extend RParsec::Parsers
+
+  def self.stringer(opener, closer=nil, translate={})
+    closer = opener if closer.nil?
+    escape = (string('\\') >> any).map do |charnum|
+      escaped = charnum.chr
+      translate[escaped] || escaped
+    end
+    open   = string(opener)
+    close  = string(closer)
+    other  = not_string(closer).map{|charnum| charnum.chr }
+    string = (open >> (escape|other).many << close).map {|strings| strings.to_s }
+  end
+
+  Integer = integer.map{|x| x.to_i }
+  Float = number.map{|x| x.to_f }
+  Number = longest(Integer, Float)
+  Special = Regexp.escape('+-*/=<>?!@#$%^&:~')
+  Symbol = regexp(/[\w#{Special}]*[A-Za-z#{Special}][\w#{Special}]*/).map{|s| s.to_sym }
+  String = stringer(%q{"}, %q{"}, "n" => "\n", "t" => "\t")
+  List = char('(') >> lazy{Values} << char(')')
+  Quoted = char("'") >> lazy{Value}.map{|value| [:quote, value] }
+  Value = alt(Quoted, List, String, Symbol, Number)
+  Values = Value.separated(whitespaces)
+  Parser = Values << eof
+
+  def self.parse(text)
+    Parser.parse(text)
+  end
+end
+
+class Object; def to_sexp; inspect(); end; end
+class Symbol; def to_sexp; id2name(); end; end
+class Array;  def to_sexp; "(#{map{|x| x.to_sexp }.join(' ')})"; end; end
+class String; def parse_sexp; SExpressionParser.parse(self) ; end; end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: sexp
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2006-02-05 00:00:00 -08:00
+  version: "0.2"
+date: 2008-06-20 00:00:00 -04:00
 summary: SExpression Reading/Writing for Ruby
 require_paths: 
 - .
 email: christophercyll@gmail.com
-homepage: http://cyll.org/sexp
+homepage: http://rubyforge.org/projects/sexp/
 rubyforge_project: sexp
 description: 
-autorequire: sexp
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: false
@@ -25,10 +25,12 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Topher Cyll
 files: 
 - sexp.rb
+- sexpressions.rb
 test_files: []
 
 rdoc_options: []
@@ -43,11 +45,11 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: multi
+  name: rparsec
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: "1.0"
     version: