clj 0.0.3.2 → 0.0.4

data/lib/clj/parser.rb

@@ -42,6 +42,8 @@ class Parser < StringScanner
 
 	INTEGER = /(-?0|-?[1-9]\d*)/
 
+	BIGNUM = /#{INTEGER}N/
+
 	FLOAT = /(-?
 		(?:0|[1-9]\d*)
 		(?:
@@ -51,6 +53,8 @@ class Parser < StringScanner
 		)
 	)/x
 
+	BIGDECIMAL = /#{FLOAT}M/
+
 	RATIONAL = /(#{INTEGER}\/#{INTEGER})/
 
 	REGEXP = /#"((\\.|[^"])+)"/
@@ -113,17 +117,19 @@ class Parser < StringScanner
 
 	def parse_value
 		case
-			when scan(RATIONAL) then Rational(self[1])
-			when scan(FLOAT)    then Float(self[1])
-			when scan(INTEGER)  then Integer(self[1])
-			when scan(REGEXP)   then /#{self[1]}/
-			when scan(INSTANT)  then DateTime.rfc3339(self[1])
-			when scan(STRING)   then parse_string
-			when scan(KEYWORD)  then self[1].to_sym
-			when scan(TRUE)     then true
-			when scan(FALSE)    then false
-			when scan(NIL)      then nil
-			else                UNPARSED
+			when scan(RATIONAL)   then Rational(self[1])
+			when scan(BIGDECIMAL) then require 'bigdecimal'; BigDecimal(self[1])
+			when scan(FLOAT)      then Float(self[1])
+			when scan(BIGNUM)     then Integer(self[1])
+			when scan(INTEGER)    then Integer(self[1])
+			when scan(REGEXP)     then /#{self[1]}/
+			when scan(INSTANT)    then DateTime.rfc3339(self[1])
+			when scan(STRING)     then parse_string
+			when scan(KEYWORD)    then self[1].to_sym
+			when scan(TRUE)       then true
+			when scan(FALSE)      then false
+			when scan(NIL)        then nil
+			else                  UNPARSED
 		end
 	end
 

data/lib/clj/types.rb

@@ -63,11 +63,15 @@ class Time
 	end
 end
 
-if defined? BigDecimal
-	class BigDecimal
-		def to_clj (options = {})
-			inspect + 'M'
-		end
+class Bignum < Integer
+	def to_clj (options = {})
+		to_s + 'N'
+	end
+end
+
+class BigDecimal < Numeric
+	def to_clj (options = {})
+		to_s('F') + 'M'
 	end
 end
 

metadata

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