clj 0.0.5.1 → 0.0.5.2

data/lib/clj/parser.rb

@@ -13,6 +13,7 @@ require 'stringio'
 class Clojure
 
 class Parser
+	NUMBERS   = '0' .. '9'
 	IGNORE    = [" ", ",", "\n", "\r", "\t"]
 	SEPARATOR = ['"', '{', '}', '(', ')', '[', ']', '#']
 	BOTH      = IGNORE + SEPARATOR
@@ -55,7 +56,7 @@ class Parser
 private
 	def next_type (ch)
 		case ch
-		when '0'..'9', '-', '+' then :number
+		when NUMBERS, '-', '+' then :number
 		when 't', 'f'           then :boolean
 		when 'n'                then :nil
 		when '\\'               then :char
@@ -65,7 +66,7 @@ private
 		when '('                then :list
 		when '['                then :vector
 		when '#'
-			case read(1)
+			case @source.read(1)
 			when 'i' then :instant
 			when '{' then :set
 			when '"' then :regexp
@@ -82,8 +83,12 @@ private
 	end
 
 	def read_nil (ch)
-		unless read(2).bytesize == 2
+		check = @source.read(2)
+
+		if check.bytesize != 2
 			raise SyntaxError, 'unexpected EOF'
+		elsif check != 'il'
+			raise SyntaxError, "expected nil, found n#{check}"
 		end
 
 		nil
@@ -91,14 +96,22 @@ private
 
 	def read_boolean (ch)
 		if ch == 't'
-			unless read(3).bytesize == 3
+			check = @source.read(3)
+
+			if check.bytesize != 3
 				raise SyntaxError, 'unexpected EOF'
+			elsif check != 'rue'
+				raise SyntaxError, "expected true, found t#{check}"
 			end
-			
+
 			true
 		else
-			unless read(4).bytesize == 4
+			check = @source.read(4)
+
+			if check.bytesize != 4
 				raise SyntaxError, 'unexpected EOF'
+			elsif check != 'alse'
+				raise SyntaxError, "expected false, found f#{check}"
 			end
 
 			false
@@ -108,7 +121,7 @@ private
 	def read_number (ch)
 		piece = ch
 
-		while (ch = read(1)) && !BOTH.include?(ch)
+		while (ch = @source.read(1)) && !both?(ch)
 			piece << ch
 		end
 
@@ -134,10 +147,10 @@ private
 	end
 
 	def read_char (ch)
-		ch = read(1)
+		ch = @source.read(1)
 
 		unescape(if ch == 'u' && lookahead(1) =~ /[0-9a-fA-F]/
-			"\\u#{read(4)}"
+			"\\u#{@source.read(4)}"
 		else
 			ch
 		end)
@@ -146,7 +159,7 @@ private
 	def read_keyword (ch)
 		result = ''
 
-		while (ch = read(1)) && !KEYWORD.include?(ch)
+		while (ch = @source.read(1)) && !keyword?(ch)
 			result << ch
 		end
 
@@ -158,13 +171,13 @@ private
 	def read_string (ch)
 		result = ''
 
-		while (ch = read(1)) != '"'
+		while (ch = @source.read(1)) != '"'
 			raise SyntaxError, 'unexpected EOF' unless ch
 
 			result << ch
 
 			if ch == '\\'
-				result << read(1)
+				result << @source.read(1)
 			end
 		end
 
@@ -172,7 +185,7 @@ private
 	end
 
 	def read_instant (ch)
-		read(3)
+		@source.read(3)
 
 		DateTime.rfc3339(read_string(ignore(false)))
 	end
@@ -180,13 +193,13 @@ private
 	def read_regexp (ch)
 		result = ''
 
-		while (ch = read(1)) != '"'
+		while (ch = @source.read(1)) != '"'
 			raise SyntaxError, 'unexpected EOF' unless ch
 
 			result << ch
 
 			if ch == '\\'
-				result << read(1)
+				result << @source.read(1)
 			end
 		end
 
@@ -203,7 +216,7 @@ private
 			ignore
 		end
 
-		read(1)
+		@source.read(1)
 
 		result
 	end
@@ -218,7 +231,7 @@ private
 			ignore
 		end
 
-		read(1)
+		@source.read(1)
 
 		result
 	end
@@ -233,7 +246,7 @@ private
 			ignore
 		end
 
-		read(1)
+		@source.read(1)
 
 		if result.uniq!
 			raise SyntaxError, 'the set contains non unique values'
@@ -255,7 +268,7 @@ private
 			result[key] = value
 		end
 
-		read(1)
+		@source.read(1)
 
 		result
 	end
@@ -284,10 +297,6 @@ private
 		}
 	end
 
-	def read (length)
-		@source.read(length)
-	end
-
 	def lookahead (length = nil)
 		original = @source.tell
 		result   = @source.read(length)
@@ -298,7 +307,7 @@ private
 	end
 
 	def ignore (ungetc = true)
-		while IGNORE.include?(ch = read(1)); end
+		while ignore?(ch = @source.read(1)); end
 
 		return false unless ch
 
@@ -308,7 +317,31 @@ private
 	def revert (ch)
 		return unless ch
 
-		@source.ungetc(ch[0])
+		@source.seek -1, IO::SEEK_CUR
+	end
+
+	def ignore? (ch)
+		if ch == ' ' || ch == ',' || ch == "\n" || ch == "\r" || ch == "\t"
+			true
+		else
+			false
+		end
+	end
+
+	def both? (ch)
+		if ch == ' ' || ch == ',' || ch == '"' || ch == '{' || ch == '}' || ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == '#' || ch == "\n" || ch == "\r" || ch == "\t"
+			true
+		else
+			false
+		end
+	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"
+			true
+		else
+			false
+		end
 	end
 end
 

metadata

@@ -1,95 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clj
-version: !ruby/object:Gem::Version 
-  hash: 89
+version: !ruby/object:Gem::Version
+  version: 0.0.5.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  - 1
-  version: 0.0.5.1
 platform: ruby
-authors: 
+authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &7849260 !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: *7849260
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &7848580 !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: *7848580
 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: []
-
+has_rdoc: