clj 0.0.7 → 0.0.7.1

data/ext/clj/parser.c

@@ -522,8 +522,10 @@ static VALUE t_init (int argc, VALUE* argv, VALUE self)
 
 static VALUE t_parse (VALUE self)
 {
+	char*  string;
 	size_t position = 0;
-	VALUE  source   = rb_iv_get(self, "@source");
+	VALUE  source = rb_iv_get(self, "@source");
+	VALUE  result;
 
 	if (!rb_obj_is_kind_of(source, rb_cString)) {
 		if (rb_obj_is_kind_of(source, rb_cIO)) {
@@ -534,7 +536,20 @@ static VALUE t_parse (VALUE self)
 		}
 	}
 
-	return read_next(self, StringValueCStr(source), &position);
+	rb_gc_register_address(&source);
+
+	string = StringValueCStr(source);
+	result = read_next(self, string, &position);
+
+	ignore(self, string, &position);
+
+	if (string[position] != '\0') {
+		rb_raise(rb_eSyntaxError, "there is some unconsumed input");
+	}
+
+	rb_gc_unregister_address(&source);
+
+	return result;
 }
 
 void

data/lib/clj/parser.rb

@@ -13,8 +13,7 @@ require 'stringio'
 module Clojure
 
 class Parser
-	NUMBERS  = '0' .. '9'
-	SYMBOL   = ('0' .. '9').to_a | ('a' .. 'z').to_a | ('A' .. 'Z').to_a | %w[+ ! - _ ? . : /]
+	NUMBERS = '0' .. '9'
 
 	UNICODE_REGEX = /[0-9|a-f|A-F]{4}/
 	OCTAL_REGEX   = /[0-3]?[0-7]?[0-7]/
@@ -342,7 +341,7 @@ private
 	end
 
 	def is_symbol? (ch)
-		SYMBOL.include?(ch)
+		(ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' || ch <= 'Z') || ch == '+' || ch == '!' || ch == '-' || ch == '_' || ch == '?' || ch == '.' || ch == ':' || ch == '/'
 	end
 
 	def both_separator? (ch)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clj
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17788760 !ruby/object:Gem::Requirement
+  requirement: &9939580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17788760
+  version_requirements: *9939580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18290880 !ruby/object:Gem::Requirement
+  requirement: &9938800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18290880
+  version_requirements: *9938800
 description: 
 email: meh@paranoici.org
 executables: []