edn_turbo 0.6.1 → 0.7.2

data/ext/edn_turbo/edn_parser.cc

@@ -2,7 +2,7 @@
 #line 1 "edn_parser.rl"
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// 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
@@ -2727,8 +2727,6 @@ case 3:
 #line 753 "edn_parser.rl"
 
    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(rb_mEDN, EDN_MAKE_LIST_METHOD, elems);
       return p + 1;
    }
@@ -2746,7 +2744,7 @@ case 3:
 // hash parsing
 //
 
-#line 2750 "edn_parser.cc"
+#line 2748 "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;
@@ -2754,7 +2752,7 @@ static const int EDN_map_error = 0;
 static const int EDN_map_en_main = 1;
 
 
-#line 785 "edn_parser.rl"
+#line 783 "edn_parser.rl"
 
 
 
@@ -2768,14 +2766,14 @@ const char* edn::Parser::parse_map(const char *p, const char *pe, VALUE& v)
    VALUE elems;
 
 
-#line 2772 "edn_parser.cc"
+#line 2770 "edn_parser.cc"
 	{
 	cs = EDN_map_start;
 	}
 
-#line 798 "edn_parser.rl"
+#line 796 "edn_parser.rl"
 
-#line 2779 "edn_parser.cc"
+#line 2777 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2794,7 +2792,7 @@ tr2:
       p--; {p++; cs = 0; goto _out;}
    }
 	goto st0;
-#line 2798 "edn_parser.cc"
+#line 2796 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -2853,7 +2851,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 2857 "edn_parser.cc"
+#line 2855 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr4;
 		case 32: goto st2;
@@ -2899,7 +2897,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 2903 "edn_parser.cc"
+#line 2901 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -2920,14 +2918,14 @@ case 4:
       p--; {p++; cs = 0; goto _out;}
    }
 	break;
