edn_turbo 0.3.0 → 0.3.1

data/ext/edn_turbo/edn_parser.cc

@@ -2,7 +2,7 @@
 #line 1 "edn_parser.rl"
 #include <iostream>
 #include <string>
-#include <stack>
+#include <vector>
 #include <exception>
 
 #include "edn_parser.h"
@@ -16,7 +16,7 @@
 //
 
 
-#line 58 "edn_parser.rl"
+#line 59 "edn_parser.rl"
 
 
 // ============================================================
@@ -32,7 +32,7 @@ static const int EDN_value_error = 0;
 static const int EDN_value_en_main = 1;
 
 
-#line 167 "edn_parser.rl"
+#line 175 "edn_parser.rl"
 
 
 
@@ -46,7 +46,7 @@ const char *edn::Parser::parse_value(const char *p, const char *pe, VALUE& v)
 	cs = EDN_value_start;
 	}
 
-#line 175 "edn_parser.rl"
+#line 183 "edn_parser.rl"
 
 #line 52 "edn_parser.cc"
 	{
@@ -62,8 +62,9 @@ case 1:
 		case 58: goto tr6;
 		case 91: goto tr8;
 		case 92: goto tr9;
+		case 94: goto tr10;
 		case 95: goto tr0;
-		case 123: goto tr10;
+		case 123: goto tr11;
 	}
 	if ( (*p) < 48 ) {
 		if ( (*p) < 42 ) {
@@ -90,7 +91,7 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 102 "edn_parser.rl"
+#line 103 "edn_parser.rl"
 	{
         // stand-alone operators *, +, -, etc.
         const char *np = parse_operator(p, pe, v);
@@ -98,7 +99,7 @@ tr0:
     }
 	goto st2;
 tr2:
-#line 70 "edn_parser.rl"
+#line 71 "edn_parser.rl"
 	{
         // string types within double-quotes
         const char *np = parse_string(p, pe, v);
@@ -106,7 +107,7 @@ tr2:
     }
 	goto st2;
 tr3:
-#line 148 "edn_parser.rl"
+#line 155 "edn_parser.rl"
 	{
         // handles tokens w/ leading # ("#_", "#{", and tagged elems)
         const char *np = parse_dispatch(p + 1, pe, v);
@@ -114,7 +115,7 @@ tr3:
     }
 	goto st2;
 tr4:
-#line 136 "edn_parser.rl"
+#line 137 "edn_parser.rl"
 	{
         // (
         const char *np = parse_list(p, pe, v);
@@ -122,7 +123,7 @@ tr4:
     }
 	goto st2;
 tr5:
-#line 82 "edn_parser.rl"
+#line 83 "edn_parser.rl"
 	{
         // tokens w/ leading digits: non-negative integers & decimals.
         // try to parse a decimal first
@@ -144,7 +145,7 @@ tr5:
     }
 	goto st2;
 tr6:
-#line 76 "edn_parser.rl"
+#line 77 "edn_parser.rl"
 	{
         // tokens with a leading ':'
         const char *np = parse_keyword(p, pe, v);
@@ -152,7 +153,7 @@ tr6:
     }
 	goto st2;
 tr7:
-#line 114 "edn_parser.rl"
+#line 115 "edn_parser.rl"
 	{
         // user identifiers and reserved keywords (true, false, nil)
         VALUE sym = Qnil;
@@ -170,7 +171,7 @@ tr7:
     }
 	goto st2;
 tr8:
-#line 130 "edn_parser.rl"
+#line 131 "edn_parser.rl"
 	{
         // [
         const char *np = parse_vector(p, pe, v);
@@ -178,7 +179,7 @@ tr8:
     }
 	goto st2;
 tr9:
-#line 108 "edn_parser.rl"
+#line 109 "edn_parser.rl"
 	{
         // tokens w/ leading \ (escaped characters \newline, \c, etc.)
         const char *np = parse_esc_char(p, pe, v);
@@ -186,7 +187,15 @@ tr9:
     }
 	goto st2;
 tr10:
-#line 142 "edn_parser.rl"
+#line 149 "edn_parser.rl"
+	{
+        // ^
+        const char *np = parse_meta(p, pe);
+        if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st2;
+tr11:
+#line 143 "edn_parser.rl"
 	{
         // {
         const char *np = parse_map(p, pe, v);
@@ -197,9 +206,9 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
-#line 203 "edn_parser.cc"
+#line 212 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -208,7 +217,7 @@ case 2:
 	_out: {}
 	}
 
-#line 176 "edn_parser.rl"
+#line 184 "edn_parser.rl"
 
     if (cs >= EDN_value_first_final) {
         return p;
@@ -230,7 +239,7 @@ case 2:
 // ascii range is found.
 //
 
-#line 234 "edn_parser.cc"
+#line 243 "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;
@@ -238,27 +247,26 @@ static const int EDN_string_error = 0;
 static const int EDN_string_en_main = 1;
 
 
-#line 221 "edn_parser.rl"
+#line 229 "edn_parser.rl"
 
 
 
 const char* edn::Parser::parse_string(const char *p, const char *pe, VALUE& v)
 {
-    //    std::cerr << __FUNCTION__ << "   -  p: '" << p << "'" << std::endl;
     static const char* EDN_TYPE = "string";
     int cs;
     bool encode = false;
 
 
-#line 254 "edn_parser.cc"
+#line 262 "edn_parser.cc"
 	{
 	cs = EDN_string_start;
 	}
 
-#line 232 "edn_parser.rl"
+#line 239 "edn_parser.rl"
     const char* p_save = p;
 
-#line 262 "edn_parser.cc"
+#line 270 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -269,7 +277,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr3:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -277,12 +285,12 @@ tr3:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 281 "edn_parser.cc"
+#line 289 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 210 "edn_parser.rl"
+#line 218 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -291,7 +299,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 295 "edn_parser.cc"
+#line 303 "edn_parser.cc"
 	switch( (*p) ) {
 		case 34: goto tr4;
 		case 92: goto tr5;
@@ -303,7 +311,7 @@ case 2:
 		goto tr2;
 	goto st2;
 tr4:
-#line 202 "edn_parser.rl"
+#line 210 "edn_parser.rl"
 	{
         if (Parser::parse_byte_stream(p_save + 1, p, v, encode)) {
             {p = (( p + 1))-1;}
@@ -311,17 +319,17 @@ tr4:
             p--; {p++; cs = 8; goto _out;}
         }
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 322 "edn_parser.cc"
+#line 330 "edn_parser.cc"
 	goto st0;
 tr5:
-#line 210 "edn_parser.rl"
+#line 218 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -330,7 +338,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 334 "edn_parser.cc"
+#line 342 "edn_parser.cc"
 	switch( (*p) ) {
 		case 34: goto tr2;
 		case 47: goto tr2;
@@ -346,7 +354,7 @@ case 3:
 		goto st0;
 	goto st2;
 tr6:
-#line 210 "edn_parser.rl"
+#line 218 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -355,7 +363,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 359 "edn_parser.cc"
+#line 367 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr7;
@@ -366,7 +374,7 @@ case 4:
 		goto tr7;
 	goto st0;
 tr7:
-#line 210 "edn_parser.rl"
+#line 218 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -375,7 +383,7 @@ st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 379 "edn_parser.cc"
+#line 387 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr8;
@@ -386,7 +394,7 @@ case 5:
 		goto tr8;
 	goto st0;
 tr8:
-#line 210 "edn_parser.rl"
+#line 218 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -395,7 +403,7 @@ st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 399 "edn_parser.cc"
+#line 407 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr9;
@@ -406,7 +414,7 @@ case 6:
 		goto tr9;
 	goto st0;
 tr9:
-#line 210 "edn_parser.rl"
+#line 218 "edn_parser.rl"
 	{
         encode = true;
     }
@@ -415,7 +423,7 @@ st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 419 "edn_parser.cc"
+#line 427 "edn_parser.cc"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto tr2;
@@ -439,7 +447,7 @@ case 7:
 	{
 	switch ( cs ) {
 	case 2:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -447,14 +455,14 @@ case 7:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 451 "edn_parser.cc"
+#line 459 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 234 "edn_parser.rl"
+#line 241 "edn_parser.rl"
 
     if (cs >= EDN_string_first_final) {
         return p + 1;
@@ -472,7 +480,7 @@ case 7:
 // keyword parsing
 //
 
-#line 476 "edn_parser.cc"
+#line 484 "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;
@@ -480,7 +488,7 @@ static const int EDN_keyword_error = 0;
 static const int EDN_keyword_en_main = 1;
 
 
-#line 263 "edn_parser.rl"
+#line 270 "edn_parser.rl"
 
 
 
@@ -489,15 +497,15 @@ const char* edn::Parser::parse_keyword(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 493 "edn_parser.cc"
+#line 501 "edn_parser.cc"
 	{
 	cs = EDN_keyword_start;
 	}
 
-#line 271 "edn_parser.rl"
+#line 278 "edn_parser.rl"
     const char* p_save = p;
 
-#line 501 "edn_parser.cc"
+#line 509 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -534,7 +542,7 @@ case 3:
 		case 95: goto st3;
 	}
 	if ( (*p) < 45 ) {
-		if ( (*p) > 38 ) {
+		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
 				goto st3;
 		} else if ( (*p) >= 35 )
@@ -552,14 +560,14 @@ case 3:
 		goto st3;
 	goto tr3;
 tr3:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 563 "edn_parser.cc"
+#line 571 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -570,7 +578,7 @@ case 4:
 	_out: {}
 	}
 
-#line 273 "edn_parser.rl"
+#line 280 "edn_parser.rl"
 
     if (cs >= EDN_keyword_first_final) {
         std::string buf;
@@ -594,14 +602,14 @@ case 4:
 // decimal parsing machine
 //
 
-#line 598 "edn_parser.cc"
+#line 606 "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 306 "edn_parser.rl"
+#line 313 "edn_parser.rl"
 
 
 
@@ -610,15 +618,15 @@ const char* edn::Parser::parse_decimal(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 614 "edn_parser.cc"
+#line 622 "edn_parser.cc"
 	{
 	cs = EDN_decimal_start;
 	}
 
-#line 314 "edn_parser.rl"
+#line 321 "edn_parser.rl"
     const char* p_save = p;
 
-#line 622 "edn_parser.cc"
+#line 630 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -672,14 +680,14 @@ case 9:
 		goto st0;
 	goto tr10;
 tr10:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 10; goto _out;} }
 	goto st10;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 683 "edn_parser.cc"
+#line 691 "edn_parser.cc"
 	goto st0;
 st4:
 	if ( ++p == pe )
@@ -795,7 +803,7 @@ case 8:
 	_out: {}
 	}
 
-#line 316 "edn_parser.rl"
+#line 323 "edn_parser.rl"
 
     if (cs >= EDN_decimal_first_final) {
         v = Parser::float_to_ruby(p_save, p - p_save);
@@ -810,14 +818,14 @@ case 8:
 // integer parsing machine
 //
 
-#line 814 "edn_parser.cc"
+#line 822 "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 339 "edn_parser.rl"
+#line 346 "edn_parser.rl"
 
 
 const char* edn::Parser::parse_integer(const char *p, const char *pe, VALUE& v)
@@ -825,15 +833,15 @@ const char* edn::Parser::parse_integer(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 829 "edn_parser.cc"
+#line 837 "edn_parser.cc"
 	{
 	cs = EDN_integer_start;
 	}
 
-#line 346 "edn_parser.rl"
+#line 353 "edn_parser.rl"
     const char* p_save = p;
 
-#line 837 "edn_parser.cc"
+#line 845 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -875,14 +883,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 886 "edn_parser.cc"
+#line 894 "edn_parser.cc"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -923,7 +931,7 @@ case 6:
 	_out: {}
 	}
 
-#line 348 "edn_parser.rl"
+#line 355 "edn_parser.rl"
 
     if (cs >= EDN_integer_first_final) {
         v = Parser::integer_to_ruby(p_save, p - p_save);
@@ -943,7 +951,7 @@ case 6:
 // 3. stand-alone operators: +, -, /, *, etc.
 //
 
-#line 947 "edn_parser.cc"
+#line 955 "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;
@@ -951,7 +959,7 @@ static const int EDN_operator_error = 0;
 static const int EDN_operator_en_main = 1;
 
 
-#line 418 "edn_parser.rl"
+#line 425 "edn_parser.rl"
 
 
 
@@ -960,15 +968,15 @@ const char* edn::Parser::parse_operator(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 964 "edn_parser.cc"
+#line 972 "edn_parser.cc"
 	{
 	cs = EDN_operator_start;
 	}
 
-#line 426 "edn_parser.rl"
+#line 433 "edn_parser.rl"
     const char* p_save = p;
 
-#line 972 "edn_parser.cc"
+#line 980 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1024,43 +1032,43 @@ case 3:
 		goto st0;
 	goto tr6;
 tr6:
-#line 405 "edn_parser.rl"
+#line 412 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = Parser::make_edn_symbol(sym);
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 tr10:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 1046 "edn_parser.cc"
+#line 1054 "edn_parser.cc"
 	goto st0;
 tr5:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
 	goto st5;
 tr7:
-#line 405 "edn_parser.rl"
+#line 412 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = Parser::make_edn_symbol(sym);
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 tr8:
-#line 405 "edn_parser.rl"
+#line 412 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
@@ -1069,24 +1077,24 @@ tr8:
     }
 #line 20 "edn_parser.rl"
 	{ line_number++; }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 tr11:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 tr12:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 1090 "edn_parser.cc"
+#line 1098 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr12;
 		case 32: goto tr11;
@@ -1114,25 +1122,25 @@ case 5:
 		goto st0;
 	goto tr10;
 tr9:
-#line 405 "edn_parser.rl"
+#line 412 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
         VALUE sym = rb_str_new2(op);
         v = Parser::make_edn_symbol(sym);
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 tr13:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 1136 "edn_parser.cc"
+#line 1144 "edn_parser.cc"
 	if ( (*p) == 10 )
 		goto tr5;
 	goto st2;
@@ -1177,7 +1185,7 @@ case 7:
 		goto tr14;
 	goto tr6;
 tr14:
-#line 382 "edn_parser.rl"
+#line 389 "edn_parser.rl"
 	{
         // parse a number with the leading symbol - this is slightly
         // different than the one within EDN_value since it includes
@@ -1202,7 +1210,7 @@ tr14:
     }
 	goto st8;
 tr15:
-#line 372 "edn_parser.rl"
+#line 379 "edn_parser.rl"
 	{
         // parse a symbol including the leading operator (-, +, .)
         VALUE sym = Qnil;
@@ -1217,7 +1225,7 @@ st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1221 "edn_parser.cc"
+#line 1229 "edn_parser.cc"
 	switch( (*p) ) {
 		case 33: goto st0;
 		case 95: goto st0;
@@ -1287,7 +1295,7 @@ case 9:
 	case 3:
 	case 7:
 	case 9:
-#line 405 "edn_parser.rl"
+#line 412 "edn_parser.rl"
 	{
         // stand-alone operators (-, +, /, ... etc)
         char op[2] = { *p_save, 0 };
@@ -1295,14 +1303,14 @@ case 9:
         v = Parser::make_edn_symbol(sym);
     }
 	break;
-#line 1299 "edn_parser.cc"
+#line 1307 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 428 "edn_parser.rl"
+#line 435 "edn_parser.rl"
 
     if (cs >= EDN_operator_first_final) {
         return p;
@@ -1321,7 +1329,7 @@ case 9:
 // escaped char parsing - handles \c, \newline, \formfeed, etc.
 //
 
-#line 1325 "edn_parser.cc"
+#line 1333 "edn_parser.cc"
 static const int EDN_escaped_char_start = 1;
 static const int EDN_escaped_char_first_final = 4;
 static const int EDN_escaped_char_error = 0;
@@ -1329,7 +1337,7 @@ static const int EDN_escaped_char_error = 0;
 static const int EDN_escaped_char_en_main = 1;
 
 
-#line 457 "edn_parser.rl"
+#line 464 "edn_parser.rl"
 
 
 
@@ -1338,15 +1346,15 @@ const char* edn::Parser::parse_esc_char(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 1342 "edn_parser.cc"
+#line 1350 "edn_parser.cc"
 	{
 	cs = EDN_escaped_char_start;
 	}
 
-#line 465 "edn_parser.rl"
+#line 472 "edn_parser.rl"
     const char* p_save = p;
 
-#line 1350 "edn_parser.cc"
+#line 1358 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1390,34 +1398,34 @@ case 4:
 		goto st4;
 	goto tr5;
 tr5:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 1401 "edn_parser.cc"
+#line 1409 "edn_parser.cc"
 	goto st0;
 tr4:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
 	goto st6;
 tr6:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 tr7:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 1421 "edn_parser.cc"
+#line 1429 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr7;
 		case 32: goto tr6;
@@ -1435,14 +1443,14 @@ case 6:
 		goto st0;
 	goto tr5;
 tr8:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 7; goto _out;} }
 	goto st7;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 1446 "edn_parser.cc"
+#line 1454 "edn_parser.cc"
 	if ( (*p) == 10 )
 		goto tr4;
 	goto st3;
@@ -1465,7 +1473,7 @@ case 3:
 	_out: {}
 	}
 
-#line 467 "edn_parser.rl"
+#line 474 "edn_parser.rl"
 
     if (cs >= EDN_escaped_char_first_final) {
         // convert the escaped value to a character
@@ -1492,7 +1500,7 @@ case 3:
 //
 //
 
-#line 1496 "edn_parser.cc"
+#line 1504 "edn_parser.cc"
 static const int EDN_symbol_start = 1;
 static const int EDN_symbol_first_final = 5;
 static const int EDN_symbol_error = 0;
@@ -1500,7 +1508,7 @@ static const int EDN_symbol_error = 0;
 static const int EDN_symbol_en_main = 1;
 
 
-#line 502 "edn_parser.rl"
+#line 509 "edn_parser.rl"
 
 
 
@@ -1509,15 +1517,15 @@ const char* edn::Parser::parse_symbol(const char *p, const char *pe, VALUE& s)
     int cs;
 
 
-#line 1513 "edn_parser.cc"
+#line 1521 "edn_parser.cc"
 	{
 	cs = EDN_symbol_start;
 	}
 
-#line 510 "edn_parser.rl"
+#line 517 "edn_parser.rl"
     const char* p_save = p;
 
-#line 1521 "edn_parser.cc"
+#line 1529 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1568,6 +1576,7 @@ case 5:
 		case 32: goto tr7;
 		case 33: goto st0;
 		case 35: goto st5;
+		case 39: goto st5;
 		case 44: goto tr7;
 		case 47: goto st4;
 		case 59: goto tr10;
@@ -1595,34 +1604,34 @@ case 5:
 		goto st5;
 	goto tr6;
 tr6:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 1606 "edn_parser.cc"
+#line 1615 "edn_parser.cc"
 	goto st0;
 tr4:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
 	goto st7;
 tr7:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 7; goto _out;} }
 	goto st7;
 tr8:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 7; goto _out;} }
 	goto st7;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 1626 "edn_parser.cc"
+#line 1635 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr8;
 		case 32: goto tr7;
@@ -1633,7 +1642,7 @@ case 7:
 	}
 	if ( (*p) < 42 ) {
 		if ( (*p) > 13 ) {
-			if ( 35 <= (*p) && (*p) <= 38 )
+			if ( 35 <= (*p) && (*p) <= 39 )
 				goto st0;
 		} else if ( (*p) >= 9 )
 			goto tr7;
@@ -1647,14 +1656,14 @@ case 7:
 		goto st0;
 	goto tr6;
 tr10:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1658 "edn_parser.cc"
+#line 1667 "edn_parser.cc"
 	if ( (*p) == 10 )
 		goto tr4;
 	goto st3;
@@ -1684,6 +1693,7 @@ case 9:
 		case 32: goto tr7;
 		case 33: goto st0;
 		case 35: goto st9;
+		case 39: goto st9;
 		case 44: goto tr7;
 		case 47: goto st0;
 		case 59: goto tr10;
@@ -1724,7 +1734,7 @@ case 9:
 	_out: {}
 	}
 
-#line 512 "edn_parser.rl"
+#line 519 "edn_parser.rl"
 
     if (cs >= EDN_symbol_first_final) {
         // copy the symbol text
@@ -1750,13 +1760,13 @@ case 9:
 // sets the same array is used)
 //
 
-#line 568 "edn_parser.rl"
+#line 575 "edn_parser.rl"
 
 
 //
 // vector-specific machine
 
-#line 1760 "edn_parser.cc"
+#line 1770 "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;
@@ -1764,7 +1774,7 @@ static const int EDN_vector_error = 0;
 static const int EDN_vector_en_main = 1;
 
 
-#line 584 "edn_parser.rl"
+#line 591 "edn_parser.rl"
 
 
 
@@ -1779,14 +1789,14 @@ const char* edn::Parser::parse_vector(const char *p, const char *pe, VALUE& v)
     VALUE elems = rb_ary_new(); // will store the vector's elements
 
 
-#line 1783 "edn_parser.cc"
+#line 1793 "edn_parser.cc"
 	{
 	cs = EDN_vector_start;
 	}
 
-#line 598 "edn_parser.rl"
+#line 605 "edn_parser.rl"
 
-#line 1790 "edn_parser.cc"
+#line 1800 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1797,7 +1807,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr2:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -1805,7 +1815,7 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 1809 "edn_parser.cc"
+#line 1819 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -1814,7 +1824,7 @@ tr3:
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 540 "edn_parser.rl"
+#line 547 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -1829,7 +1839,7 @@ tr4:
             // 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();
+                discard.pop_back();
             }
             else {
                 // otherwise we add it to the list of elements for the
@@ -1844,7 +1854,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 1848 "edn_parser.cc"
+#line 1858 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st2;
@@ -1852,7 +1862,6 @@ case 2:
 		case 44: goto st2;
 		case 59: goto st3;
 		case 93: goto tr6;
-		case 95: goto tr4;
 	}
 	if ( (*p) < 42 ) {
 		if ( (*p) > 13 ) {
@@ -1861,7 +1870,7 @@ case 2:
 		} else if ( (*p) >= 9 )
 			goto st2;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr4;
 		} else if ( (*p) >= 65 )
@@ -1877,14 +1886,14 @@ case 3:
 		goto tr3;
 	goto st3;
 tr6:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 1888 "edn_parser.cc"
+#line 1897 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -1897,7 +1906,7 @@ case 4:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -1905,14 +1914,14 @@ case 4:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 1909 "edn_parser.cc"
+#line 1918 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 599 "edn_parser.rl"
+#line 606 "edn_parser.rl"
 
     if (cs >= EDN_vector_first_final) {
         v = elems;
@@ -1932,7 +1941,7 @@ case 4:
 // list parsing machine
 //
 
-#line 1936 "edn_parser.cc"
+#line 1945 "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;
@@ -1940,7 +1949,7 @@ static const int EDN_list_error = 0;
 static const int EDN_list_en_main = 1;
 
 
-#line 628 "edn_parser.rl"
+#line 635 "edn_parser.rl"
 
 
 //
@@ -1954,14 +1963,14 @@ const char* edn::Parser::parse_list(const char *p, const char *pe, VALUE& v)
     VALUE elems = rb_ary_new();
 
 
-#line 1958 "edn_parser.cc"
+#line 1967 "edn_parser.cc"
 	{
 	cs = EDN_list_start;
 	}
 
-#line 641 "edn_parser.rl"
+#line 648 "edn_parser.rl"
 
-#line 1965 "edn_parser.cc"
+#line 1974 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1972,7 +1981,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr2:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -1980,7 +1989,7 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 1984 "edn_parser.cc"
+#line 1993 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -1989,7 +1998,7 @@ tr3:
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 540 "edn_parser.rl"
+#line 547 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2004,7 +2013,7 @@ tr4:
             // 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();
+                discard.pop_back();
             }
             else {
                 // otherwise we add it to the list of elements for the
@@ -2019,14 +2028,13 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2023 "edn_parser.cc"
+#line 2032 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st2;
 		case 41: goto tr5;
 		case 44: goto st2;
 		case 59: goto st3;
-		case 95: goto tr4;
 	}
 	if ( (*p) < 40 ) {
 		if ( (*p) > 13 ) {
@@ -2035,23 +2043,26 @@ case 2:
 		} else if ( (*p) >= 9 )
 			goto st2;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr4;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr4;
-		} else if ( (*p) >= 65 )
+		} else
 			goto tr4;
 	} else
 		goto tr4;
 	goto tr2;
 tr5:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2055 "edn_parser.cc"
+#line 2066 "edn_parser.cc"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -2071,7 +2082,7 @@ case 3:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2079,14 +2090,14 @@ case 3:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 2083 "edn_parser.cc"
+#line 2094 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 642 "edn_parser.rl"
+#line 649 "edn_parser.rl"
 
     if (cs >= EDN_list_first_final) {
         v = elems;
@@ -2106,7 +2117,7 @@ case 3:
 // hash parsing
 //
 
-#line 2110 "edn_parser.cc"
+#line 2121 "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;
@@ -2114,7 +2125,7 @@ static const int EDN_map_error = 0;
 static const int EDN_map_en_main = 1;
 
 
-#line 672 "edn_parser.rl"
+#line 679 "edn_parser.rl"
 
 
 
@@ -2128,14 +2139,14 @@ const char* edn::Parser::parse_map(const char *p, const char *pe, VALUE& v)
     VALUE elems = rb_ary_new();
 
 
-#line 2132 "edn_parser.cc"
+#line 2143 "edn_parser.cc"
 	{
 	cs = EDN_map_start;
 	}
 
-#line 685 "edn_parser.rl"
+#line 692 "edn_parser.rl"
 
-#line 2139 "edn_parser.cc"
+#line 2150 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2146,7 +2157,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr2:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2154,7 +2165,7 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 2158 "edn_parser.cc"
+#line 2169 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -2163,7 +2174,7 @@ tr3:
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 540 "edn_parser.rl"
+#line 547 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2178,7 +2189,7 @@ tr4:
             // 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();
+                discard.pop_back();
             }
             else {
                 // otherwise we add it to the list of elements for the
@@ -2193,14 +2204,13 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2197 "edn_parser.cc"
+#line 2208 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st2;
 		case 40: goto tr4;
 		case 44: goto st2;
 		case 59: goto st3;
-		case 95: goto tr4;
 		case 125: goto tr6;
 	}
 	if ( (*p) < 42 ) {
@@ -2210,10 +2220,13 @@ case 2:
 		} else if ( (*p) >= 9 )
 			goto st2;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr4;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr4;
-		} else if ( (*p) >= 65 )
+		} else
 			goto tr4;
 	} else
 		goto tr4;
@@ -2226,14 +2239,14 @@ case 3:
 		goto tr3;
 	goto st3;
 tr6:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2237 "edn_parser.cc"
+#line 2250 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2246,7 +2259,7 @@ case 4:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2254,14 +2267,14 @@ case 4:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 2258 "edn_parser.cc"
+#line 2271 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 686 "edn_parser.rl"
+#line 693 "edn_parser.rl"
 
     if (cs >= EDN_map_first_final) {
 
@@ -2297,7 +2310,7 @@ case 4:
 // the remaining data to the correct parser
 //
 
-#line 2301 "edn_parser.cc"
+#line 2314 "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;
@@ -2305,7 +2318,7 @@ static const int EDN_dispatch_error = 0;
 static const int EDN_dispatch_en_main = 1;
 
 
-#line 750 "edn_parser.rl"
+#line 757 "edn_parser.rl"
 
 
 
@@ -2314,14 +2327,14 @@ const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 2318 "edn_parser.cc"
+#line 2331 "edn_parser.cc"
 	{
 	cs = EDN_dispatch_start;
 	}
 
-#line 758 "edn_parser.rl"
+#line 765 "edn_parser.rl"
 
-#line 2325 "edn_parser.cc"
+#line 2338 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2342,40 +2355,40 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 738 "edn_parser.rl"
+#line 745 "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;}
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
 tr2:
-#line 732 "edn_parser.rl"
+#line 739 "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;}
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
 tr3:
-#line 726 "edn_parser.rl"
+#line 733 "edn_parser.rl"
 	{
         // #{ }
         const char *np = parse_set(p, pe, v);
         if (np == NULL) { p--; {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2379 "edn_parser.cc"
+#line 2392 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2384,7 +2397,7 @@ case 2:
 	_out: {}
 	}
 
-#line 759 "edn_parser.rl"
+#line 766 "edn_parser.rl"
 
     if (cs >= EDN_dispatch_first_final) {
         return p + 1;
@@ -2403,7 +2416,7 @@ case 2:
 // set parsing machine
 //
 
-#line 2407 "edn_parser.cc"
+#line 2420 "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;
@@ -2411,7 +2424,7 @@ static const int EDN_set_error = 0;
 static const int EDN_set_en_main = 1;
 
 
-#line 788 "edn_parser.rl"
+#line 795 "edn_parser.rl"
 
 
 //
@@ -2425,14 +2438,14 @@ const char* edn::Parser::parse_set(const char *p, const char *pe, VALUE& v)
     VALUE elems = rb_ary_new(); // stored as an array
 
 
-#line 2429 "edn_parser.cc"
+#line 2442 "edn_parser.cc"
 	{
 	cs = EDN_set_start;
 	}
 
-#line 801 "edn_parser.rl"
+#line 808 "edn_parser.rl"
 
-#line 2436 "edn_parser.cc"
+#line 2449 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2443,7 +2456,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr2:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2451,7 +2464,7 @@ tr2:
             p--; {p++; cs = 0; goto _out;}
         }
 	goto st0;
-#line 2455 "edn_parser.cc"
+#line 2468 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -2460,7 +2473,7 @@ tr3:
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 540 "edn_parser.rl"
+#line 547 "edn_parser.rl"
 	{
         // reads an item within a sequence (vector, list, map, or
         // set). Regardless of the sequence type, an array of the
@@ -2475,7 +2488,7 @@ tr4:
             // 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();
+                discard.pop_back();
             }
             else {
                 // otherwise we add it to the list of elements for the
@@ -2490,14 +2503,13 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2494 "edn_parser.cc"
+#line 2507 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st2;
 		case 40: goto tr4;
 		case 44: goto st2;
 		case 59: goto st3;
-		case 95: goto tr4;
 		case 125: goto tr6;
 	}
 	if ( (*p) < 42 ) {
@@ -2507,10 +2519,13 @@ case 2:
 		} else if ( (*p) >= 9 )
 			goto st2;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr4;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr4;
-		} else if ( (*p) >= 65 )
+		} else
 			goto tr4;
 	} else
 		goto tr4;
@@ -2523,14 +2538,14 @@ case 3:
 		goto tr3;
 	goto st3;
 tr6:
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2534 "edn_parser.cc"
+#line 2549 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2543,7 +2558,7 @@ case 4:
 	switch ( cs ) {
 	case 2:
 	case 3:
-#line 50 "edn_parser.rl"
+#line 51 "edn_parser.rl"
 	{
             std::stringstream s;
             s << "unterminated " << EDN_TYPE;
@@ -2551,14 +2566,14 @@ case 4:
             p--; {p++; cs = 0; goto _out;}
         }
 	break;
-#line 2555 "edn_parser.cc"
+#line 2570 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 802 "edn_parser.rl"
+#line 809 "edn_parser.rl"
 
     if (cs >= EDN_set_first_final) {
         // all elements collected; now convert to a set
@@ -2581,7 +2596,7 @@ case 4:
 // defining a machine to consume items within container delimiters
 //
 
-#line 2585 "edn_parser.cc"
+#line 2600 "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;
@@ -2589,7 +2604,7 @@ static const int EDN_discard_error = 0;
 static const int EDN_discard_en_main = 1;
 
 
-#line 848 "edn_parser.rl"
+#line 861 "edn_parser.rl"
 
 
 
@@ -2599,14 +2614,14 @@ const char* edn::Parser::parse_discard(const char *p, const char *pe)
     VALUE v;
 
 
-#line 2603 "edn_parser.cc"
+#line 2618 "edn_parser.cc"
 	{
 	cs = EDN_discard_start;
 	}
 
-#line 857 "edn_parser.rl"
+#line 870 "edn_parser.rl"
 
-#line 2610 "edn_parser.cc"
+#line 2625 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2616,10 +2631,20 @@ case 1:
 	if ( (*p) == 95 )
 		goto st2;
 	goto st0;
+tr2:
+#line 851 "edn_parser.rl"
+	{
+        std::stringstream s;
+        s << "discard sequence without element to discard";
+        error(__FUNCTION__, s.str());
+        p--; {p++; cs = 0; goto _out;}
+    }
+	goto st0;
+#line 2644 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
-tr2:
+tr3:
 #line 20 "edn_parser.rl"
 	{ line_number++; }
 	goto st2;
@@ -2627,59 +2652,61 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2631 "edn_parser.cc"
+#line 2656 "edn_parser.cc"
 	switch( (*p) ) {
-		case 10: goto tr2;
+		case 10: goto tr3;
 		case 32: goto st2;
-		case 40: goto tr3;
+		case 40: goto tr4;
 		case 44: goto st2;
 		case 59: goto st3;
-		case 95: goto tr3;
 	}
 	if ( (*p) < 42 ) {
 		if ( (*p) > 13 ) {
 			if ( 33 <= (*p) && (*p) <= 38 )
-				goto tr3;
+				goto tr4;
 		} else if ( (*p) >= 9 )
 			goto st2;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr4;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
-				goto tr3;
-		} else if ( (*p) >= 65 )
-			goto tr3;
+				goto tr4;
+		} else
+			goto tr4;
 	} else
-		goto tr3;
-	goto st0;
-tr3:
-#line 831 "edn_parser.rl"
+		goto tr4;
+	goto tr2;
+tr4:
+#line 838 "edn_parser.rl"
 	{
         const char *np = parse_value(p, pe, v);
         if (np) {
             // this token is to be discard it so store it in the
             // discard stack - we really don't need to save it so this
             // could be simplified
-            discard.push(v);
+            discard.push_back(v);
             {p = (( np))-1;}
         } else {
             p--; {p++; cs = 4; goto _out;}
         }
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2676 "edn_parser.cc"
+#line 2703 "edn_parser.cc"
 	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
 	if ( (*p) == 10 )
-		goto tr2;
+		goto tr3;
 	goto st3;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2687,10 +2714,26 @@ case 3:
 	_test_eof3: cs = 3; goto _test_eof;
 
 	_test_eof: {}
+	if ( p == eof )
+	{
+	switch ( cs ) {
+	case 2:
+#line 851 "edn_parser.rl"
+	{
+        std::stringstream s;
+        s << "discard sequence without element to discard";
+        error(__FUNCTION__, s.str());
+        p--; {p++; cs = 0; goto _out;}
+    }
+	break;
+#line 2730 "edn_parser.cc"
+	}
+	}
+
 	_out: {}
 	}
 
-#line 858 "edn_parser.rl"
+#line 871 "edn_parser.rl"
 
     if (cs >= EDN_discard_first_final) {
         return p + 1;
@@ -2721,7 +2764,7 @@ case 3:
 // 2. add parse checks for uuid and inst for better error reporting
 //
 
-#line 2725 "edn_parser.cc"
+#line 2768 "edn_parser.cc"
 static const int EDN_tagged_start = 1;
 static const int EDN_tagged_first_final = 6;
 static const int EDN_tagged_error = 0;
@@ -2729,7 +2772,7 @@ static const int EDN_tagged_error = 0;
 static const int EDN_tagged_en_main = 1;
 
 
-#line 909 "edn_parser.rl"
+#line 922 "edn_parser.rl"
 
 
 
@@ -2741,14 +2784,14 @@ const char* edn::Parser::parse_tagged(const char *p, const char *pe, VALUE& v)
     int cs;
 
 
-#line 2745 "edn_parser.cc"
+#line 2788 "edn_parser.cc"
 	{
 	cs = EDN_tagged_start;
 	}
 
-#line 920 "edn_parser.rl"
+#line 933 "edn_parser.rl"
 
-#line 2752 "edn_parser.cc"
+#line 2795 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2765,7 +2808,7 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 896 "edn_parser.rl"
+#line 909 "edn_parser.rl"
 	{
         // parses the symbol portion of the pair
         const char *np = parse_symbol(p, pe, sym_name);
@@ -2776,15 +2819,16 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2780 "edn_parser.cc"
+#line 2823 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
 		case 35: goto tr5;
-		case 40: goto tr4;
+		case 39: goto st2;
 		case 44: goto st3;
-		case 47: goto tr6;
+		case 47: goto tr7;
 		case 59: goto st4;
+		case 94: goto tr4;
 		case 95: goto tr5;
 		case 123: goto tr4;
 	}
@@ -2792,7 +2836,7 @@ case 2:
 		if ( (*p) < 33 ) {
 			if ( 9 <= (*p) && (*p) <= 13 )
 				goto st3;
-		} else if ( (*p) > 38 ) {
+		} else if ( (*p) > 40 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
 				goto tr4;
 		} else
@@ -2820,14 +2864,13 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 2824 "edn_parser.cc"
+#line 2868 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
 		case 40: goto tr4;
 		case 44: goto st3;
 		case 59: goto st4;
-		case 95: goto tr4;
 	}
 	if ( (*p) < 42 ) {
 		if ( (*p) > 13 ) {
@@ -2836,29 +2879,32 @@ case 3:
 		} else if ( (*p) >= 9 )
 			goto st3;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr4;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr4;
-		} else if ( (*p) >= 65 )
+		} else
 			goto tr4;
 	} else
 		goto tr4;
 	goto st0;
 tr4:
-#line 901 "edn_parser.rl"
+#line 914 "edn_parser.rl"
 	{
         // parses the value portion
         const char *np = parse_value(p, pe, data);
         if (np == NULL) { p--; {p++; cs = 6; goto _out;} } else { {p = (( np))-1;} }
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 6; goto _out;} }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 2862 "edn_parser.cc"
+#line 2908 "edn_parser.cc"
 	goto st0;
 st4:
 	if ( ++p == pe )
@@ -2868,28 +2914,29 @@ case 4:
 		goto tr3;
 	goto st4;
 tr5:
-#line 901 "edn_parser.rl"
+#line 914 "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 { {p = (( np))-1;} }
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 7; goto _out;} }
 	goto st7;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 2885 "edn_parser.cc"
+#line 2931 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
 		case 35: goto tr5;
-		case 40: goto tr4;
+		case 39: goto st2;
 		case 44: goto st3;
-		case 47: goto tr6;
+		case 47: goto tr7;
 		case 59: goto st4;
+		case 94: goto tr4;
 		case 95: goto tr5;
 		case 123: goto tr4;
 	}
@@ -2897,7 +2944,7 @@ case 7:
 		if ( (*p) < 33 ) {
 			if ( 9 <= (*p) && (*p) <= 13 )
 				goto st3;
-		} else if ( (*p) > 38 ) {
+		} else if ( (*p) > 40 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
 				goto tr4;
 		} else
@@ -2917,21 +2964,21 @@ case 7:
 	} else
 		goto tr5;
 	goto st0;
-tr6:
-#line 901 "edn_parser.rl"
+tr7:
+#line 914 "edn_parser.rl"
 	{
         // parses the value portion
         const char *np = parse_value(p, pe, data);
         if (np == NULL) { p--; {p++; cs = 8; goto _out;} } else { {p = (( np))-1;} }
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 2935 "edn_parser.cc"
+#line 2982 "edn_parser.cc"
 	if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
 			goto st5;
@@ -2945,19 +2992,20 @@ case 5:
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
-		case 35: goto tr8;
-		case 40: goto tr4;
+		case 35: goto tr9;
+		case 39: goto st5;
 		case 44: goto st3;
 		case 47: goto tr4;
 		case 59: goto st4;
-		case 95: goto tr8;
+		case 94: goto tr4;
+		case 95: goto tr9;
 		case 123: goto tr4;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) < 33 ) {
 			if ( 9 <= (*p) && (*p) <= 13 )
 				goto st3;
-		} else if ( (*p) > 38 ) {
+		} else if ( (*p) > 40 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
 				goto tr4;
 		} else
