sexpistol 0.0.2 → 0.0.3

data/VERSION

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

data/lib/sexpistol/sexpistol.rb

@@ -3,10 +3,21 @@
 # native Ruby representation like:
 #   [:def, :something [:lambda, [:a], [:do_something]]]
 class Sexpistol
+
   attr_accessor :ruby_keyword_literals
 
   def initialize
     @ruby_keyword_literals = false
+    
+    # Setup all of our token patterns as instance variables
+    # so they don't have to be re-instantiated for each
+    # run & match
+    @string_literal_pattern = /"([^"\\]|\\.)*"/
+    @integer_literal_pattern = /[\-\+]?[0-9]+/
+    @float_literal_pattern = /[\-\+]?[0-9]+\.[0-9]+(e[0-9]+)?/
+    @symbol_pattern = /[^\"\'\,\(\)]+/
+    
+    @string_replacement_token = "__++STRING_LITERAL++__"
   end
 
   # Parse a string containing an S-Expression into a
@@ -14,16 +25,7 @@ class Sexpistol
   def parse_string( string )
     string_array = split_outside_strings(string)
     tokens = process_tokens( string_array )
-    check_tokens( tokens )
-    structure( tokens )
-  end
-  
-  # Check and array of tokens to make sure that the number
-  # of open and closing parentheses match
-  def check_tokens( tokens )
-    unless( (tokens.reject {|x| x == "("}).length == (tokens.reject {|x| x == ")"}).length)
-      raise Exception, "Invalid S-Expression. The number of opening and closing parentheses does not match."
-    end
+    structure( tokens )[1]
   end
 
   # Iterate over an array of strings and turn each
@@ -32,11 +34,11 @@ class Sexpistol
     tokens = []
     token_array.each do |t|
       if(@ruby_keyword_literals)
-        tokens << nil and next if(is_nil?(t))
-        tokens << true and next if(is_true?(t))
-        tokens << false and next if(is_false?(t))
+        tokens << nil and next if(t == "nil")
+        tokens << true and next if(t == "true")
+        tokens << false and next if(t == "false")
       end
-      tokens << t and next if(is_paren?(t))
+      tokens << t and next if(t == "(" || t == ")")
       tokens << t.to_f and next if( is_float?(t))
       tokens << t.to_i and next if( is_integer?(t))
       tokens << t.to_sym and next if( is_symbol?(t))
@@ -61,30 +63,27 @@ class Sexpistol
       end
       offset += 1
     end
-    if(internal)
-      return [offset, program]
-    else
-      return program
-    end
+    return [offset, program]
   end
   
   # Split up a string into an array where delimited by whitespace,
   # except inside string literals
   def split_outside_strings( string )
-    string_literal_pattern = /"([^"\\]|\\.)*"/
-    string_token = "__++STRING_LITERAL++__"
     # Find and extract all the string literals
     string_literals = []
-    string.gsub(string_literal_pattern) {|x| string_literals << x}
-    # Replace all the string literals with a special token
-    string = string.gsub(string_literal_pattern, string_token)
+    string = string.gsub(@string_literal_pattern) do |x| 
+      string_literals << x
+      @string_replacement_token
+    end
+    # Make sure the s-expression is valid
+    unless( string.count("(") == string.count(")") )
+      raise Exception, "Invalid S-Expression. The number of opening and closing parentheses does not match."
+    end
     # Split the string up on whitespace and parentheses
-    string.gsub!("(", " ( ")
-    string.gsub!(")", " ) ")
-    array = string.split(" ")
+    array = string.gsub("(", " ( ").gsub(")", " ) ").split(" ")
     # replace the special string token with the original string literals
     array.collect! do |x|
-      if( x == string_token)
+      if( x == @string_replacement_token)
         string_literals.shift
       else
         x
@@ -93,44 +92,24 @@ class Sexpistol
     return array
   end
 
-  # Test to see whether or not a string represents the 'nil' literal
-  def is_nil?( string )
-    true if(string == "nil")
-  end
-  
-  # Test to see whether or not a string represents the 'true' literal
-  def is_true?( string )
-    true if(string == "true")
-  end
-  
-  # Test to see whether or not a string represents the 'false' literal
-  def is_false?( string )
-    true if(string == "false")
-  end
-
-  # Test to see whether a string represents a parentheses
-  def is_paren?( string )
-    is_match?( string, /[\(\)]+/ )
-  end
-
   # Test to see whether or not a string represents an integer
   def is_integer?( string )
