Merge branch 'symbols-starting-with-true-false-nil' of https://github…

….com/sumbach/edn-ruby into sumbach-symbols-starting-with-true-false-nil

lib/edn/parser.rb

@@ -54,7 +54,7 @@ def parse_prefix(str, options={})
  set |
  map |
  boolean |
- str('nil').as(:nil) |
+ _nil |
  keyword |
  string |
  character |
@@ -131,7 +131,11 @@ def parse_prefix(str, options={})
  }
 
  rule(:boolean) {
- str('true').as(:true) | str('false').as(:false)
+ (str('true').as(:true) | str('false').as(:false)) >> valid_chars.absent?
+ }
+
+ rule(:_nil) {
+ str('nil').as(:nil) >> valid_chars.absent?
  }
 
  # Parts

spec/edn_spec.rb

@@ -72,6 +72,20 @@
  end
  end
  end
+
+ context "allows symbols starting with a reserved word" do
+ it "reads true-foo" do
+ EDN.read('true-foo').should == EDN::Type::Symbol.new('true-foo')
+ end
+
+ it "reads falsey" do
+ EDN.read('falsey').should == EDN::Type::Symbol.new('falsey')
+ end
+
+ it "reads nillable" do
+ EDN.read('nillable').should == EDN::Type::Symbol.new('nillable')
+ end
+ end
  end
 
  context "#register" do