@@ -2969,45 +3017,46 @@ case 5:
 		} else if ( (*p) > 90 ) {
 			if ( (*p) > 92 ) {
 				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr8;
+					goto tr9;
 			} else if ( (*p) >= 91 )
 				goto tr4;
 		} else
-			goto tr8;
+			goto tr9;
 	} else
-		goto tr8;
+		goto tr9;
 	goto st0;
-tr8:
-#line 901 "edn_parser.rl"
+tr9:
+#line 914 "edn_parser.rl"
 	{
         // parses the value portion
         const char *np = parse_value(p, pe, data);
         if (np == NULL) { p--; {p++; cs = 9; goto _out;} } else { {p = (( np))-1;} }
     }
-#line 57 "edn_parser.rl"
+#line 58 "edn_parser.rl"
 	{ p--; {p++; cs = 9; goto _out;} }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 2995 "edn_parser.cc"
+#line 3043 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
-		case 35: goto tr8;
-		case 40: goto tr4;
+		case 35: goto tr9;
+		case 39: goto st5;
 		case 44: goto st3;
 		case 47: goto tr4;
 		case 59: goto st4;
-		case 95: goto tr8;
+		case 94: goto tr4;
+		case 95: goto tr9;
 		case 123: goto tr4;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) < 33 ) {
 			if ( 9 <= (*p) && (*p) <= 13 )
 				goto st3;
-		} else if ( (*p) > 38 ) {
+		} else if ( (*p) > 40 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
 				goto tr4;
 		} else
