clj 0.0.5.2 → 0.0.5.3

data/lib/clj/parser.rb

@@ -13,11 +13,7 @@ require 'stringio'
 class Clojure
 
 class Parser
-	NUMBERS   = '0' .. '9'
-	IGNORE    = [" ", ",", "\n", "\r", "\t"]
-	SEPARATOR = ['"', '{', '}', '(', ')', '[', ']', '#']
-	BOTH      = IGNORE + SEPARATOR
-	KEYWORD   = ["'", '^', '@', '`', '~', '\\', ';'] + BOTH
+	NUMBERS = '0' .. '9'
 
 	# Unescape characters in strings.
 	UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
@@ -129,7 +125,11 @@ private
 
 		if piece.include? '/'
 			Rational(piece)
-		elsif piece.include? '.' or piece.end_with? 'M'
+		elsif piece.include? 'r'
+			base, number = piece.split('r', 2)
+
+			number.to_i(base.to_i)
+		elsif piece.include? '.' or piece.include? 'e' or piece.end_with? 'M'
 			if piece.end_with? 'M'
 				piece[-1] = ''
 

data/lib/clj/types.rb

@@ -23,7 +23,7 @@ class Symbol
 	def to_clj (options = {})
 		result = inspect
 
-		if Clojure::Parser::KEYWORD.any? { |c| result.include? c }
+		unless result =~ /:([^(\[{'^@`~\"\\,\s;)\]}]+)/
 			raise ArgumentError, "#{result} cannot be transformed into clojure"
 		end
 

metadata

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