clj 0.0.4.4 → 0.0.4.5

data/lib/clj.rb

@@ -8,8 +8,8 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-require 'clj/types'
 require 'clj/parser'
+require 'clj/types'
 
 class Clojure
 	def self.parse (*args)

data/lib/clj/parser.rb

@@ -156,7 +156,7 @@ class Parser < StringScanner
 	def parse_string
 		return '' if self[1].empty?
 
-		self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
+		self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) {|escape|
 			if u = UNESCAPE_MAP[$&[1]]
 				next u
 			end
@@ -164,19 +164,19 @@ class Parser < StringScanner
 			bytes = EMPTY_8BIT_STRING.dup
 
 			i = 0
-			while c[6 * i] == ?\\ && c[6 * i + 1] == ?u
-				bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
+			while escape[6 * i] == ?\\ && escape[6 * i + 1] == ?u
+				bytes << escape[6 * i + 2, 2].to_i(16) << escape[6 * i + 4, 2].to_i(16)
 
 				i += 1
 			end
 
 			if bytes.respond_to? :force_encoding
-				bytes.force_encoding 'UTF-16'
+				bytes.force_encoding 'UTF-16be'
 				bytes.encode 'UTF-8'
 			else
 				bytes
 			end
-		end
+		}
 	end
 
 	def parse_vector

data/lib/clj/types.rb

@@ -22,7 +22,7 @@ class Symbol
 	def to_clj (options = {})
 		result = inspect
 
-		unless result =~ /:([^(\[{'^@`~\"\\,\s;)\]}]+)/
+		unless Clojure::Parser::KEYWORD === result
 			raise ArgumentError, "#{result} cannot be transformed into clojure"
 		end
 
@@ -33,7 +33,7 @@ end
 class String
 	def to_clj (options = {})
 		result = if respond_to? :encode
-			encode('UTF-16').inspect
+			encode('UTF-16be').inspect
 		else
 			inspect
 		end

metadata

@@ -1,95 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clj
-version: !ruby/object:Gem::Version 
-  hash: 87
+version: !ruby/object:Gem::Version
+  version: 0.0.4.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  - 4
-  version: 0.0.4.4
 platform: ruby
-authors: 
+authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &9143400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *9143400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &9142780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *9142780
 description: 
 email: meh@paranoici.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/clj.rb
 - lib/clj/types.rb
 - lib/clj/parser.rb
 homepage: http://github.com/meh/ruby-clj
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Like json, but with clojure sexps.
 test_files: []
-