@@ -3019,13 +3068,13 @@ case 9:
 		} else if ( (*p) > 90 ) {
 			if ( (*p) > 92 ) {
 				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr8;
+					goto tr9;
 			} else if ( (*p) >= 91 )
 				goto tr4;
 		} else
-			goto tr8;
+			goto tr9;
 	} else
-		goto tr8;
+		goto tr9;
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -3041,7 +3090,7 @@ case 9:
 	_out: {}
 	}
 
-#line 921 "edn_parser.rl"
+#line 934 "edn_parser.rl"
 
     if (cs >= EDN_tagged_first_final) {
         //std::cerr << __FUNCTION__ << " parse symbol name as '" << sym_name << "', value is: " << data << std::endl;
@@ -3066,12 +3115,123 @@ case 9:
 
 
 
+// ============================================================
+// 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?
+//
+
+#line 3125 "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;
+
+static const int EDN_meta_en_main = 1;
+
+
+#line 977 "edn_parser.rl"
+
+
+
+const char* edn::Parser::parse_meta(const char *p, const char *pe)
+{
+    int cs;
+    VALUE v;
+
+
+#line 3143 "edn_parser.cc"
+	{
+	cs = EDN_meta_start;
+	}
+
+#line 986 "edn_parser.rl"
+
+#line 3150 "edn_parser.cc"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+case 1:
+	if ( (*p) == 94 )
+		goto st2;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	if ( (*p) == 40 )
+		goto tr2;
+	if ( (*p) < 60 ) {
+		if ( (*p) < 42 ) {
+			if ( 33 <= (*p) && (*p) <= 38 )
+				goto tr2;
+		} else if ( (*p) > 43 ) {
+			if ( 45 <= (*p) && (*p) <= 58 )
+				goto tr2;
+		} else
+			goto tr2;
+	} else if ( (*p) > 63 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr2;
+		} else if ( (*p) > 95 ) {
+			if ( 97 <= (*p) && (*p) <= 123 )
+				goto tr2;
+		} else
+			goto tr2;
+	} else
+		goto tr2;
+	goto st0;
+tr2:
+#line 969 "edn_parser.rl"
+	{
+        const char *np = parse_value(p, pe, v);
+        if (np) { {p = (( np))-1;} } else { p--; {p++; cs = 3; goto _out;} }
+    }
+#line 58 "edn_parser.rl"
+	{ p--; {p++; cs = 3; goto _out;} }
+	goto st3;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+#line 3203 "edn_parser.cc"
+	goto st0;
+	}
+	_test_eof2: cs = 2; goto _test_eof;
+	_test_eof3: cs = 3; goto _test_eof;
+
+	_test_eof: {}
+	_out: {}
+	}
+
+#line 987 "edn_parser.rl"
+
+    if (cs >= EDN_meta_first_final) {
+        metadata.push_back(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;
+}
+
+
+
 // ============================================================
 // parses entire input but expects single valid token at the
 // top-level, therefore, does not tokenize source stream
 //
 
-#line 3075 "edn_parser.cc"
+#line 3235 "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;
@@ -3079,7 +3239,7 @@ static const int EDN_parser_error = 0;
 static const int EDN_parser_en_main = 2;
 
 
-#line 965 "edn_parser.rl"
+#line 1036 "edn_parser.rl"
 
 
 
@@ -3088,21 +3248,16 @@ VALUE edn::Parser::parse(const char* src, std::size_t len)
     int cs;
     VALUE result = Qnil;
 
-    // reset line counter & discard stack
-    reset();
-
 
-#line 3096 "edn_parser.cc"
+#line 3253 "edn_parser.cc"
 	{
 	cs = EDN_parser_start;
 	}
 
-#line 977 "edn_parser.rl"
-    p = src;
-    pe = p + len;
-    eof = pe;
+#line 1045 "edn_parser.rl"
+    set_source(src, len);
 
-#line 3106 "edn_parser.cc"
+#line 3261 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3113,24 +3268,36 @@ tr1:
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 955 "edn_parser.rl"
+#line 1013 "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_size = metadata.size();
         const char* np = parse_value(p, pe, result);
-        if (np == NULL) { {p = (( pe))-1;} {p++; cs = 2; goto _out;} } else {p = (( np))-1;}
+        if (np == NULL) { {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
+            if (!metadata.empty() && metadata.size() == meta_size) {
+                // this will empty the metadata sequence too
+                result = bind_meta_to_value(result);
+            }
+            {p = (( np))-1;}
+        }
     }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3127 "edn_parser.cc"
+#line 3295 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr1;
 		case 32: goto st2;
 		case 40: goto tr4;
 		case 44: goto st2;
 		case 59: goto st1;
-		case 95: goto tr4;
 	}
 	if ( (*p) < 42 ) {
 		if ( (*p) > 13 ) {
@@ -3139,10 +3306,13 @@ case 2:
 		} else if ( (*p) >= 9 )
 			goto st2;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr4;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr4;
-		} else if ( (*p) >= 65 )
+		} else
 			goto tr4;
 	} else
 		goto tr4;