-    is_match?( string, /[\-\+]?[0-9]+/ )
+    is_match?( string, @integer_literal_pattern )
   end
   
   # Test to see whether or not a string represents a float
   def is_float?( string )
-    is_match?( string, /[\-\+]?[0-9]+\.[0-9]+(e[0-9]+)?/ )
+    is_match?( string, @float_literal_pattern )
   end
 
   # Test to see whether or not a string represents a symbol
   def is_symbol?( string )
-    is_match?( string, /[^\"\'\,\(\)]+/ )
+    is_match?( string, @symbol_pattern )
   end
   
   # Test to see whether or not a string represents a string literal
   def is_string_literal?( string )
-    is_match?( string, /"([^"\\]|\\.)*"/)
+    is_match?( string, @string_literal_pattern )
   end
   
   # Convert a set of nested arrays back into an S-Expression

data/sexpistol.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sexpistol}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Gough"]
-  s.date = %q{2010-10-03}
+  s.date = %q{2010-10-06}
   s.description = %q{Sexpistol is an easy-to-use S-Expression parser for Ruby. It is fast and has no dependencies.}
   s.email = %q{aaron@aarongough.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "lib/sexpistol.rb",
      "lib/sexpistol/sexpistol.rb",
      "sexpistol.gemspec",
+     "test/performance/benchmark_test.rb",
      "test/setup/test_unit_extensions.rb",
      "test/test_helper.rb",
      "test/unit/float_literal_test.rb",
@@ -41,7 +42,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{An S-Expression Parser Library for Ruby}
   s.test_files = [
-    "test/setup/test_unit_extensions.rb",
+    "test/performance/benchmark_test.rb",
+     "test/setup/test_unit_extensions.rb",
      "test/test_helper.rb",
      "test/unit/float_literal_test.rb",
      "test/unit/integer_literal_test.rb",

data/test/performance/benchmark_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper.rb'))
+
+class BenchmarkTest < Test::Unit::TestCase
+
+  require 'benchmark'
+
+  test "benchmark sexpistol" do
+    puts "\nRunning performance test...\n"
+    parser = Sexpistol.new
+    parser.ruby_keyword_literals = true
+    Benchmark.bmbm do |b|
+      b.report do
+        5000.times do
+          parser.parse_string <<-EOD
+          
+            (display "This is a test string!")
+            
+            (define test (lambda () (begin
+              (display (== 1 1))
+              (display (== true true))
+              (display (== false false))
+              (display (== nil nil))
+              (display (== 2.09 1.08))
+              (display (== 2e6 2e12))
+            )))
+            
+          EOD
+        end
+      end
+    end
+    puts
+  end    
+    
+end

data/test/unit/structure_test.rb

@@ -5,10 +5,10 @@ class RubyKeywordLiteralsTest < Test::Unit::TestCase
   def setup
     @parser = Sexpistol.new
   end
-
+  
   test "should create nested set of arrays from s-expression" do
-    ast = @parser.parse_string('(this (is (an (s_expression))))')
-    assert_equal [[:this, [:is, [:an, [:s_expression]]]]], ast
+    ast = @parser.parse_string('(this (is (an (s_expression) (also) blah) foo) (test))')
+    assert_equal [[:this, [:is, [:an, [:s_expression], [:also], :blah], :foo], [:test]]], ast
   end
   
   test "should create nested set of arrays from s-expression with string literals" do

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: 
 - Aaron Gough
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 -04:00
+date: 2010-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - lib/sexpistol.rb
 - lib/sexpistol/sexpistol.rb
 - sexpistol.gemspec
+- test/performance/benchmark_test.rb
 - test/setup/test_unit_extensions.rb
 - test/test_helper.rb
 - test/unit/float_literal_test.rb
@@ -80,6 +81,7 @@ signing_key:
 specification_version: 3
 summary: An S-Expression Parser Library for Ruby
 test_files: 
+- test/performance/benchmark_test.rb
 - test/setup/test_unit_extensions.rb
 - test/test_helper.rb
 - test/unit/float_literal_test.rb