clj 0.0.5.5 → 0.0.5.6

data/lib/clj.rb

@@ -8,6 +8,9 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
+require 'date'
+require 'bigdecimal'
+
 require 'clj/parser'
 require 'clj/types'
 

data/lib/clj/parser.rb

@@ -21,7 +21,7 @@ class Parser
 
 	# Unescape characters in strings.
 	UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
-	UNESCAPE_MAP.update({
+	UNESCAPE_MAP.merge!(
 		?"  => '"',
 		?\\ => '\\',
 		?/  => '/',
@@ -30,8 +30,8 @@ class Parser
 		?n  => "\n",
 		?r  => "\r",
 		?t  => "\t",
-		?u  => nil,
-	})
+		?u  => nil
+	)
 
 	EMPTY_8BIT_STRING = ''
 
@@ -57,14 +57,14 @@ private
 	def next_type (ch)
 		case ch
 		when NUMBERS, '-', '+' then :number
-		when 't', 'f'           then :boolean
-		when 'n'                then :nil
-		when '\\'               then :char
-		when ':'                then :keyword
-		when '"'                then :string
-		when '{'                then :map
-		when '('                then :list
-		when '['                then :vector
+		when 't', 'f'          then :boolean
+		when 'n'               then :nil
+		when '\\'              then :char
+		when ':'               then :keyword
+		when '"'               then :string
+		when '{'               then :map
+		when '('               then :list
+		when '['               then :vector
 		when '#'
 			case @source.read(1)
 			when 'i' then :instant
@@ -342,7 +342,7 @@ private
 	end
 
 	def both? (ch)
-		if ch == ' ' || ch == ',' || ch == '"' || ch == '{' || ch == '}' || ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == '#' || ch == "\n" || ch == "\r" || ch == "\t"
+		if ch == ' ' || ch == ',' || ch == '"' || ch == '{' || ch == '}' || ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == '#' || ch == ':' || ch == "\n" || ch == "\r" || ch == "\t"
 			true
 		else
 			false
@@ -350,7 +350,7 @@ private
 	end
 
 	def keyword? (ch)
-		if ch == ' ' || ch == ',' || ch == '"' || ch == '{' || ch == '}' || ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == '#' || ch == "'" || ch == '^' || ch == '@' || ch == '`' || ch == '~' || ch == '\\' || ch == ';' || ch == "\n" || ch == "\r" || ch == "\t"
+		if ch == ' ' || ch == ',' || ch == '"' || ch == '{' || ch == '}' || ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == '#' || ch == ':' || ch == "'" || ch == '^' || ch == '@' || ch == '`' || ch == '~' || ch == '\\' || ch == ';' || ch == "\n" || ch == "\r" || ch == "\t"
 			true
 		else
 			false

data/lib/clj/types.rb

@@ -8,9 +8,6 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-require 'date'
-require 'bigdecimal'
-
 [Numeric, TrueClass, FalseClass, NilClass].each {|klass|
 	klass.instance_eval {
 		define_method :to_clj do |*|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clj
 version: !ruby/object:Gem::Version
-  version: 0.0.5.5
+  version: 0.0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13013480 !ruby/object:Gem::Requirement
+  requirement: &4605840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13013480
+  version_requirements: *4605840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13012980 !ruby/object:Gem::Requirement
+  requirement: &4605160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13012980
+  version_requirements: *4605160
 description: 
 email: meh@paranoici.org
 executables: []
@@ -67,4 +67,3 @@ signing_key:
 specification_version: 3
 summary: Like json, but with clojure sexps.
 test_files: []
-has_rdoc: