edn_turbo 0.5.7 → 0.7.1

data/ext/edn_turbo/edn_parser.rl

@@ -1,3 +1,25 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2015-2021 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>
@@ -19,43 +41,43 @@
 //
 
 %%{
-        machine EDN_common;
-
-        cr             = '\n';
-        counter        = ( cr @{ line_number++; } );
-        cr_neg         = [^\n];
-        ws             = [\t\v\f\r ] | ',' | counter;
-        comment        = ';' cr_neg* counter;
-        ignore         = ws | comment;
-
-        operators      = [/\.\*!_\?$%&<>\=+\-\'];
-
-        begin_dispatch = '#';
-        begin_keyword  = ':';
-        begin_char     = '\\';
-        begin_vector   = '[';
-        begin_map      = '{';
-        begin_list     = '(';
-        begin_meta     = '^';
-        string_delim   = '"';
-        begin_number   = digit;
-        begin_value    = alnum | [:\"\{\[\(\\\#^] | operators;
-        begin_symbol   = alpha;
-
-        # int / decimal rules
-        integer        = ('0' | [1-9] digit*);
-        exp            = ([Ee] [+\-]? digit+);
-
-
-        # common actions
-        action close_err {
-            std::stringstream s;
-            s << "unterminated " << EDN_TYPE;
-            error(__FUNCTION__, s.str());
-            fhold; fbreak;
-        }
-
-        action exit { fhold; fbreak; }
+   machine EDN_common;
+
+   cr             = '\n';
+   counter        = ( cr @{ line_number++; } );
+   cr_neg         = [^\n];
+   ws             = [\t\v\f\r ] | ',' | counter;
+   comment        = ';' cr_neg* counter;
+   ignore         = ws | comment;
+
+   operators      = [/\.\*!_\?$%&<>\=+\-\'];
+
+   begin_dispatch = '#';
+   begin_keyword  = ':';
+   begin_char     = '\\';
+   begin_vector   = '[';
+   begin_map      = '{';
+   begin_list     = '(';
+   begin_meta     = '^';
+   string_delim   = '"';
+   begin_number   = digit;
+   begin_value    = alnum | [:\"\{\[\(\\\#^] | operators;
+   begin_symbol   = alpha;
+
+   # int / decimal rules
+   integer        = ('0' | [1-9] digit*);
+   exp            = ([Ee] [+\-]? digit+);
+
+
+   # common actions
+   action close_err {
+      std::stringstream s;
+      s << "unterminated " << EDN_TYPE;
+      error(__FUNCTION__, s.str());
+      fhold; fbreak;
+   }
+
+   action exit { fhold; fbreak; }
 }%%
 
 // ============================================================
@@ -63,135 +85,140 @@
 //
 
 %%{
-    machine EDN_value;
-    include EDN_common;
-
-    write data;
-
-    action parse_val_string {
-        // string types within double-quotes
-        const char *np = parse_string(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_keyword {
-        // tokens with a leading ':'
-        const char *np = parse_keyword(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_number {
-        // tokens w/ leading digits: non-negative integers & decimals.
-        // try to parse a decimal first
-        const char *np = parse_decimal(fpc, pe, v);
-        if (np == NULL) {
-            // if we can't, try to parse it as an int
+   machine EDN_value;
+   include EDN_common;
+
+   write data;
+
+   action parse_val_string {
+      // string types within double-quotes
+      const char *np = parse_string(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_keyword {
+      // tokens with a leading ':'
+      const char *np = parse_keyword(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_number {
+      // tokens w/ leading digits: non-negative integers & decimals.
+      // try to parse a decimal first
+      const char *np = parse_decimal(fpc, pe, v);
+      if (np == nullptr) {
+         // if we can't, try to parse it as a ratio
+         np = parse_ratio(fpc, pe, v);
+
+         // otherwise, an int
+         if (np == nullptr) {
             np = parse_integer(fpc, pe, v);
-        }
-
-        if (np) {
-            fexec np;
-            fhold;
-            fbreak;
-        }
-        else {
-            error(__FUNCTION__, "number format error", *p);
-            fexec pe;
-        }
-    }
-
-    action parse_val_operator {
-        // stand-alone operators *, +, -, etc.
-        const char *np = parse_operator(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_char {
-        // tokens w/ leading \ (escaped characters \newline, \c, etc.)
-        const char *np = parse_esc_char(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_symbol {
-        // user identifiers and reserved keywords (true, false, nil)
-        VALUE sym = Qnil;
-        const char *np = parse_symbol(fpc, pe, sym);
-        if (np == NULL) { fexec pe; } 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; }
-            else if (std::strcmp(RSTRING_PTR(sym), "nil") == 0)   { v = Qnil; }
-            else {
-                v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
-            }
-            fexec np;
-        }
-    }
-
-    action parse_val_vector {
-        // [
-        const char *np = parse_vector(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_list {
-        // (
-        const char *np = parse_list(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_map {
-        // {
-        const char *np = parse_map(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_meta {
-        // ^
-        const char *np = parse_meta(fpc, pe);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_val_dispatch {
-        // handles tokens w/ leading # ("#_", "#{", and tagged elems)
-        const char *np = parse_dispatch(fpc + 1, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-
-    main := (
-             string_delim >parse_val_string |
-             begin_keyword >parse_val_keyword |
-             begin_number >parse_val_number |
-             operators >parse_val_operator |
-             begin_char >parse_val_char |
-             begin_symbol >parse_val_symbol |
-             begin_vector >parse_val_vector |
-             begin_list >parse_val_list |
-             begin_map >parse_val_map |
-             begin_meta >parse_val_meta |
-             begin_dispatch >parse_val_dispatch
-            ) %*exit;
+         }
+      }
+
+      if (np) {
+         fexec np;
+         fhold;
+         fbreak;
+      }
+      else {
+         error(__FUNCTION__, "number format error", *p);
+         fexec pe;
+      }
+   }
+
+   action parse_val_operator {
+      // stand-alone operators *, +, -, etc.
+      const char *np = parse_operator(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_char {
+      // tokens w/ leading \ (escaped characters \newline, \c, etc.)
+      const char *np = parse_esc_char(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_symbol {
+      // user identifiers and reserved keywords (true, false, nil)
+      VALUE sym = Qnil;
+      const char *np = parse_symbol(fpc, pe, sym);
+      if (np == nullptr) { fexec pe; } 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; }
+         else if (std::strcmp(RSTRING_PTR(sym), "nil") == 0)   { v = Qnil; }
+         else {
+            v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
+         }
+         fexec np;
+      }
+   }
+
+   action parse_val_vector {
+      // [
+      const char *np = parse_vector(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_list {
+      // (
+      const char *np = parse_list(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_map {
+      // {
+      const char *np = parse_map(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_meta {
+      // ^
+      const char *np = parse_meta(fpc, pe);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_val_dispatch {
+      // handles tokens w/ leading # ("#_", "#{", and tagged elems)
+      const char *np = parse_dispatch(fpc + 1, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+
+  main := (
+           string_delim >parse_val_string |
+           begin_keyword >parse_val_keyword |
+           begin_number >parse_val_number |
+           operators >parse_val_operator |
+           begin_char >parse_val_char |
+           begin_symbol >parse_val_symbol |
+           begin_vector >parse_val_vector |
+           begin_list >parse_val_list |
+           begin_map >parse_val_map |
+           begin_meta >parse_val_meta |
+           begin_dispatch >parse_val_dispatch
+          ) %*exit;
 }%%
 
 
 const char *edn::Parser::parse_value(const char *p, const char *pe, VALUE& v)
 {
-    //    std::cerr << __FUNCTION__ << "() p: \"" << p << "\"" << std::endl;
-    int cs;
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_value_first_final) {
-        return p;
-    }
-    else if (cs == EDN_value_error) {
-        error(__FUNCTION__, "token error", *p);
-        return pe;
-    }
-    else if (cs == EDN_value_en_main) {} // silence ragel warning
-    return NULL;
+   //    std::cerr << __FUNCTION__ << "() p: \"" << p << "\"" << std::endl;
+   int cs;
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_value_first_final) {
+      return p;
+   }
+   else if (cs == EDN_value_error) {
+      error(__FUNCTION__, "token error", *p);
+      return pe;
+   }
+   else if (cs == EDN_value_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -203,51 +230,51 @@ const char *edn::Parser::parse_value(const char *p, const char *pe, VALUE& v)
 // ascii range is found.
 //
 %%{
-    machine EDN_string;
-    include EDN_common;
-
-    write data;
-
-    action parse_chars {
-        if (edn::util::parse_byte_stream(p_save + 1, p, v, encode)) {
-            fexec p + 1;
-        } else {
-            fhold; fbreak;
-        }
-    }
-
-    action mark_for_encoding {
-        encode = true;
-    }
-
-    main := string_delim (
-                          (^([\"\\] | 0xc2..0xf5) |
-                           ((0xc2..0xf5) |
-                            '\\'[\"\\/bfnrt] |
-                            '\\u'[0-9a-fA-F]{4}) $mark_for_encoding |
-                            '\\'^([\"\\/bfnrtu]))* %parse_chars
-                          ) :>> string_delim @err(close_err) @exit;
+   machine EDN_string;
+   include EDN_common;
+
+   write data;
+
+   action parse_chars {
+      if (edn::util::parse_byte_stream(p_save + 1, p, v, encode)) {
+         fexec p + 1;
+      } else {
+         fhold; fbreak;
+      }
+   }
+
+   action mark_for_encoding {
+      encode = true;
+   }
+
+   main := string_delim (
+                         (^([\"\\] | 0xc2..0xf5) |
+                          ((0xc2..0xf5) |
+                           '\\'[\"\\/bfnrt] |
+                           '\\u'[0-9a-fA-F]{4}) $mark_for_encoding |
+                           '\\'^([\"\\/bfnrtu]))* %parse_chars
+                        ) :>> string_delim @err(close_err) @exit;
 }%%
 
 
 const char* edn::Parser::parse_string(const char *p, const char *pe, VALUE& v)
 {
-    static const char* EDN_TYPE = "string";
-    int cs;
-    bool encode = false;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    if (cs >= EDN_string_first_final) {
-        return p + 1;
-    }
-    else if (cs == EDN_string_error) {
-        return pe;
-    }
-    else if (cs == EDN_string_en_main) {} // silence ragel warning
-    return NULL;
+   static const char* EDN_TYPE = "string";
+   int cs;
+   bool encode = false;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   if (cs >= EDN_string_first_final) {
+      return p + 1;
+   }
+   else if (cs == EDN_string_error) {
+      return pe;
+   }
+   else if (cs == EDN_string_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -256,79 +283,78 @@ const char* edn::Parser::parse_string(const char *p, const char *pe, VALUE& v)
 // keyword parsing
 //
 %%{
-    machine EDN_keyword;
-    include EDN_common;
+   machine EDN_keyword;
+   include EDN_common;
 
-    keyword_start = alpha | [\.\*!_\?$%&<>\=+\-\'\#];
-    keyword_chars = (keyword_start | digit | ':');
+   keyword_start = alpha | [\.\*!_\?$%&<>\=+\-\'\#];
+   keyword_chars = (keyword_start | digit | ':');
 
-    keyword_name  = keyword_start keyword_chars*;
-    keyword       = keyword_name ('/' keyword_chars*)?;
+   keyword_name  = keyword_start keyword_chars*;
+   keyword       = keyword_name ('/' keyword_chars*)?;
 
-    write data;
+   write data;
 
 
-    main := begin_keyword keyword (^(keyword_chars | '/')? @exit);
+   main := begin_keyword keyword (^(keyword_chars | '/')? @exit);
 }%%
 
 
 const char* edn::Parser::parse_keyword(const char *p, const char *pe, VALUE& v)
 {
-    int cs;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    if (cs >= EDN_keyword_first_final) {
-        std::string buf;
-        uintmax_t len = p - p_save;
-        // don't include leading ':' because the ruby symbol will handle it
-        buf.append(p_save + 1, len - 1);
-        v = ID2SYM(rb_intern(buf.c_str()));
-        return p;
-    }
-    else if (cs == EDN_keyword_error) {
-        error(__FUNCTION__, "invalid keyword", *p);
-        return pe;
-    }
-    else if (cs == EDN_keyword_en_main) {} // silence ragel warning
-    return NULL;
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   if (cs >= EDN_keyword_first_final) {
+      std::string buf;
+      uintmax_t len = p - p_save;
+      // don't include leading ':' because the ruby symbol will handle it
+      buf.append(p_save + 1, len - 1);
+      v = ID2SYM(rb_intern(buf.c_str()));
+      return p;
+   }
+   else if (cs == EDN_keyword_error) {
+      error(__FUNCTION__, "invalid keyword", *p);
+      return pe;
+   }
+   else if (cs == EDN_keyword_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
-
 // ============================================================
 // decimal parsing machine
 //
 %%{
-    machine EDN_decimal;
-    include EDN_common;
+   machine EDN_decimal;
+   include EDN_common;
 
-    write data noerror;
+   write data noerror;
 
 
-    main := ('-'|'+')? (
-                        (integer '.' digit* (exp? [M]?)) |
-                        (integer exp)
-                        ) (^[0-9Ee.+\-M]? @exit );
+   main := ('-'|'+')? (
+                       (integer '.' digit* (exp? [M]?)) |
+                       (integer exp)
+                      ) (^[0-9Ee.+\-M]? @exit );
 }%%
 
 
 const char* edn::Parser::parse_decimal(const char *p, const char *pe, VALUE& v)
 {
-    int cs;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    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;
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   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 nullptr;
 }
 
 
@@ -336,34 +362,65 @@ const char* edn::Parser::parse_decimal(const char *p, const char *pe, VALUE& v)
 // integer parsing machine - M suffix will return a BigNum
 //
 %%{
-    machine EDN_integer;
-    include EDN_common;
+   machine EDN_integer;
+   include EDN_common;
 
-    write data noerror;
+   write data noerror;
 
 
-    main := (
-             ('-'|'+')? (integer [MN]?)
-             ) (^[0-9MN+\-]? @exit);
+   main := (
+            ('-'|'+')? (integer [MN]?)
+           ) (^[0-9MN+\-]? @exit);
 }%%
 
 const char* edn::Parser::parse_integer(const char *p, const char *pe, VALUE& v)
 {
-    int cs;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    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;
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   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 nullptr;
 }
 
 
+// ============================================================
+// ratio parsing machine
+//
+%%{
+   machine EDN_ratio;
+   include EDN_common;
+
+   write data noerror;
+
+
+   main := (
+            ('-'|'+')? (integer '/' integer)
+           ) (^[0-9+\-\/]? @exit);
+}%%
+
+
+const char* edn::Parser::parse_ratio(const char *p, const char *pe, VALUE& v)
+{
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   if (cs >= EDN_ratio_first_final) {
+      v = edn::util::ratio_to_ruby(p_save, p - p_save);
+      return p + 1;
+   }
+   else if (cs == EDN_ratio_en_main) {} // silence ragel warning
+   return nullptr;
+}
 
 // ============================================================
 // operator parsing - handles tokens w/ a leading operator:
@@ -373,81 +430,86 @@ const char* edn::Parser::parse_integer(const char *p, const char *pe, VALUE& v)
 // 3. stand-alone operators: +, -, /, *, etc.
 //
 %%{
-    machine EDN_operator;
-    include EDN_common;
-
-    write data;
-
-    action parse_op_symbol {
-        // parse a symbol including the leading operator (-, +, .)
-        VALUE sym = Qnil;
-        const char *np = parse_symbol(p_save, pe, sym);
-        if (np == NULL) { fexec pe; } else {
-            if (sym != Qnil)
-                v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
-            fexec np;
-        }
-    }
-
-    action parse_op_number {
-        // parse a number with the leading symbol - this is slightly
-        // different than the one within EDN_value since it includes
-        // the leading - or +
-        //
-        // try to parse a decimal first
-        const char *np = parse_decimal(p_save, pe, v);
-        if (np == NULL) {
-            // if we can't, try to parse it as an int
+   machine EDN_operator;
+   include EDN_common;
+
+   write data;
+
+   action parse_op_symbol {
+      // parse a symbol including the leading operator (-, +, .)
+      VALUE sym = Qnil;
+      const char *np = parse_symbol(p_save, pe, sym);
+      if (np == nullptr) { fexec pe; } else {
+         if (sym != Qnil)
+            v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
+         fexec np;
+      }
+   }
+
+   action parse_op_number {
+      // parse a number with the leading symbol - this is slightly
+      // different than the one within EDN_value since it includes
+      // the leading - or +
+      //
+      // try to parse a decimal first
+      const char *np = parse_decimal(p_save, pe, v);
+      if (np == nullptr) {
+         // if we can't, try to parse it as a ratio
+         np = parse_ratio(p_save, pe, v);
+
+         if (np == nullptr) {
+            // again, if we can't, try to parse it as an int
             np = parse_integer(p_save, pe, v);
-        }
-
-        if (np) {
-            fexec np;
-            fhold;
-            fbreak;
-        }
-        else {
-            error(__FUNCTION__, "number format error", *p);
-            fexec pe;
-        }
-    }
-
-    action parse_op {
-        // 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);
-    }
-
-    valid_non_numeric_chars = alpha|operators|':'|'#';
-    valid_chars             = valid_non_numeric_chars | digit;
-
-    main := (
-             ('-'|'+') begin_number >parse_op_number |
-             (operators - [\-\+\.]) valid_chars >parse_op_symbol |
-             [\-\+\.] valid_non_numeric_chars valid_chars* >parse_op_symbol |
-             operators ignore* >parse_op
-             ) ^(valid_chars)? @exit;
+         }
+      }
+
+      if (np) {
+         fexec np;
+         fhold;
+         fbreak;
+      }
+      else {
+         error(__FUNCTION__, "number format error", *p);
+         fexec pe;
+      }
+   }
+
+   action parse_op {
+      // 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);
+   }
+
+   valid_non_numeric_chars = alpha|operators|':'|'#';
+   valid_chars             = valid_non_numeric_chars | digit;
+
+   main := (
+            ('-'|'+') begin_number >parse_op_number |
+            (operators - [\-\+\.]) valid_chars >parse_op_symbol |
+            [\-\+\.] valid_non_numeric_chars valid_chars* >parse_op_symbol |
+            operators ignore* >parse_op
+           ) ^(valid_chars)? @exit;
 }%%
 
 
 const char* edn::Parser::parse_operator(const char *p, const char *pe, VALUE& v)
 {
-    int cs;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    if (cs >= EDN_operator_first_final) {
-        return p;
-    }
-    else if (cs == EDN_operator_error) {
-        error(__FUNCTION__, "symbol syntax error", *p);
-        return pe;
-    }
-    else if (cs == EDN_operator_en_main) {} // silence ragel warning
-    return NULL;
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   if (cs >= EDN_operator_first_final) {
+      return p;
+   }
+   else if (cs == EDN_operator_error) {
+      error(__FUNCTION__, "symbol syntax error", *p);
+      return pe;
+   }
+   else if (cs == EDN_operator_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -456,47 +518,46 @@ const char* edn::Parser::parse_operator(const char *p, const char *pe, VALUE& v)
 // escaped char parsing - handles \c, \newline, \formfeed, etc.
 //
 %%{
-    machine EDN_escaped_char;
-    include EDN_common;
+   machine EDN_escaped_char;
+   include EDN_common;
 
-    write data;
+   write data;
 
-    valid_chars = extend;
+   valid_chars = extend;
 
 
-    main := begin_char (
-                        'space' | 'newline' | 'tab' | 'return' | 'formfeed' | 'backspace' |
-                        valid_chars
-                        ) (ignore* | [\\\]\}\)])? @exit;
+   main := begin_char (
+                       'space' | 'newline' | 'tab' | 'return' | 'formfeed' | 'backspace' |
+                       valid_chars
+                      ) (ignore* | [\\\]\}\)])? @exit;
 }%%
 
 
 const char* edn::Parser::parse_esc_char(const char *p, const char *pe, VALUE& v)
 {
-    int cs;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    if (cs >= EDN_escaped_char_first_final) {
-        // convert the escaped value to a character
-        if (!edn::util::parse_escaped_char(p_save + 1, p, v)) {
-            return pe;
-        }
-        return p;
-    }
-    else if (cs == EDN_escaped_char_error) {
-        error(__FUNCTION__, "unexpected value", *p);
-        return pe;
-    }
-    else if (cs == EDN_escaped_char_en_main) {} // silence ragel warning
-    return NULL;
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   if (cs >= EDN_escaped_char_first_final) {
+      // convert the escaped value to a character
+      if (!edn::util::parse_escaped_char(p_save + 1, p, v)) {
+         return pe;
+      }
+      return p;
+   }
+   else if (cs == EDN_escaped_char_error) {
+      error(__FUNCTION__, "unexpected value", *p);
+      return pe;
+   }
+   else if (cs == EDN_escaped_char_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
 
-
 // ============================================================
 // symbol parsing - handles identifiers that begin with an alpha
 // character and an optional leading operator (name, -today,
@@ -504,58 +565,57 @@ const char* edn::Parser::parse_esc_char(const char *p, const char *pe, VALUE& v)
 //
 //
 %%{
-    machine EDN_symbol;
-    include EDN_common;
+   machine EDN_symbol;
+   include EDN_common;
 
-    write data;
+   write data;
 
-    symbol_ops_1 = [\.\-\+];
-    symbol_ops_2 = [\*!_\?$%&<>\=\'];
-    symbol_ops_3 = [:\#];
+   symbol_ops_1 = [\.\-\+];
+   symbol_ops_2 = [\*!_\?$%&<>\=\'];
+   symbol_ops_3 = [:\#];
 
-    symbol_start = alpha | symbol_ops_1 | symbol_ops_2;
+   symbol_start = alpha | symbol_ops_1 | symbol_ops_2;
 
-    symbol_chars = symbol_start | digit | symbol_ops_3;
+   symbol_chars = symbol_start | digit | symbol_ops_3;
 
-    symbol_name  = (
-                    (alpha symbol_chars*) |
-                    (symbol_ops_1 (symbol_start | symbol_ops_3) symbol_chars*) |
-                    (symbol_start symbol_chars+) |
-                    operators{1}
-                    );
-    symbol       = '/' | (symbol_name ('/' symbol_name)?);
+   symbol_name  = (
+                   (alpha symbol_chars*) |
+                   (symbol_ops_1 (symbol_start | symbol_ops_3) symbol_chars*) |
+                   (symbol_start symbol_chars+) |
+                   operators{1}
+                  );
+   symbol       = '/' | (symbol_name ('/' symbol_name)?);
 
 
-    main := (
-             symbol
-             ) ignore* (^(symbol_chars | '/')? @exit);
+   main := (
+            symbol
+           ) ignore* (^(symbol_chars | '/')? @exit);
 }%%
 
 
 const char* edn::Parser::parse_symbol(const char *p, const char *pe, VALUE& s)
 {
-    int cs;
-
-    %% write init;
-    const char* p_save = p;
-    %% write exec;
-
-    if (cs >= EDN_symbol_first_final) {
-        // copy the symbol text
-        if (s == Qnil)
-            s = rb_str_new2("");
-        rb_str_cat(s, p_save, p - p_save);
-        return p;
-    }
-    else if (cs == EDN_symbol_error) {
-        error(__FUNCTION__, "invalid symbol sequence", *p);
-    }
-    else if (cs == EDN_symbol_en_main) {} // silence ragel warning
-    return NULL;
+   int cs;
+
+   %% write init;
+   const char* p_save = p;
+   %% write exec;
+
+   if (cs >= EDN_symbol_first_final) {
+      // copy the symbol text
+      if (s == Qnil)
+         s = rb_str_new2("");
+      rb_str_cat(s, p_save, p - p_save);
+      return p;
+   }
+   else if (cs == EDN_symbol_error) {
+      error(__FUNCTION__, "invalid symbol sequence", *p);
+   }
+   else if (cs == EDN_symbol_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
-
 // ============================================================
 // EDN_sequence_common is used to parse EDN containers - elements are
 // initially stored in an array and then the final corresponding
@@ -563,75 +623,75 @@ const char* edn::Parser::parse_symbol(const char *p, const char *pe, VALUE& s)
 // sets the same array is used)
 //
 %%{
-    machine EDN_sequence_common;
-    include EDN_common;
-
-    action open_seq {
-        // sequences store elements in an array, then process it to
-        // convert it to a list, set, or map as needed once the
-        // sequence end is reached
-        elems = rb_ary_new();
-        // additionally, metadata for elements in the sequence may be
-        // carried so we must push a new level in the metadata stack
-        new_meta_list();
-    }
-
-    action close_seq {
-        // remove the current metadata level
-        del_top_meta_list();
-    }
-
-    action parse_item {
-        // reads an item within a sequence (vector, list, map, or
-        // set). Regardless of the sequence type, an array of the
-        // items is built. Once done, the sequence parser will convert
-        // if needed
-        VALUE e;
-        std::size_t meta_sz = meta_size();
-        const char *np = parse_value(fpc, pe, e);
-        if (np == NULL) { fhold; fbreak; } 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
-            if (!discard.empty()) {
-                discard.pop_back();
+   machine EDN_sequence_common;
+   include EDN_common;
+
+   action open_seq {
+      // sequences store elements in an array, then process it to
+      // convert it to a list, set, or map as needed once the
+      // sequence end is reached
+      elems = rb_ary_new();
+      // additionally, metadata for elements in the sequence may be
+      // carried so we must push a new level in the metadata stack
+      new_meta_list();
+   }
+
+   action close_seq {
+      // remove the current metadata level
+      del_top_meta_list();
+   }
+
+   action parse_item {
+      // reads an item within a sequence (vector, list, map, or
+      // set). Regardless of the sequence type, an array of the
+      // items is built. Once done, the sequence parser will convert
+      // if needed
+      VALUE e;
+      std::size_t meta_sz = meta_size();
+      const char *np = parse_value(fpc, pe, e);
+      if (np == nullptr) { fhold; fbreak; } 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
+         if (!discard.empty()) {
+            discard.pop_back();
+         }
+         else if (!meta_empty()) {
+            // check if parse_value added metadata
+            if (meta_size() == meta_sz) {
+               // there's metadata and it didn't increase so
+               // parse_value() read an element we care
+               // about. Bind the metadata to it and add it to
+               // the sequence
+               e = edn::util::call_module_fn(rb_mEDNT, EDNT_EXTENDED_VALUE_METHOD, e, ruby_meta());
+               rb_ary_push(elems, e);
             }
-            else if (!meta_empty()) {
-                // check if parse_value added metadata
-                if (meta_size() == meta_sz) {
-                    // there's metadata and it didn't increase so
-                    // parse_value() read an element we care
-                    // about. Bind the metadata to it and add it to
-                    // the sequence
-                    e = edn::util::call_module_fn(rb_mEDNT, EDNT_EXTENDED_VALUE_METHOD, e, ruby_meta());
-                    rb_ary_push(elems, e);
-                }
-            } else {
-                // no metadata.. just push it
-                rb_ary_push(elems, e);
-            }
-            fexec np;
-        }
-    }
-
-    element       = begin_value >parse_item;
-    next_element  = ignore* element;
-    sequence      = ((element ignore*) (next_element ignore*)*);
+         } else {
+            // no metadata.. just push it
+            rb_ary_push(elems, e);
+         }
+         fexec np;
+      }
+   }
+
+   element       = begin_value >parse_item;
+   next_element  = ignore* element;
+   sequence      = ((element ignore*) (next_element ignore*)*);
 }%%
 
 //
 // vector-specific machine
 %%{
-    machine EDN_vector;
-    include EDN_sequence_common;
+   machine EDN_vector;
+   include EDN_sequence_common;
 
-    end_vector     = ']';
+   end_vector     = ']';
 
-    write data;
+   write data;
 
-    main := begin_vector @open_seq (
-                                    ignore* sequence? :>> end_vector @close_seq
-                                    ) @err(close_err) @exit;
+   main := begin_vector @open_seq (
+                                   ignore* sequence? :>> end_vector @close_seq
+                                  ) @err(close_err) @exit;
 }%%
 
 
@@ -640,24 +700,24 @@ const char* edn::Parser::parse_symbol(const char *p, const char *pe, VALUE& s)
 //
 const char* edn::Parser::parse_vector(const char *p, const char *pe, VALUE& v)
 {
-    static const char* EDN_TYPE = "vector";
-
-    int cs;
-    VALUE elems; // will store the vector's elements - allocated in @open_seq
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_vector_first_final) {
-        v = elems;
-        return p + 1;
-    }
-    else if (cs == EDN_vector_error) {
-        error(__FUNCTION__, "vector format error", *p);
-        return pe;
-    }
-    else if (cs == EDN_vector_en_main) {} // silence ragel warning
-    return NULL;
+   static const char* EDN_TYPE = "vector";
+
+   int cs;
+   VALUE elems; // will store the vector's elements - allocated in @open_seq
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_vector_first_final) {
+      v = elems;
+      return p + 1;
+   }
+   else if (cs == EDN_vector_error) {
+      error(__FUNCTION__, "vector format error", *p);
+      return pe;
+   }
+   else if (cs == EDN_vector_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -666,16 +726,16 @@ const char* edn::Parser::parse_vector(const char *p, const char *pe, VALUE& v)
 // list parsing machine
 //
 %%{
-    machine EDN_list;
-    include EDN_sequence_common;
+   machine EDN_list;
+   include EDN_sequence_common;
 
-    end_list       = ')';
+   end_list       = ')';
 
-    write data;
+   write data;
 
-    main := begin_list @open_seq (
-                                  ignore* sequence? :>> end_list @close_seq
-                                  ) @err(close_err) @exit;
+   main := begin_list @open_seq (
+                                 ignore* sequence? :>> end_list @close_seq
+                                ) @err(close_err) @exit;
 }%%
 
 //
@@ -683,26 +743,24 @@ const char* edn::Parser::parse_vector(const char *p, const char *pe, VALUE& v)
 //
 const char* edn::Parser::parse_list(const char *p, const char *pe, VALUE& v)
 {
-    static const char* EDN_TYPE = "list";
-
-    int cs;
-    VALUE elems; // stores the list's elements - allocated in @open_seq
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_list_first_final) {
-        v = elems;
-        // TODO: replace with this but first figure out why array is not unrolled by EDN::list()
-        //        v = edn::util::call_module_fn(EDN_MAKE_LIST_METHOD, elems);
-        return p + 1;
-    }
-    else if (cs == EDN_list_error) {
-        error(__FUNCTION__, *p);
-        return pe;
-    }
-    else if (cs == EDN_list_en_main) {} // silence ragel warning
-    return NULL;
+   static const char* EDN_TYPE = "list";
+
+   int cs;
+   VALUE elems; // stores the list's elements - allocated in @open_seq
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_list_first_final) {
+      v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_LIST_METHOD, elems);
+      return p + 1;
+   }
+   else if (cs == EDN_list_error) {
+      error(__FUNCTION__, *p);
+      return pe;
+   }
+   else if (cs == EDN_list_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -711,56 +769,55 @@ const char* edn::Parser::parse_list(const char *p, const char *pe, VALUE& v)
 // hash parsing
 //
 %%{
-    machine EDN_map;
-    include EDN_sequence_common;
+   machine EDN_map;
+   include EDN_sequence_common;
 
-    end_map        = '}';
+   end_map        = '}';
 
-    write data;
+   write data;
 
 
-    main := begin_map @open_seq (
-                                 ignore* (sequence)? :>> end_map @close_seq
-                                 ) @err(close_err) @exit;
+   main := begin_map @open_seq (
+                                ignore* (sequence)? :>> end_map @close_seq
+                               ) @err(close_err) @exit;
 }%%
 
 
 const char* edn::Parser::parse_map(const char *p, const char *pe, VALUE& v)
 {
-    static const char* EDN_TYPE = "map";
-
-    int cs;
-    // since we don't know whether we're looking at a key or value,
-    // initially store all elements in an array (allocated in @open_seq)
-    VALUE elems;
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_map_first_final) {
-
-        // hash parsing is done. Make sure we have an even count
-        if ((RARRAY_LEN(elems) % 2) != 0) {
-            error(__FUNCTION__, "odd number of elements in map");
-            return pe;
-        }
-
-        // now convert the sequence to a hash
-        VALUE rslt = rb_hash_new();
-        while (RARRAY_LEN(elems) > 0)
-        {
-            VALUE k = rb_ary_shift(elems);
-            rb_hash_aset(rslt, k, rb_ary_shift(elems));
-        }
-
-        v = rslt;
-        return p + 1;
-    }
-    else if (cs == EDN_map_error) {
-        return pe;
-    }
-    else if (cs == EDN_map_en_main) {} // silence ragel warning
-    return NULL;
+   static const char* EDN_TYPE = "map";
+
+   int cs;
+   // since we don't know whether we're looking at a key or value,
+   // initially store all elements in an array (allocated in @open_seq)
+   VALUE elems;
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_map_first_final) {
+      // hash parsing is done. Make sure we have an even count
+      if ((RARRAY_LEN(elems) % 2) != 0) {
+         error(__FUNCTION__, "odd number of elements in map");
+         return pe;
+      }
+
+      // now convert the sequence to a hash
+      VALUE rslt = rb_hash_new();
+      while (RARRAY_LEN(elems) > 0)
+      {
+         VALUE k = rb_ary_shift(elems);
+         rb_hash_aset(rslt, k, rb_ary_shift(elems));
+      }
+
+      v = rslt;
+      return p + 1;
+   }
+   else if (cs == EDN_map_error) {
+      return pe;
+   }
+   else if (cs == EDN_map_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -771,55 +828,73 @@ const char* edn::Parser::parse_map(const char *p, const char *pe, VALUE& v)
 // the remaining data to the correct parser
 //
 %%{
-    machine EDN_dispatch;
-    include EDN_common;
-
-    write data;
-
-    action parse_disp_set {
-        // #{ }
-        const char *np = parse_set(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_disp_discard {
-        // discard token #_
-        const char *np = parse_discard(fpc, pe);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_disp_tagged {
-        // #inst, #uuid, or #user/tag
-        const char *np = parse_tagged(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-
-    main := (
-             ('{' >parse_disp_set |
-              '_' >parse_disp_discard |
-              alpha >parse_disp_tagged)
-             ) @exit;
+   machine EDN_dispatch;
+   include EDN_common;
+
+   write data;
+
+   action parse_disp_set {
+      // #{ }
+      const char *np = parse_set(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_disp_discard {
+      // discard token #_
+      const char *np = parse_discard(fpc, pe);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_disp_tagged {
+      // #inst, #uuid, or #user/tag
+      const char *np = parse_tagged(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else fexec np;
+   }
+
+   action parse_disp_symbol {
+      // ##Inf, ##NaN, etc.
+      VALUE sym = Qnil;
+      const char *np = parse_symbol(fpc+1, pe, sym);
+      if (np == nullptr) { fhold; fbreak; } else {
+         if (std::strcmp(RSTRING_PTR(sym), "NaN") == 0) {
+            v = RUBY_NAN_CONST;
+         }
+         else if (std::strcmp(RSTRING_PTR(sym), "Inf") == 0) {
+            v = RUBY_INF_CONST;
+         }
+         else {
+            v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SYMBOL_METHOD, sym);
+         }
+
+         fexec np;
+      }
+   }
+
+   main := (
+            ('{' >parse_disp_set |
+             '_' >parse_disp_discard |
+             '#' >parse_disp_symbol |
+             alpha >parse_disp_tagged)
+           ) @exit;
 }%%
 
 
 const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
 {
-    int cs;
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_dispatch_first_final) {
-        return p + 1;
-    }
-    else if (cs == EDN_dispatch_error) {
-        error(__FUNCTION__, "dispatch extend error", *p);
-        return pe;
-    }
-    else if (cs == EDN_dispatch_en_main) {} // silence ragel warning
-
-    return NULL;
+   int cs;
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_dispatch_first_final) {
+      return p + 1;
+   }
+   else if (cs == EDN_dispatch_error) {
+      error(__FUNCTION__, "dispatch extend error", *p);
+      return pe;
+   }
+   else if (cs == EDN_dispatch_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -827,17 +902,17 @@ const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
 // set parsing machine
 //
 %%{
-    machine EDN_set;
-    include EDN_sequence_common;
+   machine EDN_set;
+   include EDN_sequence_common;
 
-    write data;
+   write data;
 
-    begin_set    = '{';
-    end_set      = '}';
+   begin_set    = '{';
+   end_set      = '}';
 
-    main := begin_set @open_seq (
-                                 ignore* sequence? :>> end_set @close_seq
-                                 ) @err(close_err) @exit;
+   main := begin_set @open_seq (
+                                ignore* sequence? :>> end_set @close_seq
+                               ) @err(close_err) @exit;
 }%%
 
 //
@@ -845,25 +920,25 @@ const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
 //
 const char* edn::Parser::parse_set(const char *p, const char *pe, VALUE& v)
 {
-    static const char* EDN_TYPE = "set";
-
-    int cs;
-    VALUE elems; // holds the set's elements as an array allocated in @open_seq
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_set_first_final) {
-        // all elements collected; now convert to a set
-        v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SET_METHOD, elems);
-        return p + 1;
-    }
-    else if (cs == EDN_set_error) {
-        error(__FUNCTION__, *p);
-        return pe;
-    }
-    else if (cs == EDN_set_en_main) {} // silence ragel warning
-    return NULL;
+   static const char* EDN_TYPE = "set";
+
+   int cs;
+   VALUE elems; // holds the set's elements as an array allocated in @open_seq
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_set_first_final) {
+      // all elements collected; now convert to a set
+      v = edn::util::call_module_fn(rb_mEDN, EDN_MAKE_SET_METHOD, elems);
+      return p + 1;
+   }
+   else if (cs == EDN_set_error) {
+      error(__FUNCTION__, *p);
+      return pe;
+   }
+   else if (cs == EDN_set_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -874,55 +949,54 @@ const char* edn::Parser::parse_set(const char *p, const char *pe, VALUE& v)
 // defining a machine to consume items within container delimiters
 //
 %%{
-    machine EDN_discard;
-    include EDN_common;
-
-    write data;
-
-    begin_discard = '_';
-
-    action discard_value {
-        const char *np = parse_value(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } 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
-            discard.push_back(v);
-            fexec np;
-        }
-    }
-
-    action discard_err {
-        std::stringstream s;
-        s << "discard sequence without element to discard";
-        error(__FUNCTION__, s.str());
-        fhold; fbreak;
-    }
-
-    main := begin_discard ignore* (
-                                   begin_value >discard_value
-                                   ) @err(discard_err) @exit;
+   machine EDN_discard;
+   include EDN_common;
+
+   write data;
+
+   begin_discard = '_';
+
+   action discard_value {
+      const char *np = parse_value(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } 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
+         discard.push_back(v);
+         fexec np;
+      }
+   }
+
+   action discard_err {
+      std::stringstream s;
+      s << "discard sequence without element to discard";
+      error(__FUNCTION__, s.str());
+      fhold; fbreak;
+   }
+
+   main := begin_discard ignore* (
+                                  begin_value >discard_value
+                                 ) @err(discard_err) @exit;
 }%%
 
 
 const char* edn::Parser::parse_discard(const char *p, const char *pe)
 {
-    int cs;
-    VALUE v;
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_discard_first_final) {
-        return p + 1;
-    }
-    else if (cs == EDN_discard_error) {
-        error(__FUNCTION__, *p);
-        return pe;
-    }
-    else if (cs == EDN_discard_en_main) {} // silence ragel warning
-
-    return NULL;
+   int cs;
+   VALUE v;
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_discard_first_final) {
+      return p + 1;
+   }
+   else if (cs == EDN_discard_error) {
+      error(__FUNCTION__, *p);
+      return pe;
+   }
+   else if (cs == EDN_discard_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -942,130 +1016,127 @@ const char* edn::Parser::parse_discard(const char *p, const char *pe)
 // 2. add parse checks for uuid and inst for better error reporting
 //
 %%{
-    machine EDN_tagged;
-    include EDN_common;
+   machine EDN_tagged;
+   include EDN_common;
 
-    write data;
+   write data;
 
-    tag_symbol_chars_start       = alpha;
-    tag_symbol_chars_non_numeric = tag_symbol_chars_start | [\.\*!_\?$%&<>\=+\-\'\:\#];
-    tag_symbol_chars             = tag_symbol_chars_non_numeric | digit;
+   tag_symbol_chars_start       = alpha;
+   tag_symbol_chars_non_numeric = tag_symbol_chars_start | [\.\*!_\?$%&<>\=+\-\'\:\#];
+   tag_symbol_chars             = tag_symbol_chars_non_numeric | digit;
 
-    tag_symbol_namespace         = tag_symbol_chars_start (tag_symbol_chars)*;
-    tag_symbol_name              = tag_symbol_chars_non_numeric (tag_symbol_chars)*;
+   tag_symbol_namespace         = tag_symbol_chars_start (tag_symbol_chars)*;
+   tag_symbol_name              = tag_symbol_chars_non_numeric (tag_symbol_chars)*;
 
-    tag_symbol                   = (tag_symbol_namespace ('/' tag_symbol_name)?);
+   tag_symbol                   = (tag_symbol_namespace ('/' tag_symbol_name)?);
 
 #    inst = (string_delim [0-9+\-:\.TZ]* string_delim);
 #    uuid = (string_delim [a-f0-9\-]* string_delim);
 
-    action parse_tag {
-        // parses the symbol portion of the pair
-        const char *np = parse_symbol(fpc, pe, sym_name);
-        if (np == NULL) { fhold; fbreak; } else {
-            sym_ok = true;
-            fexec np;
-        }
-    }
-    action parse_data {
-        // parses the value portion
-        const char *np = parse_value(fpc, pe, data);
-        if (np == NULL) { fhold; fbreak; } else {
-            data_ok = true;
-            fexec np;
-        }
-    }
-
-    main := (
-             tag_symbol >parse_tag ignore+
-             begin_value >parse_data
-             ) @exit;
+   action parse_tag {
+      // parses the symbol portion of the pair
+      const char *np = parse_symbol(fpc, pe, sym_name);
+      if (np == nullptr) { fhold; fbreak; } else {
+         sym_ok = true;
+         fexec np;
+      }
+   }
+   action parse_data {
+      // parses the value portion
+      const char *np = parse_value(fpc, pe, data);
+      if (np == nullptr) { fhold; fbreak; } else {
+         data_ok = true;
+         fexec np;
+      }
+   }
+
+   main := (
+            tag_symbol >parse_tag ignore+
+            begin_value >parse_data
+           ) @exit;
 }%%
 
 
 const char* edn::Parser::parse_tagged(const char *p, const char *pe, VALUE& v)
 {
-    VALUE sym_name = Qnil;
-    VALUE data = Qnil;
-    bool sym_ok = false;
-    bool data_ok = false;
+   VALUE sym_name = Qnil;
+   VALUE data = Qnil;
+   bool sym_ok = false;
+   bool data_ok = false;
 
-    int cs;
+   int cs;
 
-    %% write init;
-    %% write exec;
+   %% write init;
+   %% write exec;
 
-    if (cs >= EDN_tagged_first_final) {
+   if (cs >= EDN_tagged_first_final) {
         //std::cerr << __FUNCTION__ << " parse symbol name as '" << sym_name << "', value is: " << data << std::endl;
 
-        if (!sym_ok || !data_ok) {
-            error(__FUNCTION__, "tagged element symbol error", *p);
-            v = EDN_EOF_CONST;
-            return NULL;
-        }
-
-        try {
-            // tagged_element makes a call to ruby which may throw an
-            // exception when parsing the data
-            v = edn::util::call_module_fn(rb_mEDN, EDN_TAGGED_ELEM_METHOD, sym_name, data);
-            return p + 1;
-        } catch (std::exception& e) {
-            error(__FUNCTION__, e.what());
-            return pe;
-        }
-    }
-    else if (cs == EDN_tagged_error) {
-        error(__FUNCTION__, "tagged element symbol error", *p);
-    }
-    else if (cs == EDN_tagged_en_main) {} // silence ragel warning
-    v =  EDN_EOF_CONST;
-    return NULL;
+      if (!sym_ok || !data_ok) {
+         error(__FUNCTION__, "tagged element symbol error", *p);
+         v = EDN_EOF_CONST;
+         return nullptr;
+      }
+
+      try {
+         // tagged_element makes a call to ruby which may throw an
+         // exception when parsing the data
+         v = edn::util::call_module_fn(rb_mEDN, EDN_TAGGED_ELEM_METHOD, sym_name, data);
+         return p + 1;
+      } catch (std::exception& e) {
+         error(__FUNCTION__, e.what());
+         return pe;
+      }
+   }
+   else if (cs == EDN_tagged_error) {
+      error(__FUNCTION__, "tagged element symbol error", *p);
+   }
+   else if (cs == EDN_tagged_en_main) {} // silence ragel warning
+   v =  EDN_EOF_CONST;
+   return nullptr;
 }
 
 
-
-
 // ============================================================
 // metadata - looks like ruby just discards this but we'll track it
 // and provide a means to retrive after each parse op - might be
 // useful?
 //
 %%{
-    machine EDN_meta;
-    include EDN_common;
+   machine EDN_meta;
+   include EDN_common;
 
-    write data;
+   write data;
 
-    action parse_data {
-        const char *np = parse_value(fpc, pe, v);
-        if (np == NULL) { fhold; fbreak; } else { fexec np; }
-    }
+   action parse_data {
+      const char *np = parse_value(fpc, pe, v);
+      if (np == nullptr) { fhold; fbreak; } else { fexec np; }
+   }
 
-    main := begin_meta (
-                        begin_value >parse_data
-                        ) @exit;
+   main := begin_meta (
+                       begin_value >parse_data
+                      ) @exit;
 }%%
 
 
 const char* edn::Parser::parse_meta(const char *p, const char *pe)
 {
-    int cs;
-    VALUE v;
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= EDN_meta_first_final) {
-        append_to_meta(v);
-        return p + 1;
-    }
-    else if (cs == EDN_meta_error) {
-        error(__FUNCTION__, *p);
-        return pe;
-    }
-    else if (cs == EDN_meta_en_main) {} // silence ragel warning
-
-    return NULL;
+   int cs;
+   VALUE v;
+
+   %% write init;
+   %% write exec;
+
+   if (cs >= EDN_meta_first_final) {
+      append_to_meta(v);
+      return p + 1;
+   }
+   else if (cs == EDN_meta_error) {
+      error(__FUNCTION__, *p);
+      return pe;
+   }
+   else if (cs == EDN_meta_en_main) {} // silence ragel warning
+   return nullptr;
 }
 
 
@@ -1075,55 +1146,55 @@ const char* edn::Parser::parse_meta(const char *p, const char *pe)
 // top-level, therefore, does not tokenize source stream
 //
 %%{
-    machine EDN_parser;
-    include EDN_common;
-
-    write data;
-
-    action parse_elem {
-        // 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(fpc, pe, result);
-        if (np == NULL) { fexec pe; fbreak; } 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
-            if (!meta_empty() && meta_size() == meta_sz) {
-                // this will empty the metadata sequence too
-                result = edn::util::call_module_fn(rb_mEDNT, EDNT_EXTENDED_VALUE_METHOD, result, ruby_meta());
-            }
-            fexec np;
-        }
-    }
-
-    element       = begin_value >parse_elem;
-    next_element  = ignore* element;
-    sequence      = ((element ignore*) (next_element ignore*)*);
-
-    main := ignore* sequence? ignore*;
+   machine EDN_parser;
+   include EDN_common;
+
+   write data;
+
+   action parse_elem {
+      // 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(fpc, pe, result);
+      if (np == nullptr) { fexec pe; fbreak; } 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
+         if (!meta_empty() && meta_size() == meta_sz) {
+            // this will empty the metadata sequence too
+            result = edn::util::call_module_fn(rb_mEDNT, EDNT_EXTENDED_VALUE_METHOD, result, ruby_meta());
+         }
+         fexec np;
+      }
+   }
+
+   element       = begin_value >parse_elem;
+   next_element  = ignore* element;
+   sequence      = ((element ignore*) (next_element ignore*)*);
+
+   main := ignore* sequence? ignore*;
 }%%
 
 
 VALUE edn::Parser::parse(const char* src, std::size_t len)
 {
-    int cs;
-    VALUE result = EDN_EOF_CONST;
-
-    %% write init;
-    set_source(src, len);
-    %% write exec;
-
-    if (cs == EDN_parser_error) {
-        error(__FUNCTION__, *p);
-        return EDN_EOF_CONST;
-    }
-    else if (cs == EDN_parser_first_final) {
-        p = pe = eof = NULL;
-    }
-    else if (cs == EDN_parser_en_main) {} // silence ragel warning
-    return result;
+   int cs;
+   VALUE result = EDN_EOF_CONST;
+
+   %% write init;
+   set_source(src, len);
+   %% write exec;
+
+   if (cs == EDN_parser_error) {
+      error(__FUNCTION__, *p);
+      return EDN_EOF_CONST;
+   }
+   else if (cs == EDN_parser_first_final) {
+      p = pe = eof = nullptr;
+   }
+   else if (cs == EDN_parser_en_main) {} // silence ragel warning
+   return result;
 }
 
 
@@ -1131,43 +1202,43 @@ VALUE edn::Parser::parse(const char* src, std::size_t len)
 // token-by-token machine
 //
 %%{
-    machine EDN_tokens;
-    include EDN_common;
-
-    write data nofinal noerror;
-
-    action parse_token {
-        // we won't know if we've parsed a discard or a metadata until
-        // after parse_value() is done. Save the current number of
-        // elements in the metadata sequence; then we can check if it
-        // grew or if the discard sequence grew
-        meta_sz = meta_size();
-
-        const char* np = parse_value(fpc, pe, value);
-        if (np == NULL) { fhold; fbreak; } else {
-            if (!meta_empty()) {
-                // was an additional metadata entry read? if so, don't
-                // return a value
-                if (meta_size() > meta_sz) {
-                    state = TOKEN_IS_META;
-                }
-                else {
-                    // a value was read and there's a pending metadata
-                    // sequence. Bind them.
-                    value = edn::util::call_module_fn(rb_mEDNT, EDNT_EXTENDED_VALUE_METHOD, value, ruby_meta());
-                    state = TOKEN_OK;
-                }
-            } else if (!discard.empty()) {
-                // a discard read. Don't return a value
-                state = TOKEN_IS_DISCARD;
-            } else {
-                state = TOKEN_OK;
+   machine EDN_tokens;
+   include EDN_common;
+
+   write data nofinal noerror;
+
+   action parse_token {
+      // we won't know if we've parsed a discard or a metadata until
+      // after parse_value() is done. Save the current number of
+      // elements in the metadata sequence; then we can check if it
+      // grew or if the discard sequence grew
+      meta_sz = meta_size();
+
+      const char* np = parse_value(fpc, pe, value);
+      if (np == nullptr) { fhold; fbreak; } else {
+         if (!meta_empty()) {
+            // was an additional metadata entry read? if so, don't
+            // return a value
+            if (meta_size() > meta_sz) {
+               state = TOKEN_IS_META;
             }
-            fexec np;
-        }
-    }
-
-    main := ignore* begin_value >parse_token ignore*;
+            else {
+               // a value was read and there's a pending metadata
+               // sequence. Bind them.
+               value = edn::util::call_module_fn(rb_mEDNT, EDNT_EXTENDED_VALUE_METHOD, value, ruby_meta());
+               state = TOKEN_OK;
+            }
+         } else if (!discard.empty()) {
+            // a discard read. Don't return a value
+            state = TOKEN_IS_DISCARD;
+         } else {
+            state = TOKEN_OK;
+         }
+         fexec np;
+      }
+   }
+
+   main := ignore* begin_value >parse_token ignore*;
 }%%
 
 
@@ -1175,21 +1246,21 @@ VALUE edn::Parser::parse(const char* src, std::size_t len)
 //
 edn::Parser::eTokenState edn::Parser::parse_next(VALUE& value)
 {
-    int cs;
-    eTokenState state = TOKEN_ERROR;
-    // need to track metadada read and bind it to the next value read
-    // - but must account for sequences of metadata values
-    std::size_t meta_sz;
+   int cs;
+   eTokenState state = TOKEN_ERROR;
+   // need to track metadada read and bind it to the next value read
+   // - but must account for sequences of metadata values
+   std::size_t meta_sz;
 
-    // clear any previously saved discards; only track if read during
-    // this op
-    discard.clear();
+   // clear any previously saved discards; only track if read during
+   // this op
+   discard.clear();
 
-    %% write init;
-    %% write exec;
+   %% write init;
+   %% write exec;
 
-    if (cs == EDN_tokens_en_main) {} // silence ragel warning
-    return state;
+   if (cs == EDN_tokens_en_main) {} // silence ragel warning
+   return state;
 }
 
 /*