-#line 2924 "edn_parser.cc"
+#line 2922 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 799 "edn_parser.rl"
+#line 797 "edn_parser.rl"
 
    if (cs >= EDN_map_first_final) {
       // hash parsing is done. Make sure we have an even count
@@ -2962,7 +2960,7 @@ case 4:
 // the remaining data to the correct parser
 //
 
-#line 2966 "edn_parser.cc"
+#line 2964 "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;
@@ -2970,7 +2968,7 @@ static const int EDN_dispatch_error = 0;
 static const int EDN_dispatch_en_main = 1;
 
 
-#line 862 "edn_parser.rl"
+#line 879 "edn_parser.rl"
 
 
 
@@ -2979,14 +2977,14 @@ const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
    int cs;
 
 
-#line 2983 "edn_parser.cc"
+#line 2981 "edn_parser.cc"
 	{
 	cs = EDN_dispatch_start;
 	}
 
-#line 870 "edn_parser.rl"
+#line 887 "edn_parser.rl"
 
-#line 2990 "edn_parser.cc"
+#line 2988 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2994,20 +2992,44 @@ const char* edn::Parser::parse_dispatch(const char *p, const char *pe, VALUE& v)
 	{
 case 1:
 	switch( (*p) ) {
-		case 95: goto tr2;
-		case 123: goto tr3;
+		case 35: goto tr0;
+		case 95: goto tr3;
+		case 123: goto tr4;
 	}
 	if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr0;
+			goto tr2;
 	} else if ( (*p) >= 65 )
-		goto tr0;
+		goto tr2;
 	goto st0;
 st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 850 "edn_parser.rl"
+#line 854 "edn_parser.rl"
+	{
+      // ##Inf, ##NaN, etc.
+      VALUE sym = Qnil;
+      const char *np = parse_symbol(p+1, pe, sym);
+      if (np == nullptr) { p--; {p++; cs = 2; goto _out;} } 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);
+         }
+
+         {p = (( np))-1;}
+      }
+   }
+#line 80 "edn_parser.rl"
+	{ p--; {p++; cs = 2; goto _out;} }
+	goto st2;
+tr2:
+#line 848 "edn_parser.rl"
 	{
       // #inst, #uuid, or #user/tag
       const char *np = parse_tagged(p, pe, v);
@@ -3016,8 +3038,8 @@ tr0:
 #line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
-tr2:
-#line 844 "edn_parser.rl"
+tr3:
+#line 842 "edn_parser.rl"
 	{
       // discard token #_
       const char *np = parse_discard(p, pe);
@@ -3026,8 +3048,8 @@ tr2:
 #line 80 "edn_parser.rl"
 	{ p--; {p++; cs = 2; goto _out;} }
 	goto st2;
-tr3:
-#line 838 "edn_parser.rl"
+tr4:
+#line 836 "edn_parser.rl"
 	{
       // #{ }
       const char *np = parse_set(p, pe, v);
@@ -3040,7 +3062,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3044 "edn_parser.cc"
+#line 3066 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -3049,7 +3071,7 @@ case 2:
 	_out: {}
 	}
 
-#line 871 "edn_parser.rl"
+#line 888 "edn_parser.rl"
 
    if (cs >= EDN_dispatch_first_final) {
       return p + 1;
@@ -3067,7 +3089,7 @@ case 2:
 // set parsing machine
 //
 
-#line 3071 "edn_parser.cc"
+#line 3093 "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;
@@ -3075,7 +3097,7 @@ static const int EDN_set_error = 0;
 static const int EDN_set_en_main = 1;
 
 
-#line 899 "edn_parser.rl"
+#line 916 "edn_parser.rl"
 
 
 //
@@ -3089,14 +3111,14 @@ const char* edn::Parser::parse_set(const char *p, const char *pe, VALUE& v)
    VALUE elems; // holds the set's elements as an array allocated in @open_seq
 
 
-#line 3093 "edn_parser.cc"
+#line 3115 "edn_parser.cc"
 	{
 	cs = EDN_set_start;
 	}
 
-#line 912 "edn_parser.rl"
+#line 929 "edn_parser.rl"
 
-#line 3100 "edn_parser.cc"
+#line 3122 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3115,7 +3137,7 @@ tr2:
       p--; {p++; cs = 0; goto _out;}
    }
 	goto st0;
-#line 3119 "edn_parser.cc"
+#line 3141 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -3174,7 +3196,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3178 "edn_parser.cc"
+#line 3200 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr4;
 		case 32: goto st2;
@@ -3220,7 +3242,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 3224 "edn_parser.cc"
+#line 3246 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -3241,14 +3263,14 @@ case 4:
       p--; {p++; cs = 0; goto _out;}
    }
 	break;
-#line 3245 "edn_parser.cc"
+#line 3267 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 913 "edn_parser.rl"
+#line 930 "edn_parser.rl"
 
    if (cs >= EDN_set_first_final) {
       // all elements collected; now convert to a set
@@ -3271,7 +3293,7 @@ case 4:
 // defining a machine to consume items within container delimiters
 //
 
-#line 3275 "edn_parser.cc"
+#line 3297 "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;
@@ -3279,7 +3301,7 @@ static const int EDN_discard_error = 0;
 static const int EDN_discard_en_main = 1;
 
 
-#line 963 "edn_parser.rl"
+#line 980 "edn_parser.rl"
 
 
 
@@ -3289,14 +3311,14 @@ const char* edn::Parser::parse_discard(const char *p, const char *pe)
    VALUE v;
 
 
-#line 3293 "edn_parser.cc"
+#line 3315 "edn_parser.cc"
 	{
 	cs = EDN_discard_start;
 	}
 
-#line 972 "edn_parser.rl"
+#line 989 "edn_parser.rl"
 
-#line 3300 "edn_parser.cc"
+#line 3322 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3307,7 +3329,7 @@ case 1:
 		goto st2;
 	goto st0;
 tr2:
-#line 953 "edn_parser.rl"
+#line 970 "edn_parser.rl"
 	{
       std::stringstream s;
       s << "discard sequence without element to discard";
@@ -3315,7 +3337,7 @@ tr2:
       p--; {p++; cs = 0; goto _out;}
    }
 	goto st0;
-#line 3319 "edn_parser.cc"
+#line 3341 "edn_parser.cc"
 st0:
 cs = 0;
 	goto _out;
@@ -3327,7 +3349,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3331 "edn_parser.cc"
+#line 3353 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st2;
@@ -3353,7 +3375,7 @@ case 2:
 		goto tr4;
 	goto tr2;
 tr4:
-#line 942 "edn_parser.rl"
+#line 959 "edn_parser.rl"
 	{
       const char *np = parse_value(p, pe, v);
       if (np == nullptr) { p--; {p++; cs = 4; goto _out;} } else {
@@ -3371,7 +3393,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 3375 "edn_parser.cc"
+#line 3397 "edn_parser.cc"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -3390,7 +3412,7 @@ case 3:
 	{
 	switch ( cs ) {
 	case 2:
-#line 953 "edn_parser.rl"
+#line 970 "edn_parser.rl"
 	{
       std::stringstream s;
       s << "discard sequence without element to discard";
@@ -3398,14 +3420,14 @@ case 3:
       p--; {p++; cs = 0; goto _out;}
    }
 	break;
-#line 3402 "edn_parser.cc"
+#line 3424 "edn_parser.cc"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 973 "edn_parser.rl"
+#line 990 "edn_parser.rl"
 
    if (cs >= EDN_discard_first_final) {
       return p + 1;
@@ -3435,7 +3457,7 @@ case 3:
 // 2. add parse checks for uuid and inst for better error reporting
 //
 
-#line 3439 "edn_parser.cc"
+#line 3461 "edn_parser.cc"
 static const int EDN_tagged_start = 1;
 static const int EDN_tagged_first_final = 7;
 static const int EDN_tagged_error = 0;
@@ -3443,7 +3465,7 @@ static const int EDN_tagged_error = 0;
 static const int EDN_tagged_en_main = 1;
 
 
-#line 1040 "edn_parser.rl"
+#line 1057 "edn_parser.rl"
 
 
 
@@ -3457,14 +3479,14 @@ const char* edn::Parser::parse_tagged(const char *p, const char *pe, VALUE& v)
    int cs;
 
 
-#line 3461 "edn_parser.cc"
+#line 3483 "edn_parser.cc"
 	{
 	cs = EDN_tagged_start;
 	}
 
-#line 1053 "edn_parser.rl"
+#line 1070 "edn_parser.rl"
 
-#line 3468 "edn_parser.cc"
+#line 3490 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3481,7 +3503,7 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 1019 "edn_parser.rl"
+#line 1036 "edn_parser.rl"
 	{
       // parses the symbol portion of the pair
       const char *np = parse_symbol(p, pe, sym_name);
@@ -3495,7 +3517,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3499 "edn_parser.cc"
+#line 3521 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
@@ -3528,7 +3550,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 3532 "edn_parser.cc"
+#line 3554 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr3;
 		case 32: goto st3;
@@ -3554,7 +3576,7 @@ case 3:
 		goto tr7;
 	goto st0;
 tr7:
-#line 1027 "edn_parser.rl"
+#line 1044 "edn_parser.rl"
 	{
       // parses the value portion
       const char *np = parse_value(p, pe, data);
@@ -3570,7 +3592,7 @@ st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 3574 "edn_parser.cc"
+#line 3596 "edn_parser.cc"
 	goto st0;
 st4:
 	if ( ++p == pe )
@@ -3648,7 +3670,7 @@ case 6:
 	_out: {}
 	}
 
-#line 1054 "edn_parser.rl"
+#line 1071 "edn_parser.rl"
 
    if (cs >= EDN_tagged_first_final) {
         //std::cerr << __FUNCTION__ << " parse symbol name as '" << sym_name << "', value is: " << data << std::endl;
@@ -3684,7 +3706,7 @@ case 6:
 // useful?
 //
 
-#line 3688 "edn_parser.cc"
+#line 3710 "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;
@@ -3692,7 +3714,7 @@ static const int EDN_meta_error = 0;
 static const int EDN_meta_en_main = 1;
 
 
-#line 1102 "edn_parser.rl"
+#line 1119 "edn_parser.rl"
 
 
 
@@ -3702,14 +3724,14 @@ const char* edn::Parser::parse_meta(const char *p, const char *pe)
    VALUE v;
 
 
-#line 3706 "edn_parser.cc"
+#line 3728 "edn_parser.cc"
 	{
 	cs = EDN_meta_start;
 	}
 
-#line 1111 "edn_parser.rl"
+#line 1128 "edn_parser.rl"
 
-#line 3713 "edn_parser.cc"
+#line 3735 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3748,7 +3770,7 @@ case 2:
 		goto tr2;
 	goto st0;
 tr2:
-#line 1094 "edn_parser.rl"
+#line 1111 "edn_parser.rl"
 	{
       const char *np = parse_value(p, pe, v);
       if (np == nullptr) { p--; {p++; cs = 3; goto _out;} } else { {p = (( np))-1;} }
@@ -3760,7 +3782,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 3764 "edn_parser.cc"
+#line 3786 "edn_parser.cc"
 	goto st0;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
@@ -3770,7 +3792,7 @@ case 3:
 	_out: {}
 	}
 
-#line 1112 "edn_parser.rl"
+#line 1129 "edn_parser.rl"
 
    if (cs >= EDN_meta_first_final) {
       append_to_meta(v);
@@ -3791,7 +3813,7 @@ case 3:
 // top-level, therefore, does not tokenize source stream
 //
 
-#line 3795 "edn_parser.cc"
+#line 3817 "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;
@@ -3799,7 +3821,7 @@ static const int EDN_parser_error = 0;
 static const int EDN_parser_en_main = 2;
 
 
-#line 1160 "edn_parser.rl"
+#line 1177 "edn_parser.rl"
 
 
 
@@ -3809,15 +3831,15 @@ VALUE edn::Parser::parse(const char* src, std::size_t len)
    VALUE result = EDN_EOF_CONST;
 
 
-#line 3813 "edn_parser.cc"
+#line 3835 "edn_parser.cc"
 	{
 	cs = EDN_parser_start;
 	}
 
-#line 1169 "edn_parser.rl"
+#line 1186 "edn_parser.rl"
    set_source(src, len);
 
-#line 3821 "edn_parser.cc"
+#line 3843 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3828,7 +3850,7 @@ tr1:
 	{ line_number++; }
 	goto st2;
 tr4:
-#line 1137 "edn_parser.rl"
+#line 1154 "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
@@ -3851,7 +3873,7 @@ st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 3855 "edn_parser.cc"
+#line 3877 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr1;
 		case 32: goto st2;
@@ -3894,7 +3916,7 @@ case 1:
 	_out: {}
 	}
 
-#line 1171 "edn_parser.rl"
+#line 1188 "edn_parser.rl"
 
    if (cs == EDN_parser_error) {
       error(__FUNCTION__, *p);
@@ -3912,13 +3934,13 @@ case 1:
 // token-by-token machine
 //
 
-#line 3916 "edn_parser.cc"
+#line 3938 "edn_parser.cc"
 static const int EDN_tokens_start = 1;
 
 static const int EDN_tokens_en_main = 1;
 
 
-#line 1225 "edn_parser.rl"
+#line 1242 "edn_parser.rl"
 
 
 
@@ -3937,14 +3959,14 @@ edn::Parser::eTokenState edn::Parser::parse_next(VALUE& value)
    discard.clear();
 
 
-#line 3941 "edn_parser.cc"
+#line 3963 "edn_parser.cc"
 	{
 	cs = EDN_tokens_start;
 	}
 
-#line 1243 "edn_parser.rl"
+#line 1260 "edn_parser.rl"
 
-#line 3948 "edn_parser.cc"
+#line 3970 "edn_parser.cc"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3958,7 +3980,7 @@ st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 3962 "edn_parser.cc"
+#line 3984 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr2;
 		case 32: goto st1;
@@ -3991,7 +4013,7 @@ tr6:
 	{ line_number++; }
 	goto st4;
 tr3:
-#line 1193 "edn_parser.rl"
+#line 1210 "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
@@ -4027,7 +4049,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 4031 "edn_parser.cc"
+#line 4053 "edn_parser.cc"
 	switch( (*p) ) {
 		case 10: goto tr6;
 		case 32: goto st4;
@@ -4061,7 +4083,7 @@ case 3:
 	_out: {}
 	}
 
-#line 1244 "edn_parser.rl"
+#line 1261 "edn_parser.rl"
 
    if (cs == EDN_tokens_en_main) {} // silence ragel warning
    return state;

data/ext/edn_turbo/edn_parser.rl

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2015-2019 Ed Porras
+// 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
@@ -851,10 +851,29 @@ const char* edn::Parser::parse_map(const char *p, const char *pe, VALUE& 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;
 }%%