clj 0.0.7.1 → 0.0.7.2

data/ext/clj/parser.c

@@ -113,33 +113,25 @@ static NodeType next_type (STATE)
 static VALUE read_metadata (STATE)
 {
 	VALUE  result;
-	VALUE* metadatas = NULL;
-	size_t length    = 0;
+	VALUE  metadatas = rb_ary_new();
 	size_t i;
 
 	while (CURRENT == '^') {
-		metadatas = realloc(metadatas, ++length * sizeof(VALUE));
-
 		SEEK(1);
 
-		metadatas[length - 1] = CALL(read_next);
+		rb_ary_push(metadatas, CALL(read_next));
 	}
 
 	result = CALL(read_next);
 
 	if (!rb_respond_to(result, rb_intern("metadata="))) {
-		free(metadatas);
-
 		rb_raise(rb_eSyntaxError, "the object cannot hold metadata");
 	}
 
-	// FIXME: this could lead to a memleak if #metadata= raises
-	for (i = 0; i < length; i++) {
-		rb_funcall(result, rb_intern("metadata="), 1, metadatas[i]);
+	for (i = 0; i < RARRAY_LEN(metadatas); i++) {
+		rb_funcall(result, rb_intern("metadata="), 1, RARRAY_PTR(metadatas)[i]);
 	}
 
-	free(metadatas);
-
 	return result;
 }
 
@@ -536,8 +528,6 @@ static VALUE t_parse (VALUE self)
 		}
 	}
 
-	rb_gc_register_address(&source);
-
 	string = StringValueCStr(source);
 	result = read_next(self, string, &position);
 
@@ -547,8 +537,6 @@ static VALUE t_parse (VALUE self)
 		rb_raise(rb_eSyntaxError, "there is some unconsumed input");
 	}
 
-	rb_gc_unregister_address(&source);
-
 	return result;
 }
 

data/lib/clj/types.rb

@@ -18,9 +18,9 @@ module Clojure
 
 		def metadata= (value)
 			metadata.merge! case value
-				when Hash   then value
-				when Symbol then { value => true }
-				when String then { :tag => value }
+				when ::Hash   then value
+				when ::Symbol then { value => true }
+				when ::String then { :tag => value }
 				else raise ArgumentError, 'the passed value is not suitable as metadata'
 			end
 		end
@@ -31,9 +31,9 @@ module Clojure
 			'^' + if @metadata.length == 1
 				piece = @metadata.first
 
-				if piece.first.is_a?(Symbol) && piece.last == true
+				if piece.first.is_a?(::Symbol) && piece.last == true
 					piece.first.to_clj(options)
-				elsif piece.first == :tag && piece.last.is_a?(String)
+				elsif piece.first == :tag && piece.last.is_a?(::String)
 					piece.last.to_clj(options)
 				else
 					@metadata.to_clj(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clj
 version: !ruby/object:Gem::Version
-  version: 0.0.7.1
+  version: 0.0.7.2
   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: &9939580 !ruby/object:Gem::Requirement
+  requirement: &13297340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9939580
+  version_requirements: *13297340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9938800 !ruby/object:Gem::Requirement
+  requirement: &13295740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9938800
+  version_requirements: *13295740
 description: 
 email: meh@paranoici.org
 executables: []