edn_turbo 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 846fd6b6a142bea1696ae918087fc9ae2c89264b
-  data.tar.gz: 0a6c9520a17d1cd2967c1f0e61efba2bfbb40fde
+SHA256:
+  metadata.gz: 409d493aab7167c3bac13a53580bea45735c02fc1918f57fd5b386a390d43750
+  data.tar.gz: 3c9b3786db7a9b2f7732735898b3b78c7dfab041b3f11511d8866b7093629cf5
 SHA512:
-  metadata.gz: 4c4a5d4d8357b9bcf773cc3cfdb66d191f0248326c8772ef15c2ff31904740d3b4df1bea8db54edf5a0817b0bb55446bd064b1bf25ad721cd46ee5df2f7171cb
-  data.tar.gz: a4dc313919664ffd6881e9be561ec9453b77c78569ddb5726a7c8ef6e4c34ccaddab25385920cbcbd7ff811865cc8ae081fe58f880bae9fed179edce6f291c78
+  metadata.gz: a1b753f68eadd7e5466dd863606085dd8eeaa489c01e0ef5473ccb9e5562d70611ff35999db5263ffef42813a1404f118f26672482b36e7ca2e8fde50e96d187
+  data.tar.gz: d0ab9b94babb9c4d0293f270266963555e805edbaf09a28c55de59281fba52e6fb6cb0af189eecd4daa96029d254d5521d1fa916d3f91ff9e2c638b4cbc7c08b

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Change Log
+All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
+
+## 0.6.0 - 2019-05-13
+### Changed
+- switched from MiniTest to RSpec.
+- replaced `NULL` with `nullptr`.
+- replaced old-style casts.
+- prohibit Parser copy and move ops.
+- assigning a source that does not respond to `read` now throws
+  `ArgumentError` instead of `RuntimeError`.
+
+### Added
+- initial version of docker configs for testing on Ubuntu.
+

data/Dockerfile

