clj 0.0.7.2 → 0.0.8

data/ext/clj/parser.c

@@ -397,17 +397,15 @@ static VALUE read_set (STATE)
 	SEEK(2); CALL(ignore);
 
 	while (CURRENT != '}') {
-		rb_funcall(result, rb_intern("<<"), 1, CALL(read_next));
+		if (NIL_P(rb_funcall(result, rb_intern("add?"), 1, CALL(read_next)))) {
+			rb_raise(rb_eSyntaxError, "the set contains non unique values");
+		}
 
 		CALL(ignore);
 	}
 
 	SEEK(1);
 
-	if (!NIL_P(rb_funcall(result, rb_intern("uniq!"), 0))) {
-		rb_raise(rb_eSyntaxError, "the set contains non unique values");
-	}
-
 	return result;
 }
 
@@ -499,14 +497,14 @@ static VALUE t_init (int argc, VALUE* argv, VALUE self)
 		rb_iv_set(self, "@list_class", tmp);
 	}
 	else {
-		rb_iv_set(self, "@list_class", rb_const_get(cClojure, rb_intern("Vector")));
+		rb_iv_set(self, "@list_class", rb_const_get(cClojure, rb_intern("List")));
 	}
 
 	if (!NIL_P(tmp = rb_hash_aref(options, rb_intern("set_class")))) {
 		rb_iv_set(self, "@set_class", tmp);
 	}
 	else {
-		rb_iv_set(self, "@set_class", rb_const_get(cClojure, rb_intern("Vector")));
+		rb_iv_set(self, "@set_class", rb_const_get(cClojure, rb_intern("Set")));
 	}
 
 	return self;

data/lib/clj.rb

@@ -8,9 +8,6 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-require 'date'
-require 'bigdecimal'
-
 module Clojure
 	def self.parse (*args)
 		Clojure::Parser.new(*args).parse
@@ -72,7 +69,7 @@ end
 require 'clj/types'
 
 begin
-	raise LoadError if RUBY_ENGINE == 'jruby'
+	raise LoadError if RUBY_ENGINE == 'jruby' || ENV['CLJ_NO_C_EXT']
 
 	require 'clj/parser_ext'
 rescue LoadError

data/lib/clj/parser.rb

@@ -285,16 +285,15 @@ private
 		ignore
 
 		while lookahead(1) != '}'
-			result << read_next
+			unless result.add? read_next
+				raise SyntaxError, 'the set contains non unique values'
+			end
+
 			ignore
 		end
 
 		@source.read(1)
 
-		if result.uniq!
-			raise SyntaxError, 'the set contains non unique values'
-		end
-
 		result
 	end
 

data/lib/clj/types.rb

@@ -9,6 +9,9 @@
 #++
 
 require 'forwardable'
+require 'set'
+require 'date'
+require 'bigdecimal'
 
 module Clojure
 	module Metadata
@@ -68,7 +71,7 @@ module Clojure
 		end
 	end
 
-	class Set < Array
+	class Set < Set
 		include Clojure::Metadata
 
 		def to_clj (options = {})

metadata

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