@@ -3165,16 +3335,15 @@ case 1:
 	_out: {}
 	}
 
-#line 981 "edn_parser.rl"
+#line 1047 "edn_parser.rl"
 
     if (cs == EDN_parser_error) {
-        error(__FUNCTION__, *p);
-        return Qnil;
+        if (p)
+            error(__FUNCTION__, *p);
+        return EDNT_EOF;
     }
     else if (cs == EDN_parser_first_final) {
-        // whole source is parsed so reset
         p = pe = eof = NULL;
-        reset();
     }
     else if (cs == EDN_parser_en_main) {} // silence ragel warning
     return result;
@@ -3185,32 +3354,40 @@ case 1:
 // token-by-token machine
 //
 
-#line 3189 "edn_parser.cc"
+#line 3358 "edn_parser.cc"
 static const int EDN_tokens_start = 1;
+static const int EDN_tokens_error = 0;
 
 static const int EDN_tokens_en_main = 1;
 
 
-#line 1013 "edn_parser.rl"
+#line 1100 "edn_parser.rl"
 
 
 
 //
 //
-VALUE edn::Parser::next()
+bool edn::Parser::parse_next(VALUE& value)
 {
-    VALUE result = Qnil;
     int cs;
+    bool is_value = true;
+    // 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_size;
+
+    // clear any previously saved discards; only track if read during
+    // this op
+    discard.clear();
 
 
-#line 3207 "edn_parser.cc"
+#line 3384 "edn_parser.cc"
 	{
 	cs = EDN_tokens_start;
 	}
 
-#line 1024 "edn_parser.rl"
+#line 1118 "edn_parser.rl"
 
-#line 3214 "edn_parser.cc"
+#line 3391 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3224,14 +3401,13 @@ st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 3228 "edn_parser.cc"
+#line 3405 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr2;
 		case 32: goto st1;
 		case 40: goto tr3;
 		case 44: goto st1;
 		case 59: goto st3;
-		case 95: goto tr3;
 	}
 	if ( (*p) < 42 ) {
 		if ( (*p) > 13 ) {
@@ -3240,10 +3416,13 @@ case 1:
 		} else if ( (*p) >= 9 )
 			goto st1;
 	} else if ( (*p) > 63 ) {
-		if ( (*p) > 92 ) {
+		if ( (*p) < 94 ) {
+			if ( 65 <= (*p) && (*p) <= 92 )
+				goto tr3;
+		} else if ( (*p) > 95 ) {
 			if ( 97 <= (*p) && (*p) <= 123 )
 				goto tr3;
-		} else if ( (*p) >= 65 )
+		} else
 			goto tr3;
 	} else
 		goto tr3;