@@ -0,0 +1,34 @@
+FROM buildpack-deps:stretch
+MAINTAINER github@digressed.net
+
+ENV LC_ALL C.UTF-8
+
+# Update Ubuntu Software repository
+RUN apt-get update
+
+# install dependencies & utils
+RUN apt-get install -y \
+    libicu-dev \
+    curl \
+    libreadline-dev 
+
+# aliases, environment
+RUN echo 'alias h="history"' >> /root/.bashrc
+RUN echo 'alias be="bundle exec"' >> /root/.bashrc
+ENV PATH "/root/.rbenv/bin:/root/.rbenv/shims:$PATH"
+
+# install rbenv & ruby
+RUN \curl -sL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer | bash -
+RUN eval "$(rbenv init -)"
+
+ENV RUBY_VERSION=2.6.3
+RUN rbenv install ${RUBY_VERSION}
+RUN rbenv global ${RUBY_VERSION}
+
+# mute bundle warning about root user
+RUN bundle config --global silence_root_warning 1
+
+WORKDIR /gem
+
+# cleanup
+RUN rm -rf /var/lib/apt/lists/*

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2015-2019 Ed Porras
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,14 +1,13 @@
-edn_turbo 0.5.7
+edn_turbo 0.6.0
 ===============
 
-Fast Ragel-based EDN parser for Ruby.
+Fast (Ragel)[http://www.colm.net/open-source/ragel/]-based EDN parser for Ruby.
 
-`edn_turbo` is a parser plugin for
+`edn_turbo` can be used as a parser plugin for
 [edn](https://github.com/relevance/edn-ruby). With a few exceptions
 `edn_turbo` provides the same functionality as the edn gem, but since
-the `edn_turbo` parser is implemented in C, it is an order of
-magintude faster.
-
+the `edn_turbo` parser is implemented in C++, it is an order of
+magnitude faster.
 
 Some quick sample runs comparing time output of file reads using `edn`
 and `edn_turbo` (see [issue 12](https://github.com/relevance/edn-ruby/issues/12)):
@@ -32,27 +31,24 @@ irb(main):008:0> Benchmark.realtime { 100000.times { EDN::read(s) } }
 => 2.866411
 ```
 
-
 Dependencies
 ============
 
+Ruby 2.4 or greater as `edn_turbo` does not use the deprecated `Fixnum` or `Bignum`.
+
 - ruby gems:
   - [rake](http://rake.rubyforge.org)
   - [rake-compiler 1.0](http://rake-compiler.rubyforge.org)
   - [edn 1.1](https://github.com/relevance/edn-ruby)
+- a C++-11 capable compiler.
 - [icu4c](http://icu-project.org/apiref/icu4c/)
 
-
 Notes:
 ------
 
 - `edn_turbo` uses a ragel-based parser but the generated .cc file is
   bundled so ragel should not need to be installed.
 
-- If the gem fails to install due to a compilation error, make sure you
-  have `icu4c` installed. The reported gem install error doesn't make
-  it clear this is the issue.
-
 Usage
 =====
 
@@ -110,13 +106,3 @@ Differences with edn gem
 `edn_turbo` reads `String` and core IO types using C-api calls.
 However, data from `StringIO` sources is extracted using `read()`
 calls into the ruby side.
-
-Known problems
-==============
-
-v0.3.2:
-
-- Some unhandled corner cases with operators and spacing
-  remain. `edn_turbo` handles things like `1 / 12` and `1/ 12` but
-  parse errors occur with `1/12` and `1 /12` because it treats `/12`
-  as an invalid symbol.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 require 'rake/extensiontask'
 require 'rake/clean'
@@ -8,57 +10,58 @@ LIB_DIR = "lib/#{NAME}"
 EXT_BUNDLE = "#{LIB_DIR}/#{NAME}.#{RbConfig::CONFIG['DLEXT']}"
 
 EXT_PATH               = "ext/#{NAME}"
-RAGEL_PARSER_SRC       = "edn_parser.rl"
+RAGEL_PARSER_SRC       = 'edn_parser.rl'
 RAGEL_PARSER_SRC_PATH  = "#{EXT_PATH}/#{RAGEL_PARSER_SRC}"
-GEN_CC_PARSER_SRC      = "edn_parser.cc"
+GEN_CC_PARSER_SRC      = 'edn_parser.cc'
 GEN_CC_PARSER_SRC_PATH = "#{EXT_PATH}/#{GEN_CC_PARSER_SRC}"
 
 task :irb do
-  sh "irb -I lib -r edn_turbo"
-  sh "reset"
+  sh 'irb -I lib -r edn_turbo'
+  sh 'reset'
 end
 
-task :runthru => [:clean, :default, :test]
+task runthru: %i[clean default test]
 
-Rake::ExtensionTask.new("#{NAME}") do |extension|
+Rake::ExtensionTask.new(NAME) do |extension|
   extension.lib_dir = LIB_DIR
-  extension.source_pattern = "*.{cc,h}"
+  extension.source_pattern = '*.{cc,h}'
 end
 
 task :chmod do
-  File.chmod(0775, EXT_BUNDLE)
+  File.chmod(0o0775, EXT_BUNDLE)
 end
 
-CLEAN.include(["*.png", "*.gem"])
+CLEAN.include(['*.png', '*.gem'])
 
 # ragel cc source generation
-task :ragel => GEN_CC_PARSER_SRC_PATH
+task ragel: GEN_CC_PARSER_SRC_PATH
 file GEN_CC_PARSER_SRC_PATH => RAGEL_PARSER_SRC_PATH do
   cd EXT_PATH do
     sh "ragel -G2 -o #{GEN_CC_PARSER_SRC} #{RAGEL_PARSER_SRC}"
     src = File.read(GEN_CC_PARSER_SRC).gsub(/[ \t]+$/, '')
-    File.open(GEN_CC_PARSER_SRC, "w") {|f| f.print src}
+    File.open(GEN_CC_PARSER_SRC, 'w') { |f| f.print src }
   end
 end
 
 # graph generation for testing machine output
-task :graph, [:machine] do |t, args|
-  args.with_defaults(:machine => 'EDN_value')
-  TMPFILE='/tmp/ragel_edn'
-  MACHINE=args[:machine]
+task :graph, [:machine] do |_t, args|
+  args.with_defaults(machine: 'EDN_value')
+  TMPFILE = '/tmp/ragel_edn'
+  MACHINE = args[:machine]
 
   # assumes graphviz is installed
-  sh "ragel -Vp -S #{MACHINE} -o #{TMPFILE} #{EXT_PATH}/#{RAGEL_PARSER_SRC} && dot -Tpng #{TMPFILE} -o #{MACHINE}.png"
+  sh "ragel -Vp -S #{MACHINE} -o #{TMPFILE} #{EXT_PATH}/#{RAGEL_PARSER_SRC} && "\
+    "dot -Tpng #{TMPFILE} -o #{MACHINE}.png"
 end
 
-task :build => [:clean, :ragel, :compile, :chmod]
+task build: [:clean, :ragel, :compile, :chmod]
 
 # add dependency to test task
-task :test => EXT_BUNDLE
+task test:  EXT_BUNDLE
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/test_output_diff.rb']
 end
 
-task :default => :compile
+task default: :compile

data/bin/build_docker_image.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ $# -ne 1 ]]; then
+    RUBY_VERSION=2.6.3
+else
+    RUBY_VERSION=$1
+fi
+
+docker build -t edn_turbo_image:$RUBY_VERSION .

data/bin/console.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+docker-compose run edn_turbo /bin/bash

data/docker-compose.yml

@@ -0,0 +1,10 @@
+version: "3"
+services:
+
+  edn_turbo:
+    image: edn_turbo_image:2.6.3
+    stdin_open: true
+    tty: true
+    volumes:
+      - ~/.bash_history:/root/.bash_history
+      - /Volumes/homes/ep/work/edn_turbo:/gem

data/ext/edn_turbo/edn_parser.cc

@@ -1,5 +1,27 @@
 
 #line 1 "edn_parser.rl"
+// The MIT License (MIT)
+
+// Copyright (c) 2015-2019 Ed Porras
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 #include <iostream>
 #include <string>
 #include <sstream>
@@ -21,7 +43,7 @@
 //
 
 
-#line 59 "edn_parser.rl"
+#line 81 "edn_parser.rl"
 
 
 // ============================================================
@@ -29,7 +51,7 @@
 //
 
 
-#line 33 "edn_parser.cc"
+#line 55 "edn_parser.cc"
 static const int EDN_value_start = 1;
 static const int EDN_value_first_final = 2;
 static const int EDN_value_error = 0;
@@ -37,7 +59,7 @@ static const int EDN_value_error = 0;
 static const int EDN_value_en_main = 1;
 
 
-#line 175 "edn_parser.rl"
+#line 197 "edn_parser.rl"
 
 
 
@@ -47,14 +69,14 @@ const char *edn::Parser::parse_value(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 51 "edn_parser.cc"
+#line 73 "edn_parser.cc"
 	{
 	cs = EDN_value_start;
 	}
 
-#line 184 "edn_parser.rl"
+#line 206 "edn_parser.rl"
 
-#line 58 "edn_parser.cc"
+#line 80 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -97,44 +119,44 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 103 "edn_parser.rl"
+#line 125 "edn_parser.rl"
 	{
         // stand-alone operators *, +, -, etc.
         const char *np = parse_operator(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr2:
-#line 71 "edn_parser.rl"
+#line 93 "edn_parser.rl"
 	{
         // string types within double-quotes
         const char *np = parse_string(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr3:
-#line 155 "edn_parser.rl"
+#line 177 "edn_parser.rl"
 	{
         // handles tokens w/ leading # ("#_", "#{", and tagged elems)
         const char *np = parse_dispatch(p + 1, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr4:
-#line 137 "edn_parser.rl"
+#line 159 "edn_parser.rl"
 	{
         // (
         const char *np = parse_list(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr5:
-#line 83 "edn_parser.rl"
+#line 105 "edn_parser.rl"
 	{
         // tokens w/ leading digits: non-negative integers & decimals.
         // try to parse a decimal first
         const char *np = parse_decimal(p, pe, v);
-        if (np == NULL) {
+        if (np == nullptr) {
             // if we can't, try to parse it as an int
             np = parse_integer(p, pe, v);
         }
@@ -151,20 +173,20 @@ tr5:
     }
 	goto st2;
 tr6:
-#line 77 "edn_parser.rl"
+#line 99 "edn_parser.rl"
 	{
         // tokens with a leading ':'
         const char *np = parse_keyword(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr7:
-#line 115 "edn_parser.rl"
+#line 137 "edn_parser.rl"
 	{
         // user identifiers and reserved keywords (true, false, nil)
         VALUE sym = Qnil;
         const char *np = parse_symbol(p, pe, sym);
-        if (np == NULL) { {p = (( pe))-1;} } else {
+        if (np == nullptr) { {p = (( pe))-1;} } else {
             // parse_symbol will make 'sym' a ruby string
             if      (std::strcmp(RSTRING_PTR(sym), "true") == 0)  { v = Qtrue; }
             else if (std::strcmp(RSTRING_PTR(sym), "false") == 0) { v = Qfalse; }
@@ -177,44 +199,44 @@ tr7:
     }
 	goto st2;
 tr8:
-#line 131 "edn_parser.rl"
+#line 153 "edn_parser.rl"
 	{
         // [
         const char *np = parse_vector(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr9:
-#line 109 "edn_parser.rl"
+#line 131 "edn_parser.rl"
 	{
         // tokens w/ leading \ (escaped characters \newline, \c, etc.)
         const char *np = parse_esc_char(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr10:
-#line 149 "edn_parser.rl"
+#line 171 "edn_parser.rl"
 	{
         // ^
         const char *np = parse_meta(p, pe);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 tr11:
-#line 143 "edn_parser.rl"
+#line 165 "edn_parser.rl"
 	{
         // {
         const char *np = parse_map(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
-#line 218 "edn_parser.cc"
+#line 240 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -223,7 +245,7 @@ case 2:
 	_out: {}
 	}
 
-#line 185 "edn_parser.rl"
+#line 207 "edn_parser.rl"
 
     if (cs >= EDN_value_first_final) {
         return p;
@@ -233,7 +255,7 @@ case 2:
         return pe;
     }
     else if (cs == EDN_value_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -245,7 +267,7 @@ case 2:
 // ascii range is found.
 //
 
-#line 249 "edn_parser.cc"
+#line 271 "edn_parser.cc"
 static const int EDN_string_start = 1;
 static const int EDN_string_first_final = 8;
 static const int EDN_string_error = 0;
@@ -253,7 +275,7 @@ static const int EDN_string_error = 0;
 static const int EDN_string_en_main = 1;
 
 
-#line 230 "edn_parser.rl"
+#line 252 "edn_parser.rl"
 
 
 
@@ -264,15 +286,15 @@ const char* edn::Parser::parse_string(const char *p, const char *pe, VALUE& v)
     bool encode = false;
 
 
-#line 268 "edn_parser.cc"
+#line 290 "edn_parser.cc"
 	{
 	cs = EDN_string_start;
 	}
 
-#line 240 "edn_parser.rl"
+#line 262 "edn_parser.rl"
     const char* p_save = p;
 
-#line 276 "edn_parser.cc"
+#line 298 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -286,7 +308,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 219 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -295,7 +317,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 299 "edn_parser.cc"
+#line 321 "edn_parser.cc"
 	switch( (*p) ) {
 		case 34: goto tr3;
 		case 92: goto tr4;
@@ -304,7 +326,7 @@ case 2:
 		goto tr2;
 	goto st2;
 tr3:
-#line 211 "edn_parser.rl"
+#line 233 "edn_parser.rl"
 	{
         if (edn::util::parse_byte_stream(p_save + 1, p, v, encode)) {
             {p = (( p + 1))-1;}
@@ -312,17 +334,17 @@ tr3:
             p--; {p++; cs = 8; goto _out;}
         }
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 323 "edn_parser.cc"
+#line 345 "edn_parser.cc"
 	goto st0;
 tr4:
-#line 219 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -331,7 +353,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 335 "edn_parser.cc"
+#line 357 "edn_parser.cc"
 	switch( (*p) ) {
 		case 34: goto tr2;
 		case 47: goto tr2;
@@ -345,7 +367,7 @@ case 3:
 	}
 	goto st2;
 tr5:
-#line 219 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -354,7 +376,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 358 "edn_parser.cc"
+#line 380 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr6;
@@ -365,7 +387,7 @@ case 4:
 		goto tr6;
 	goto st0;
 tr6:
-#line 219 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -374,7 +396,7 @@ st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 378 "edn_parser.cc"
+#line 400 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr7;
@@ -385,7 +407,7 @@ case 5:
 		goto tr7;
 	goto st0;
 tr7:
-#line 219 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -394,7 +416,7 @@ st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 398 "edn_parser.cc"
+#line 420 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr8;
@@ -405,7 +427,7 @@ case 6:
 		goto tr8;
 	goto st0;
 tr8:
-#line 219 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -414,7 +436,7 @@ st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 418 "edn_parser.cc"
+#line 440 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr2;
@@ -438,7 +460,7 @@ case 7:
 	{
 	switch ( cs ) {
 	case 2:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -446,14 +468,14 @@ case 7:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 450 "edn_parser.cc"
+#line 472 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 242 "edn_parser.rl"
+#line 264 "edn_parser.rl"
 
     if (cs >= EDN_string_first_final) {
         return p + 1;
@@ -462,7 +484,7 @@ case 7:
         return pe;
     }
     else if (cs == EDN_string_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -471,7 +493,7 @@ case 7:
 // keyword parsing
 //
 
-#line 475 "edn_parser.cc"
+#line 497 "edn_parser.cc"
 static const int EDN_keyword_start = 1;
 static const int EDN_keyword_first_final = 3;
 static const int EDN_keyword_error = 0;
@@ -479,7 +501,7 @@ static const int EDN_keyword_error = 0;
 static const int EDN_keyword_en_main = 1;
 
 
-#line 272 "edn_parser.rl"
+#line 294 "edn_parser.rl"
 
 
 
@@ -488,15 +510,15 @@ const char* edn::Parser::parse_keyword(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 492 "edn_parser.cc"
+#line 514 "edn_parser.cc"
 	{
 	cs = EDN_keyword_start;
 	}
 
-#line 280 "edn_parser.rl"
+#line 302 "edn_parser.rl"
     const char* p_save = p;
 
-#line 500 "edn_parser.cc"
+#line 522 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -563,14 +585,14 @@ case 3:
 		goto st3;
 	goto tr3;
 tr3:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 574 "edn_parser.cc"
+#line 596 "edn_parser.cc"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -609,7 +631,7 @@ case 5:
 	_out: {}
 	}
 
-#line 282 "edn_parser.rl"
+#line 304 "edn_parser.rl"
 
     if (cs >= EDN_keyword_first_final) {
         std::string buf;
@@ -624,7 +646,7 @@ case 5:
         return pe;
     }
     else if (cs == EDN_keyword_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -633,14 +655,14 @@ case 5:
 // decimal parsing machine
 //
 
-#line 637 "edn_parser.cc"
+#line 659 "edn_parser.cc"
 static const int EDN_decimal_start = 1;
 static const int EDN_decimal_first_final = 9;
 
 static const int EDN_decimal_en_main = 1;
 
 
-#line 315 "edn_parser.rl"
+#line 337 "edn_parser.rl"
 
 
 
@@ -649,15 +671,15 @@ const char* edn::Parser::parse_decimal(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 653 "edn_parser.cc"
+#line 675 "edn_parser.cc"
 	{
 	cs = EDN_decimal_start;
 	}
 
-#line 323 "edn_parser.rl"
+#line 345 "edn_parser.rl"
     const char* p_save = p;
 
-#line 661 "edn_parser.cc"
+#line 683 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -711,14 +733,14 @@ case 9:
 		goto st0;
 	goto tr10;
 tr10:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 10; goto _out;} }
 	goto st10;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 722 "edn_parser.cc"
+#line 744 "edn_parser.cc"
 	goto st0;
 st4:
 	if ( ++p == pe )
@@ -834,14 +856,14 @@ case 8:
 	_out: {}
 	}
 
-#line 325 "edn_parser.rl"
+#line 347 "edn_parser.rl"
 
     if (cs >= EDN_decimal_first_final) {
         v = edn::util::float_to_ruby(p_save, p - p_save);
         return p + 1;
     }
     else if (cs == EDN_decimal_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -849,14 +871,14 @@ case 8:
 // integer parsing machine - M suffix will return a BigNum
 //
 
-#line 853 "edn_parser.cc"
+#line 875 "edn_parser.cc"
 static const int EDN_integer_start = 1;
 static const int EDN_integer_first_final = 3;
 
 static const int EDN_integer_en_main = 1;
 
 
-#line 348 "edn_parser.rl"
+#line 370 "edn_parser.rl"
 
 
 const char* edn::Parser::parse_integer(const char *p, const char *pe, VALUE& v)
@@ -864,15 +886,15 @@ const char* edn::Parser::parse_integer(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 868 "edn_parser.cc"
+#line 890 "edn_parser.cc"
 	{
 	cs = EDN_integer_start;
 	}
 
-#line 355 "edn_parser.rl"
+#line 377 "edn_parser.rl"
     const char* p_save = p;
 
-#line 876 "edn_parser.cc"
+#line 898 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -914,14 +936,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 925 "edn_parser.cc"
+#line 947 "edn_parser.cc"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -962,14 +984,14 @@ case 6:
 	_out: {}
 	}
 
-#line 357 "edn_parser.rl"
+#line 379 "edn_parser.rl"
 
     if (cs >= EDN_integer_first_final) {
         v = edn::util::integer_to_ruby(p_save, p - p_save);
         return p + 1;
     }
     else if (cs == EDN_integer_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -982,7 +1004,7 @@ case 6:
 // 3. stand-alone operators: +, -, /, *, etc.
 //
 
-#line 986 "edn_parser.cc"
+#line 1008 "edn_parser.cc"
 static const int EDN_operator_start = 1;
 static const int EDN_operator_first_final = 3;
 static const int EDN_operator_error = 0;
@@ -990,7 +1012,7 @@ static const int EDN_operator_error = 0;
 static const int EDN_operator_en_main = 1;
 
 
-#line 431 "edn_parser.rl"
+#line 453 "edn_parser.rl"
 
 
 
@@ -999,15 +1021,15 @@ const char* edn::Parser::parse_operator(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 1003 "edn_parser.cc"
+#line 1025 "edn_parser.cc"
 	{
 	cs = EDN_operator_start;
 	}
 
-#line 439 "edn_parser.rl"
+#line 461 "edn_parser.rl"
     const char* p_save = p;
 
-#line 1011 "edn_parser.cc"
+#line 1033 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1060,84 +1082,84 @@ case 3:
 		goto tr9;
 	goto tr6;
 tr6:
-#line 415 "edn_parser.rl"
+#line 437 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 tr11:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 tr17:
-#line 381 "edn_parser.rl"
+#line 403 "edn_parser.rl"
 	{
         // parse a symbol including the leading operator (-, +, .)
         VALUE sym = Qnil;
         const char *np = parse_symbol(p_save, pe, sym);
-        if (np == NULL) { {p = (( pe))-1;} } else {
+        if (np == nullptr) { {p = (( pe))-1;} } else {
             if (sym != Qnil)
                 v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
             {p = (( np))-1;}
         }
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 1097 "edn_parser.cc"
+#line 1119 "edn_parser.cc"
 	goto st0;
 tr5:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st5;
 tr7:
-#line 415 "edn_parser.rl"
+#line 437 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 tr8:
-#line 415 "edn_parser.rl"
+#line 437 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
     }
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 tr12:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 tr13:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 1141 "edn_parser.cc"
+#line 1163 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr13;
 		case 32: goto tr12;
@@ -1162,25 +1184,25 @@ case 5:
 		goto st0;
 	goto tr11;
 tr10:
-#line 415 "edn_parser.rl"
+#line 437 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 tr14:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 1184 "edn_parser.cc"
+#line 1206 "edn_parser.cc"
 	if ( (*p) == 10 )
 		goto tr5;
 	goto st2;
@@ -1192,12 +1214,12 @@ case 2:
 		goto tr5;
 	goto st2;
 tr9:
-#line 381 "edn_parser.rl"
+#line 403 "edn_parser.rl"
 	{
         // parse a symbol including the leading operator (-, +, .)
         VALUE sym = Qnil;
         const char *np = parse_symbol(p_save, pe, sym);
-        if (np == NULL) { {p = (( pe))-1;} } else {
+        if (np == nullptr) { {p = (( pe))-1;} } else {
             if (sym != Qnil)
                 v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
             {p = (( np))-1;}
@@ -1205,7 +1227,7 @@ tr9:
     }
 	goto st7;
 tr16:
-#line 392 "edn_parser.rl"
+#line 414 "edn_parser.rl"
 	{
         // parse a number with the leading symbol - this is slightly
         // different than the one within EDN_value since it includes
@@ -1213,7 +1235,7 @@ tr16:
         //
         // try to parse a decimal first
         const char *np = parse_decimal(p_save, pe, v);
-        if (np == NULL) {
+        if (np == nullptr) {
             // if we can't, try to parse it as an int
             np = parse_integer(p_save, pe, v);
         }
@@ -1233,7 +1255,7 @@ st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 1237 "edn_parser.cc"
+#line 1259 "edn_parser.cc"
 	switch( (*p) ) {
 		case 33: goto st0;
 		case 95: goto st0;
@@ -1316,12 +1338,12 @@ case 9:
 		goto tr18;
 	goto tr17;
 tr18:
-#line 381 "edn_parser.rl"
+#line 403 "edn_parser.rl"
 	{
         // parse a symbol including the leading operator (-, +, .)
         VALUE sym = Qnil;
         const char *np = parse_symbol(p_save, pe, sym);
-        if (np == NULL) { {p = (( pe))-1;} } else {
+        if (np == nullptr) { {p = (( pe))-1;} } else {
             if (sym != Qnil)
                 v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
             {p = (( np))-1;}
@@ -1332,7 +1354,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1336 "edn_parser.cc"
+#line 1358 "edn_parser.cc"
 	switch( (*p) ) {
 		case 33: goto st10;
 		case 95: goto st10;
@@ -1405,12 +1427,12 @@ case 11:
 	{
 	switch ( cs ) {
 	case 9:
-#line 381 "edn_parser.rl"
+#line 403 "edn_parser.rl"
 	{
         // parse a symbol including the leading operator (-, +, .)
         VALUE sym = Qnil;
         const char *np = parse_symbol(p_save, pe, sym);
-        if (np == NULL) { {p = (( pe))-1;} } else {
+        if (np == nullptr) { {p = (( pe))-1;} } else {
             if (sym != Qnil)
                 v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
             {p = (( np))-1;}
@@ -1420,7 +1442,7 @@ case 11:
 	case 3:
 	case 8:
 	case 11:
-#line 415 "edn_parser.rl"
+#line 437 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
@@ -1428,14 +1450,14 @@ case 11:
         v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
     }
 	break;
-#line 1432 "edn_parser.cc"
+#line 1454 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 441 "edn_parser.rl"
+#line 463 "edn_parser.rl"
 
     if (cs >= EDN_operator_first_final) {
         return p;
@@ -1445,7 +1467,7 @@ case 11:
         return pe;
     }
     else if (cs == EDN_operator_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -1454,7 +1476,7 @@ case 11:
 // escaped char parsing - handles \c, \newline, \formfeed, etc.
 //
 
-#line 1458 "edn_parser.cc"
+#line 1480 "edn_parser.cc"
 static const int EDN_escaped_char_start = 1;
 static const int EDN_escaped_char_first_final = 26;
 static const int EDN_escaped_char_error = 0;
@@ -1462,7 +1484,7 @@ static const int EDN_escaped_char_error = 0;
 static const int EDN_escaped_char_en_main = 1;
 
 
-#line 471 "edn_parser.rl"
+#line 493 "edn_parser.rl"
 
 
 
@@ -1471,15 +1493,15 @@ const char* edn::Parser::parse_esc_char(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 1475 "edn_parser.cc"
+#line 1497 "edn_parser.cc"
 	{
 	cs = EDN_escaped_char_start;
 	}
 
-#line 479 "edn_parser.rl"
+#line 501 "edn_parser.rl"
     const char* p_save = p;
 
-#line 1483 "edn_parser.cc"
+#line 1505 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1524,20 +1546,20 @@ case 26:
 		goto tr28;
 	goto st0;
 tr10:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 tr28:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 1541 "edn_parser.cc"
+#line 1563 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr10;
 		case 32: goto tr28;
@@ -1555,14 +1577,14 @@ case 3:
 		goto tr10;
 	goto st3;
 tr29:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 28; goto _out;} }
 	goto st28;
 st28:
 	if ( ++p == pe )
 		goto _test_eof28;
 case 28:
-#line 1566 "edn_parser.cc"
+#line 1588 "edn_parser.cc"
 	goto st0;
 st29:
 	if ( ++p == pe )
@@ -1871,7 +1893,7 @@ case 25:
 	_out: {}
 	}
 
-#line 481 "edn_parser.rl"
+#line 503 "edn_parser.rl"
 
     if (cs >= EDN_escaped_char_first_final) {
         // convert the escaped value to a character
@@ -1885,7 +1907,7 @@ case 25:
         return pe;
     }
     else if (cs == EDN_escaped_char_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -1898,7 +1920,7 @@ case 25:
 //
 //
 
-#line 1902 "edn_parser.cc"
+#line 1924 "edn_parser.cc"
 static const int EDN_symbol_start = 1;
 static const int EDN_symbol_first_final = 4;
 static const int EDN_symbol_error = 0;
@@ -1906,7 +1928,7 @@ static const int EDN_symbol_error = 0;
 static const int EDN_symbol_en_main = 1;
 
 
-#line 532 "edn_parser.rl"
+#line 554 "edn_parser.rl"
 
 
 
@@ -1915,15 +1937,15 @@ const char* edn::Parser::parse_symbol(const char *p, const char *pe, VALUE& s)
     int cs;
 
 
-#line 1919 "edn_parser.cc"
+#line 1941 "edn_parser.cc"
 	{
 	cs = EDN_symbol_start;
 	}
 
-#line 540 "edn_parser.rl"
+#line 562 "edn_parser.rl"
     const char* p_save = p;
 
-#line 1927 "edn_parser.cc"
+#line 1949 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1985,34 +2007,34 @@ case 4:
 		goto st4;
 	goto tr7;
 tr7:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 1996 "edn_parser.cc"
+#line 2018 "edn_parser.cc"
 	goto st0;
 tr4:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st6;
 tr8:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 tr9:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 2016 "edn_parser.cc"
+#line 2038 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr9;
 		case 32: goto tr8;
@@ -2037,14 +2059,14 @@ case 6:
 		goto st0;
 	goto tr7;
 tr11:
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 7; goto _out;} }
 	goto st7;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 2048 "edn_parser.cc"
+#line 2070 "edn_parser.cc"
 	if ( (*p) == 10 )
 		goto tr4;
 	goto st2;
@@ -2152,7 +2174,7 @@ case 9:
 	_out: {}
 	}
 
-#line 542 "edn_parser.rl"
+#line 564 "edn_parser.rl"
 
     if (cs >= EDN_symbol_first_final) {
         // copy the symbol text
@@ -2165,7 +2187,7 @@ case 9:
         error(__FUNCTION__, "invalid symbol sequence", *p);
     }
     else if (cs == EDN_symbol_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -2177,13 +2199,13 @@ case 9:
 // sets the same array is used)
 //
 
-#line 620 "edn_parser.rl"
+#line 642 "edn_parser.rl"
 
 
 //
 // vector-specific machine
 
-#line 2187 "edn_parser.cc"
+#line 2209 "edn_parser.cc"
 static const int EDN_vector_start = 1;
 static const int EDN_vector_first_final = 4;
 static const int EDN_vector_error = 0;
@@ -2191,7 +2213,7 @@ static const int EDN_vector_error = 0;
 static const int EDN_vector_en_main = 1;
 
 
-#line 635 "edn_parser.rl"
+#line 657 "edn_parser.rl"
 
 
 
@@ -2206,14 +2228,14 @@ const char* edn::Parser::parse_vector(const char *p, const char *pe, VALUE& v)
     VALUE elems; // will store the vector's elements - allocated in @open_seq
 
 
-#line 2210 "edn_parser.cc"
+#line 2232 "edn_parser.cc"
 	{
 	cs = EDN_vector_start;
 	}
 
-#line 649 "edn_parser.rl"
+#line 671 "edn_parser.rl"
 
-#line 2217 "edn_parser.cc"
+#line 2239 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2224,7 +2246,7 @@ case 1:
 		goto tr0;
 	goto st0;
 tr2:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2232,12 +2254,12 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 2236 "edn_parser.cc"
+#line 2258 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 569 "edn_parser.rl"
+#line 591 "edn_parser.rl"
 	{
         // sequences store elements in an array, then process it to
         // convert it to a list, set, or map as needed once the
@@ -2249,11 +2271,11 @@ tr0:
     }
 	goto st2;
 tr4:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
 tr5:
-#line 584 "edn_parser.rl"
+#line 606 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2262,7 +2284,7 @@ tr5:
         VALUE e;
         std::size_t meta_sz = meta_size();
         const char *np = parse_value(p, pe, e);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {
             // if there's an entry in the discard list, the current
             // object is not meant to be kept due to a #_ so don't
             // push it into the list of elements
@@ -2291,7 +2313,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2295 "edn_parser.cc"
+#line 2317 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr4;
 		case 32: goto st2;
@@ -2322,19 +2344,19 @@ case 3:
 		goto tr4;
 	goto st3;
 tr7:
-#line 579 "edn_parser.rl"
+#line 601 "edn_parser.rl"
 	{
         // remove the current metadata level
         del_top_meta_list();
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2338 "edn_parser.cc"
+#line 2360 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2347,7 +2369,7 @@ case 4:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2355,14 +2377,14 @@ case 4:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 2359 "edn_parser.cc"
+#line 2381 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 650 "edn_parser.rl"
+#line 672 "edn_parser.rl"
 
     if (cs >= EDN_vector_first_final) {
         v = elems;
@@ -2373,7 +2395,7 @@ case 4:
         return pe;
     }
     else if (cs == EDN_vector_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -2382,7 +2404,7 @@ case 4:
 // list parsing machine
 //
 
-#line 2386 "edn_parser.cc"
+#line 2408 "edn_parser.cc"
 static const int EDN_list_start = 1;
 static const int EDN_list_first_final = 4;
 static const int EDN_list_error = 0;
@@ -2390,7 +2412,7 @@ static const int EDN_list_error = 0;
 static const int EDN_list_en_main = 1;
 
 
-#line 679 "edn_parser.rl"
+#line 701 "edn_parser.rl"
 
 
 //
@@ -2404,14 +2426,14 @@ const char* edn::Parser::parse_list(const char *p, const char *pe, VALUE& v)
     VALUE elems; // stores the list's elements - allocated in @open_seq
 
 
-#line 2408 "edn_parser.cc"
+#line 2430 "edn_parser.cc"
 	{
 	cs = EDN_list_start;
 	}
 
-#line 692 "edn_parser.rl"
+#line 714 "edn_parser.rl"
 
-#line 2415 "edn_parser.cc"
+#line 2437 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2422,7 +2444,7 @@ case 1:
 		goto tr0;
 	goto st0;
 tr2:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2430,12 +2452,12 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 2434 "edn_parser.cc"
+#line 2456 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 569 "edn_parser.rl"
+#line 591 "edn_parser.rl"
 	{
         // sequences store elements in an array, then process it to
         // convert it to a list, set, or map as needed once the
@@ -2447,11 +2469,11 @@ tr0:
     }
 	goto st2;
 tr4:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
 tr5:
-#line 584 "edn_parser.rl"
+#line 606 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2460,7 +2482,7 @@ tr5:
         VALUE e;
         std::size_t meta_sz = meta_size();
         const char *np = parse_value(p, pe, e);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {
             // if there's an entry in the discard list, the current
             // object is not meant to be kept due to a #_ so don't
             // push it into the list of elements
@@ -2489,7 +2511,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2493 "edn_parser.cc"
+#line 2515 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr4;
 		case 32: goto st2;
@@ -2513,19 +2535,19 @@ case 2:
 		goto tr5;
 	goto tr2;
 tr6:
-#line 579 "edn_parser.rl"
+#line 601 "edn_parser.rl"
 	{
         // remove the current metadata level
         del_top_meta_list();
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2529 "edn_parser.cc"
+#line 2551 "edn_parser.cc"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -2545,7 +2567,7 @@ case 3:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2553,14 +2575,14 @@ case 3:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 2557 "edn_parser.cc"
+#line 2579 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 693 "edn_parser.rl"
+#line 715 "edn_parser.rl"
 
     if (cs >= EDN_list_first_final) {
         v = elems;
@@ -2573,7 +2595,7 @@ case 3:
         return pe;
     }
     else if (cs == EDN_list_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -2582,7 +2604,7 @@ case 3:
 // hash parsing
 //
 
-#line 2586 "edn_parser.cc"
+#line 2608 "edn_parser.cc"
 static const int EDN_map_start = 1;
 static const int EDN_map_first_final = 4;
 static const int EDN_map_error = 0;
@@ -2590,7 +2612,7 @@ static const int EDN_map_error = 0;
 static const int EDN_map_en_main = 1;
 
 
-#line 725 "edn_parser.rl"
+#line 747 "edn_parser.rl"
 
 
 
@@ -2604,14 +2626,14 @@ const char* edn::Parser::parse_map(const char *p, const char *pe, VALUE& v)
     VALUE elems;
 
 
-#line 2608 "edn_parser.cc"
+#line 2630 "edn_parser.cc"
 	{
 	cs = EDN_map_start;
 	}
 
-#line 738 "edn_parser.rl"
+#line 760 "edn_parser.rl"
 
-#line 2615 "edn_parser.cc"
+#line 2637 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2622,7 +2644,7 @@ case 1:
 		goto tr0;
 	goto st0;
 tr2:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2630,12 +2652,12 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 2634 "edn_parser.cc"
+#line 2656 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 569 "edn_parser.rl"
+#line 591 "edn_parser.rl"
 	{
         // sequences store elements in an array, then process it to
         // convert it to a list, set, or map as needed once the
@@ -2647,11 +2669,11 @@ tr0:
     }
 	goto st2;
 tr4:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
 tr5:
-#line 584 "edn_parser.rl"
+#line 606 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2660,7 +2682,7 @@ tr5:
         VALUE e;
         std::size_t meta_sz = meta_size();
         const char *np = parse_value(p, pe, e);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {
             // if there's an entry in the discard list, the current
             // object is not meant to be kept due to a #_ so don't
             // push it into the list of elements
@@ -2689,7 +2711,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2693 "edn_parser.cc"
+#line 2715 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr4;
 		case 32: goto st2;
@@ -2723,19 +2745,19 @@ case 3:
 		goto tr4;
 	goto st3;
 tr7:
-#line 579 "edn_parser.rl"
+#line 601 "edn_parser.rl"
 	{
         // remove the current metadata level
         del_top_meta_list();
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2739 "edn_parser.cc"
+#line 2761 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2748,7 +2770,7 @@ case 4:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2756,14 +2778,14 @@ case 4:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 2760 "edn_parser.cc"
+#line 2782 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 739 "edn_parser.rl"
+#line 761 "edn_parser.rl"
 
     if (cs >= EDN_map_first_final) {
 
@@ -2788,7 +2810,7 @@ case 4:
         return pe;
     }
     else if (cs == EDN_map_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -2799,7 +2821,7 @@ case 4:
 // the remaining data to the correct parser
 //
 
-#line 2803 "edn_parser.cc"
+#line 2825 "edn_parser.cc"
 static const int EDN_dispatch_start = 1;
 static const int EDN_dispatch_first_final = 2;
 static const int EDN_dispatch_error = 0;
@@ -2807,7 +2829,7 @@ static const int EDN_dispatch_error = 0;
 static const int EDN_dispatch_en_main = 1;
 
 
-#line 803 "edn_parser.rl"
+#line 825 "edn_parser.rl"
 
 
 
@@ -2816,14 +2838,14 @@ const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 2820 "edn_parser.cc"
+#line 2842 "edn_parser.cc"
 	{
 	cs = EDN_dispatch_start;
 	}
 
-#line 811 "edn_parser.rl"
+#line 833 "edn_parser.rl"
 
-#line 2827 "edn_parser.cc"
+#line 2849 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2844,40 +2866,40 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 791 "edn_parser.rl"
+#line 813 "edn_parser.rl"
 	{
         // #inst, #uuid, or #user/tag
         const char *np = parse_tagged(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
 tr2:
-#line 785 "edn_parser.rl"
+#line 807 "edn_parser.rl"
 	{
         // discard token #_
         const char *np = parse_discard(p, pe);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
 tr3:
-#line 779 "edn_parser.rl"
+#line 801 "edn_parser.rl"
 	{
         // #{ }
         const char *np = parse_set(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2881 "edn_parser.cc"
+#line 2903 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2886,7 +2908,7 @@ case 2:
 	_out: {}
 	}
 
-#line 812 "edn_parser.rl"
+#line 834 "edn_parser.rl"
 
     if (cs >= EDN_dispatch_first_final) {
         return p + 1;
@@ -2897,7 +2919,7 @@ case 2:
     }
     else if (cs == EDN_dispatch_en_main) {} // silence ragel warning
 
-    return NULL;
+    return nullptr;
 }
 
 
@@ -2905,7 +2927,7 @@ case 2:
 // set parsing machine
 //
 
-#line 2909 "edn_parser.cc"
+#line 2931 "edn_parser.cc"
 static const int EDN_set_start = 1;
 static const int EDN_set_first_final = 4;
 static const int EDN_set_error = 0;
@@ -2913,7 +2935,7 @@ static const int EDN_set_error = 0;
 static const int EDN_set_en_main = 1;
 
 
-#line 841 "edn_parser.rl"
+#line 863 "edn_parser.rl"
 
 
 //
@@ -2927,14 +2949,14 @@ const char* edn::Parser::parse_set(const char *p, const char *pe, VALUE& v)
     VALUE elems; // holds the set's elements as an array allocated in @open_seq
 
 
-#line 2931 "edn_parser.cc"
+#line 2953 "edn_parser.cc"
 	{
 	cs = EDN_set_start;
 	}
 
-#line 854 "edn_parser.rl"
+#line 876 "edn_parser.rl"
 
-#line 2938 "edn_parser.cc"
+#line 2960 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2945,7 +2967,7 @@ case 1:
 		goto tr0;
 	goto st0;
 tr2:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2953,12 +2975,12 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 2957 "edn_parser.cc"
+#line 2979 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 569 "edn_parser.rl"
+#line 591 "edn_parser.rl"
 	{
         // sequences store elements in an array, then process it to
         // convert it to a list, set, or map as needed once the
@@ -2970,11 +2992,11 @@ tr0:
     }
 	goto st2;
 tr4:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
 tr5:
-#line 584 "edn_parser.rl"
+#line 606 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2983,7 +3005,7 @@ tr5:
         VALUE e;
         std::size_t meta_sz = meta_size();
         const char *np = parse_value(p, pe, e);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {
             // if there's an entry in the discard list, the current
             // object is not meant to be kept due to a #_ so don't
             // push it into the list of elements
@@ -3012,7 +3034,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3016 "edn_parser.cc"
+#line 3038 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr4;
 		case 32: goto st2;
@@ -3046,19 +3068,19 @@ case 3:
 		goto tr4;
 	goto st3;
 tr7:
-#line 579 "edn_parser.rl"
+#line 601 "edn_parser.rl"
 	{
         // remove the current metadata level
         del_top_meta_list();
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 3062 "edn_parser.cc"
+#line 3084 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -3071,7 +3093,7 @@ case 4:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 51 "edn_parser.rl"
+#line 73 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -3079,14 +3101,14 @@ case 4:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 3083 "edn_parser.cc"
+#line 3105 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 855 "edn_parser.rl"
+#line 877 "edn_parser.rl"
 
     if (cs >= EDN_set_first_final) {
         // all elements collected; now convert to a set
@@ -3098,7 +3120,7 @@ case 4:
         return pe;
     }
     else if (cs == EDN_set_en_main) {} // silence ragel warning
-    return NULL;
+    return nullptr;
 }
 
 
@@ -3109,7 +3131,7 @@ case 4:
 // defining a machine to consume items within container delimiters
 //
 
-#line 3113 "edn_parser.cc"
+#line 3135 "edn_parser.cc"
 static const int EDN_discard_start = 1;
 static const int EDN_discard_first_final = 4;
 static const int EDN_discard_error = 0;
@@ -3117,7 +3139,7 @@ static const int EDN_discard_error = 0;
 static const int EDN_discard_en_main = 1;
 
 
-#line 905 "edn_parser.rl"
+#line 927 "edn_parser.rl"
 
 
 
@@ -3127,14 +3149,14 @@ const char* edn::Parser::parse_discard(const char *p, const char *pe)
     VALUE v;
 
 
-#line 3131 "edn_parser.cc"
+#line 3153 "edn_parser.cc"
 	{
 	cs = EDN_discard_start;
 	}
 
-#line 914 "edn_parser.rl"
+#line 936 "edn_parser.rl"
 
-#line 3138 "edn_parser.cc"
+#line 3160 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3145,7 +3167,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr2:
-#line 895 "edn_parser.rl"
+#line 917 "edn_parser.rl"
 	{
         std::stringstream s;
         s << "discard sequence without element to discard";
@@ -3153,19 +3175,19 @@ tr2:
         p--; {p++; cs = 0; goto _out;}
     }
 	goto st0;
-#line 3157 "edn_parser.cc"
+#line 3179 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
 tr3:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3169 "edn_parser.cc"
+#line 3191 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st2;
@@ -3191,10 +3213,10 @@ case 2:
 		goto tr4;
 	goto tr2;
 tr4:
-#line 884 "edn_parser.rl"
+#line 906 "edn_parser.rl"
 	{
         const char *np = parse_value(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 4; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 4; goto _out;} } else {
             // this token is to be discarded so store it in the
             // discard stack - we really don't need to save it so this
             // could be simplified
@@ -3202,14 +3224,14 @@ tr4:
             {p = (( np))-1;}
         }
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 3213 "edn_parser.cc"
+#line 3235 "edn_parser.cc"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -3228,7 +3250,7 @@ case 3:
 	{
 	switch ( cs ) {
 	case 2:
-#line 895 "edn_parser.rl"
+#line 917 "edn_parser.rl"
 	{
         std::stringstream s;
         s << "discard sequence without element to discard";
@@ -3236,14 +3258,14 @@ case 3:
         p--; {p++; cs = 0; goto _out;}
     }
 	break;
-#line 3240 "edn_parser.cc"
+#line 3262 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 915 "edn_parser.rl"
+#line 937 "edn_parser.rl"
 
     if (cs >= EDN_discard_first_final) {
         return p + 1;
@@ -3254,7 +3276,7 @@ case 3:
     }
     else if (cs == EDN_discard_en_main) {} // silence ragel warning
 
-    return NULL;
+    return nullptr;
 }
 
 
@@ -3274,7 +3296,7 @@ case 3:
 // 2. add parse checks for uuid and inst for better error reporting
 //
 
-#line 3278 "edn_parser.cc"
+#line 3300 "edn_parser.cc"
 static const int EDN_tagged_start = 1;
 static const int EDN_tagged_first_final = 7;
 static const int EDN_tagged_error = 0;
@@ -3282,7 +3304,7 @@ static const int EDN_tagged_error = 0;
 static const int EDN_tagged_en_main = 1;
 
 
-#line 983 "edn_parser.rl"
+#line 1005 "edn_parser.rl"
 
 
 
@@ -3296,14 +3318,14 @@ const char* edn::Parser::parse_tagged(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 3300 "edn_parser.cc"
+#line 3322 "edn_parser.cc"
 	{
 	cs = EDN_tagged_start;
 	}
 
-#line 996 "edn_parser.rl"
+#line 1018 "edn_parser.rl"
 
-#line 3307 "edn_parser.cc"
+#line 3329 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3320,11 +3342,11 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 962 "edn_parser.rl"
+#line 984 "edn_parser.rl"
 	{
         // parses the symbol portion of the pair
         const char *np = parse_symbol(p, pe, sym_name);
-        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } else {
             sym_ok = true;
             {p = (( np))-1;}
         }
@@ -3334,7 +3356,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3338 "edn_parser.cc"
+#line 3360 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
@@ -3360,14 +3382,14 @@ case 2:
 		goto st2;
 	goto st0;
 tr3:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 3371 "edn_parser.cc"
+#line 3393 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
@@ -3393,23 +3415,23 @@ case 3:
 		goto tr7;
 	goto st0;
 tr7:
-#line 970 "edn_parser.rl"
+#line 992 "edn_parser.rl"
 	{
         // parses the value portion
         const char *np = parse_value(p, pe, data);
-        if (np == NULL) { p--; {p++; cs = 7; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 7; goto _out;} } else {
             data_ok = true;
             {p = (( np))-1;}
         }
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 7; goto _out;} }
 	goto st7;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 3413 "edn_parser.cc"
+#line 3435 "edn_parser.cc"
 	goto st0;
 st4:
 	if ( ++p == pe )
@@ -3487,7 +3509,7 @@ case 6:
 	_out: {}
 	}
 
-#line 997 "edn_parser.rl"
+#line 1019 "edn_parser.rl"
 
     if (cs >= EDN_tagged_first_final) {
         //std::cerr << __FUNCTION__ << " parse symbol name as '" << sym_name << "', value is: " << data << std::endl;
@@ -3495,7 +3517,7 @@ case 6:
         if (!sym_ok || !data_ok) {
             error(__FUNCTION__, "tagged element symbol error", *p);
             v = EDN_EOF_CONST;
-            return NULL;
+            return nullptr;
         }
 
         try {
@@ -3513,7 +3535,7 @@ case 6:
     }
     else if (cs == EDN_tagged_en_main) {} // silence ragel warning
     v =  EDN_EOF_CONST;
-    return NULL;
+    return nullptr;
 }
 
 
@@ -3525,7 +3547,7 @@ case 6:
 // useful?
 //
 
-#line 3529 "edn_parser.cc"
+#line 3551 "edn_parser.cc"
 static const int EDN_meta_start = 1;
 static const int EDN_meta_first_final = 3;
 static const int EDN_meta_error = 0;
@@ -3533,7 +3555,7 @@ static const int EDN_meta_error = 0;
 static const int EDN_meta_en_main = 1;
 
 
-#line 1047 "edn_parser.rl"
+#line 1069 "edn_parser.rl"
 
 
 
@@ -3543,14 +3565,14 @@ const char* edn::Parser::parse_meta(const char *p, const char *pe)
     VALUE v;
 
 
-#line 3547 "edn_parser.cc"
+#line 3569 "edn_parser.cc"
 	{
 	cs = EDN_meta_start;
 	}
 
-#line 1056 "edn_parser.rl"
+#line 1078 "edn_parser.rl"
 
-#line 3554 "edn_parser.cc"
+#line 3576 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3589,19 +3611,19 @@ case 2:
 		goto tr2;
 	goto st0;
 tr2:
-#line 1039 "edn_parser.rl"
+#line 1061 "edn_parser.rl"
 	{
         const char *np = parse_value(p, pe, v);
-        if (np == NULL) { p--; {p++; cs = 3; goto _out;} } else { {p = (( np))-1;} }
+        if (np == nullptr) { p--; {p++; cs = 3; goto _out;} } else { {p = (( np))-1;} }
     }
-#line 58 "edn_parser.rl"
+#line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 3; goto _out;} }
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 3605 "edn_parser.cc"
+#line 3627 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -3611,7 +3633,7 @@ case 3:
 	_out: {}
 	}
 
-#line 1057 "edn_parser.rl"
+#line 1079 "edn_parser.rl"
 
     if (cs >= EDN_meta_first_final) {
         append_to_meta(v);
@@ -3623,7 +3645,7 @@ case 3:
     }
     else if (cs == EDN_meta_en_main) {} // silence ragel warning
 
-    return NULL;
+    return nullptr;
 }
 
 
@@ -3633,7 +3655,7 @@ case 3:
 // top-level, therefore, does not tokenize source stream
 //
 
-#line 3637 "edn_parser.cc"
+#line 3659 "edn_parser.cc"
 static const int EDN_parser_start = 2;
 static const int EDN_parser_first_final = 2;
 static const int EDN_parser_error = 0;
@@ -3641,7 +3663,7 @@ static const int EDN_parser_error = 0;
 static const int EDN_parser_en_main = 2;
 
 
-#line 1106 "edn_parser.rl"
+#line 1128 "edn_parser.rl"
 
 
 
@@ -3651,33 +3673,33 @@ VALUE edn::Parser::parse(const char* src, std::size_t len)
     VALUE result = EDN_EOF_CONST;
 
 
-#line 3655 "edn_parser.cc"
+#line 3677 "edn_parser.cc"
 	{
 	cs = EDN_parser_start;
 	}
 
-#line 1115 "edn_parser.rl"
+#line 1137 "edn_parser.rl"
     set_source(src, len);
 
-#line 3663 "edn_parser.cc"
+#line 3685 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
 tr1:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 1083 "edn_parser.rl"
+#line 1105 "edn_parser.rl"
 	{
         // save the count of metadata items before we parse this value
         // so we can determine if we've read another metadata value or
         // an actual data item
         std::size_t meta_sz = meta_size();
         const char* np = parse_value(p, pe, result);
-        if (np == NULL) { {p = (( pe))-1;} {p++; cs = 2; goto _out;} } else {
+        if (np == nullptr) { {p = (( pe))-1;} {p++; cs = 2; goto _out;} } else {
             // if we have metadata saved and it matches the count we
             // saved before we parsed a value, then we must bind the
             // metadata sequence to it
@@ -3693,7 +3715,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3697 "edn_parser.cc"
+#line 3719 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr1;
 		case 32: goto st2;
@@ -3736,14 +3758,14 @@ case 1:
 	_out: {}
 	}
 
-#line 1117 "edn_parser.rl"
+#line 1139 "edn_parser.rl"
 
     if (cs == EDN_parser_error) {
         error(__FUNCTION__, *p);
         return EDN_EOF_CONST;
     }
     else if (cs == EDN_parser_first_final) {
-        p = pe = eof = NULL;
+        p = pe = eof = nullptr;
     }
     else if (cs == EDN_parser_en_main) {} // silence ragel warning
     return result;
@@ -3754,13 +3776,13 @@ case 1:
 // token-by-token machine
 //
 
-#line 3758 "edn_parser.cc"
+#line 3780 "edn_parser.cc"
 static const int EDN_tokens_start = 1;
 
 static const int EDN_tokens_en_main = 1;
 
 
-#line 1171 "edn_parser.rl"
+#line 1193 "edn_parser.rl"
 
 
 
@@ -3779,28 +3801,28 @@ edn::Parser::eTokenState edn::Parser::parse_next(VALUE& value)
     discard.clear();
 
 
-#line 3783 "edn_parser.cc"
+#line 3805 "edn_parser.cc"
 	{
 	cs = EDN_tokens_start;
 	}
 
-#line 1189 "edn_parser.rl"
+#line 1211 "edn_parser.rl"
 
-#line 3790 "edn_parser.cc"
+#line 3812 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
 tr2:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st1;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 3804 "edn_parser.cc"
+#line 3826 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr2;
 		case 32: goto st1;
@@ -3829,11 +3851,11 @@ st0:
 cs = 0;
 	goto _out;
 tr6:
-#line 25 "edn_parser.rl"
+#line 47 "edn_parser.rl"
 	{ line_number++; }
 	goto st4;
 tr3:
-#line 1139 "edn_parser.rl"
+#line 1161 "edn_parser.rl"
 	{
         // we won't know if we've parsed a discard or a metadata until
         // after parse_value() is done. Save the current number of
@@ -3842,7 +3864,7 @@ tr3:
         meta_sz = meta_size();
 
         const char* np = parse_value(p, pe, value);
-        if (np == NULL) { p--; {p++; cs = 4; goto _out;} } else {
+        if (np == nullptr) { p--; {p++; cs = 4; goto _out;} } else {
             if (!meta_empty()) {
                 // was an additional metadata entry read? if so, don't
                 // return a value
@@ -3869,7 +3891,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 3873 "edn_parser.cc"
+#line 3895 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr6;
 		case 32: goto st4;
@@ -3903,7 +3925,7 @@ case 3:
 	_out: {}
 	}
 
-#line 1190 "edn_parser.rl"
+#line 1212 "edn_parser.rl"
 
     if (cs == EDN_tokens_en_main) {} // silence ragel warning
     return state;