@@ -3256,17 +3435,41 @@ tr6:
 	{ line_number++; }
 	goto st4;
 tr3:
-#line 1005 "edn_parser.rl"
-	{
-        const char* np = parse_value(p, pe, result);
-        if (np == NULL) { p--; {p++; cs = 4; goto _out;} } else { {p = (( np))-1;} }
+#line 1070 "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
+        // elements in the metadata sequence; then we can check if it
+        // grew or if the discard sequence grew
+        meta_size = metadata.size();
+
+        const char* np = parse_value(p, pe, value);
+
+        if (np == NULL) { p--; {p++; cs = 4; goto _out;} } else {
+            if (metadata.size() > 0) {
+                // was anotheran additional metadata entry read? if
+                // so, don't return a value
+                if (metadata.size() > meta_size) {
+                    is_value = false;
+                }
+                else {
+                    // a value was read and there's a pending metadata
+                    // sequence. Bind them.
+                    value = bind_meta_to_value(value);
+                }
+            } else if (!discard.empty()) {
+                // a discard read. Don't return a value
+                is_value = false;
+            }
+            {p = (( np))-1;}
+        }
     }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 3270 "edn_parser.cc"
+#line 3473 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr6;
 		case 32: goto st4;
@@ -3300,11 +3503,14 @@ case 3:
 	_out: {}
 	}
 
-#line 1025 "edn_parser.rl"
+#line 1119 "edn_parser.rl"
 
-    if (cs == EDN_tokens_en_main) {} // silence ragel warning
+    if (cs == EDN_parser_error) {
+        value = EDNT_EOF;
+    }
+    else if (cs == EDN_tokens_en_main) {} // silence ragel warning
 
-    return result;
+    return is_value;
 }