From 6069d9f049cbf703d94e7b48f7aca2a85b75af64 Mon Sep 17 00:00:00 2001
From: Roberto Alsina <roberto.alsina@gmail.com>
Date: Fri, 14 Jul 2023 17:52:25 -0300
Subject: [PATCH] So the test was wrong :-)

---
 spec/shortcodes_spec.cr |  24 ++--
 src/shortcodes.c        | 264 +++++++++++++++++++---------------------
 2 files changed, 137 insertions(+), 151 deletions(-)

diff --git a/spec/shortcodes_spec.cr b/spec/shortcodes_spec.cr
index 26f4b36..28e72b4 100644
--- a/spec/shortcodes_spec.cr
+++ b/spec/shortcodes_spec.cr
@@ -36,7 +36,17 @@ describe "Shortcodes" do
     input[result.errors[0].position, 3].should eq ">}}"
   end
 
-  it "foo should accept mismatched brackets in qvals" do
+  it "should accept mismatched brackets inside data are ok" do
+    input = "foobar {{% sc %}} >}}blah {{% /sc %}} "
+    result = parse(input)
+    result.shortcodes.size.should eq 1
+    result.errors.size.should eq 0
+    result.shortcodes[0].whole.should eq "{{% sc %}} >}}blah {{% /sc %}}"
+    result.shortcodes[0].data.should eq " >}}blah "
+    result.shortcodes[0].args.size.should eq 0
+  end
+
+  it "should accept mismatched brackets in qvals" do
     input = "foobar {{% sc  \">}}blah\" %}} {{% /sc %}}"
     result = parse(input)
     result.shortcodes.size.should eq 1
@@ -46,18 +56,6 @@ describe "Shortcodes" do
     result.shortcodes[0].args[0].@value.should eq ">}}blah"
   end
 
-  it "foo should accept mismatched brackets inside data are ok" do
-    input = "foobar {{% sc %}} >}}blah {{% /sc %}} "
-    result = parse(input)
-    result.shortcodes.size.should eq 1
-    result.errors.size.should eq 0
-    result.shortcodes[0].whole.should eq "{{% sc %}} >}}blah {{% /sc %}}"
-    result.shortcodes[0].data.should eq " >}}blah "
-    result.shortcodes[0].args.size.should eq 1
-    result.shortcodes[0].args[0].@value.should eq ">}}blah"
-  end
-
-
   it "should consider spaces in shortcodes optional" do
     input = "foobar {{%    shortcode%}}blah"
     result = parse(input)
diff --git a/src/shortcodes.c b/src/shortcodes.c
index 616e077..611be31 100644
--- a/src/shortcodes.c
+++ b/src/shortcodes.c
@@ -4,7 +4,7 @@
 #include "shortcodes.h"
 
 
-#line 111 "shortcodes.rl"
+#line 110 "shortcodes.rl"
 
 
 
@@ -19,7 +19,7 @@ static const int shortcode_error = -1;
 static const int shortcode_en_main = 141;
 
 
-#line 117 "shortcodes.rl"
+#line 116 "shortcodes.rl"
   char *eof = input + len;
   char *ts, *te = 0;
   int cs, act = 0;
@@ -42,7 +42,7 @@ static const int shortcode_en_main = 141;
 	cs = shortcode_start;
 	}
 
-#line 134 "shortcodes.rl"
+#line 133 "shortcodes.rl"
   
 #line 48 "shortcodes.c"
 	{
@@ -80,14 +80,13 @@ tr1:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
 	goto st1;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 91 "shortcodes.c"
+#line 90 "shortcodes.c"
 	if ( (*p) == 123 )
 		goto tr2;
 	goto st0;
@@ -95,14 +94,13 @@ tr2:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 106 "shortcodes.c"
+#line 104 "shortcodes.c"
 	switch( (*p) ) {
 		case 37: goto st3;
 		case 60: goto st139;
@@ -136,7 +134,7 @@ st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 140 "shortcodes.c"
+#line 138 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr6;
 		case 37: goto tr7;
@@ -182,7 +180,7 @@ st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 186 "shortcodes.c"
+#line 184 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st5;
 		case 34: goto tr11;
@@ -212,7 +210,7 @@ st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 216 "shortcodes.c"
+#line 214 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st7;
 		case 123: goto tr18;
@@ -258,7 +256,7 @@ st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 262 "shortcodes.c"
+#line 260 "shortcodes.c"
 	switch( (*p) ) {
 		case 123: goto tr1;
 		case 125: goto st9;
@@ -274,7 +272,7 @@ case 9:
 	}
 	goto st0;
 tr23:
-#line 71 "shortcodes.rl"
+#line 70 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.len = p-start-sc_list[c_sc].whole.start+1;
       data_mark = p+1;
@@ -282,7 +280,7 @@ tr23:
     }
 	goto st142;
 tr38:
-#line 90 "shortcodes.rl"
+#line 89 "shortcodes.rl"
 	{
     if (
         sc_list[c_sc-1].name.len != sc_list[c_sc].name.len ||
@@ -318,7 +316,7 @@ st142:
 	if ( ++p == pe )
 		goto _test_eof142;
 case 142:
-#line 322 "shortcodes.c"
+#line 320 "shortcodes.c"
 	if ( (*p) == 123 )
 		goto tr25;
 	goto st10;
@@ -333,9 +331,8 @@ tr25:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
-#line 78 "shortcodes.rl"
+#line 77 "shortcodes.rl"
 	{
     // Starting a "closing" shortcode ( {{ /foo }}), 
     // close data (if previous shortcode is opening)
@@ -351,7 +348,7 @@ st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-#line 355 "shortcodes.c"
+#line 352 "shortcodes.c"
 	if ( (*p) == 123 )
 		goto tr26;
 	goto st10;
@@ -359,9 +356,8 @@ tr26:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
-#line 78 "shortcodes.rl"
+#line 77 "shortcodes.rl"
 	{
     // Starting a "closing" shortcode ( {{ /foo }}), 
     // close data (if previous shortcode is opening)
@@ -377,7 +373,7 @@ st12:
 	if ( ++p == pe )
 		goto _test_eof12;
 case 12:
-#line 381 "shortcodes.c"
+#line 377 "shortcodes.c"
 	switch( (*p) ) {
 		case 37: goto st13;
 		case 60: goto st86;
@@ -424,7 +420,7 @@ st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-#line 428 "shortcodes.c"
+#line 424 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr32;
 		case 37: goto tr33;
@@ -454,7 +450,7 @@ st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-#line 458 "shortcodes.c"
+#line 454 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st16;
 		case 37: goto st17;
@@ -475,7 +471,7 @@ st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 479 "shortcodes.c"
+#line 475 "shortcodes.c"
 	switch( (*p) ) {
 		case 123: goto tr25;
 		case 125: goto st18;
@@ -500,7 +496,7 @@ st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-#line 504 "shortcodes.c"
+#line 500 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr39;
 		case 37: goto tr40;
@@ -546,7 +542,7 @@ st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-#line 550 "shortcodes.c"
+#line 546 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st20;
 		case 34: goto tr44;
@@ -576,7 +572,7 @@ st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 580 "shortcodes.c"
+#line 576 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 123: goto tr51;
@@ -622,7 +618,7 @@ st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-#line 626 "shortcodes.c"
+#line 622 "shortcodes.c"
 	switch( (*p) ) {
 		case 123: goto tr25;
 		case 125: goto st24;
@@ -664,7 +660,7 @@ st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 668 "shortcodes.c"
+#line 664 "shortcodes.c"
 	switch( (*p) ) {
 		case 123: goto tr25;
 		case 125: goto st26;
@@ -683,9 +679,8 @@ tr51:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
-#line 78 "shortcodes.rl"
+#line 77 "shortcodes.rl"
 	{
     // Starting a "closing" shortcode ( {{ /foo }}), 
     // close data (if previous shortcode is opening)
@@ -701,7 +696,7 @@ st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 705 "shortcodes.c"
+#line 700 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 123: goto tr58;
@@ -711,9 +706,8 @@ tr58:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
-#line 78 "shortcodes.rl"
+#line 77 "shortcodes.rl"
 	{
     // Starting a "closing" shortcode ( {{ /foo }}), 
     // close data (if previous shortcode is opening)
@@ -729,7 +723,7 @@ st28:
 	if ( ++p == pe )
 		goto _test_eof28;
 case 28:
-#line 733 "shortcodes.c"
+#line 727 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 37: goto st29;
@@ -780,7 +774,7 @@ st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-#line 784 "shortcodes.c"
+#line 778 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr64;
 		case 34: goto st22;
@@ -811,7 +805,7 @@ st32:
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
-#line 815 "shortcodes.c"
+#line 809 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st32;
 		case 34: goto st22;
@@ -833,7 +827,7 @@ st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 837 "shortcodes.c"
+#line 831 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 123: goto tr51;
@@ -851,7 +845,7 @@ case 34:
 	}
 	goto st21;
 tr85:
-#line 71 "shortcodes.rl"
+#line 70 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.len = p-start-sc_list[c_sc].whole.start+1;
       data_mark = p+1;
@@ -859,7 +853,7 @@ tr85:
     }
 	goto st143;
 tr70:
-#line 90 "shortcodes.rl"
+#line 89 "shortcodes.rl"
 	{
     if (
         sc_list[c_sc-1].name.len != sc_list[c_sc].name.len ||
@@ -895,7 +889,7 @@ st143:
 	if ( ++p == pe )
 		goto _test_eof143;
 case 143:
-#line 899 "shortcodes.c"
+#line 893 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 123: goto tr51;
@@ -911,7 +905,7 @@ st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 915 "shortcodes.c"
+#line 909 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr71;
 		case 34: goto st22;
@@ -958,7 +952,7 @@ st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-#line 962 "shortcodes.c"
+#line 956 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st36;
 		case 34: goto tr76;
@@ -988,7 +982,7 @@ st37:
 	if ( ++p == pe )
 		goto _test_eof37;
 case 37:
-#line 992 "shortcodes.c"
+#line 986 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr81;
 		case 34: goto st22;
@@ -1026,7 +1020,7 @@ st38:
 	if ( ++p == pe )
 		goto _test_eof38;
 case 38:
-#line 1030 "shortcodes.c"
+#line 1024 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 123: goto tr51;
@@ -1070,7 +1064,7 @@ st40:
 	if ( ++p == pe )
 		goto _test_eof40;
 case 40:
-#line 1074 "shortcodes.c"
+#line 1068 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st22;
 		case 123: goto tr51;
@@ -1097,7 +1091,7 @@ st42:
 	if ( ++p == pe )
 		goto _test_eof42;
 case 42:
-#line 1101 "shortcodes.c"
+#line 1095 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr88;
 		case 34: goto st22;
@@ -1127,7 +1121,7 @@ st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 1131 "shortcodes.c"
+#line 1125 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr88;
 		case 34: goto st22;
@@ -1159,7 +1153,7 @@ st44:
 	if ( ++p == pe )
 		goto _test_eof44;
 case 44:
-#line 1163 "shortcodes.c"
+#line 1157 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr76;
 		case 123: goto tr51;
@@ -1202,7 +1196,7 @@ st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 1206 "shortcodes.c"
+#line 1200 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr95;
 		case 34: goto st22;
@@ -1249,7 +1243,7 @@ st47:
 	if ( ++p == pe )
 		goto _test_eof47;
 case 47:
-#line 1253 "shortcodes.c"
+#line 1247 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st47;
 		case 34: goto tr98;
@@ -1279,7 +1273,7 @@ st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
-#line 1283 "shortcodes.c"
+#line 1277 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr102;
 		case 34: goto st50;
@@ -1300,7 +1294,7 @@ st49:
 	if ( ++p == pe )
 		goto _test_eof49;
 case 49:
-#line 1304 "shortcodes.c"
+#line 1298 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 123: goto tr106;
@@ -1346,7 +1340,7 @@ st51:
 	if ( ++p == pe )
 		goto _test_eof51;
 case 51:
-#line 1350 "shortcodes.c"
+#line 1344 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st51;
 		case 34: goto tr109;
@@ -1376,7 +1370,7 @@ st52:
 	if ( ++p == pe )
 		goto _test_eof52;
 case 52:
-#line 1380 "shortcodes.c"
+#line 1374 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr112;
 		case 37: goto tr113;
@@ -1405,7 +1399,7 @@ st53:
 	if ( ++p == pe )
 		goto _test_eof53;
 case 53:
-#line 1409 "shortcodes.c"
+#line 1403 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr112;
 		case 37: goto tr113;
@@ -1436,7 +1430,7 @@ st54:
 	if ( ++p == pe )
 		goto _test_eof54;
 case 54:
-#line 1440 "shortcodes.c"
+#line 1434 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr109;
 		case 123: goto tr25;
@@ -1454,9 +1448,8 @@ tr106:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
-#line 78 "shortcodes.rl"
+#line 77 "shortcodes.rl"
 	{
     // Starting a "closing" shortcode ( {{ /foo }}), 
     // close data (if previous shortcode is opening)
@@ -1472,7 +1465,7 @@ st55:
 	if ( ++p == pe )
 		goto _test_eof55;
 case 55:
-#line 1476 "shortcodes.c"
+#line 1469 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 123: goto tr118;
@@ -1482,9 +1475,8 @@ tr118:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
-#line 78 "shortcodes.rl"
+#line 77 "shortcodes.rl"
 	{
     // Starting a "closing" shortcode ( {{ /foo }}), 
     // close data (if previous shortcode is opening)
@@ -1500,7 +1492,7 @@ st56:
 	if ( ++p == pe )
 		goto _test_eof56;
 case 56:
-#line 1504 "shortcodes.c"
+#line 1496 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 37: goto st57;
@@ -1551,7 +1543,7 @@ st59:
 	if ( ++p == pe )
 		goto _test_eof59;
 case 59:
-#line 1555 "shortcodes.c"
+#line 1547 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr124;
 		case 34: goto st50;
@@ -1582,7 +1574,7 @@ st60:
 	if ( ++p == pe )
 		goto _test_eof60;
 case 60:
-#line 1586 "shortcodes.c"
+#line 1578 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st60;
 		case 34: goto st50;
@@ -1604,7 +1596,7 @@ st61:
 	if ( ++p == pe )
 		goto _test_eof61;
 case 61:
-#line 1608 "shortcodes.c"
+#line 1600 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 123: goto tr106;
@@ -1622,7 +1614,7 @@ case 62:
 	}
 	goto st49;
 tr143:
-#line 71 "shortcodes.rl"
+#line 70 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.len = p-start-sc_list[c_sc].whole.start+1;
       data_mark = p+1;
@@ -1630,7 +1622,7 @@ tr143:
     }
 	goto st144;
 tr130:
-#line 90 "shortcodes.rl"
+#line 89 "shortcodes.rl"
 	{
     if (
         sc_list[c_sc-1].name.len != sc_list[c_sc].name.len ||
@@ -1666,7 +1658,7 @@ st144:
 	if ( ++p == pe )
 		goto _test_eof144;
 case 144:
-#line 1670 "shortcodes.c"
+#line 1662 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 123: goto tr106;
@@ -1682,7 +1674,7 @@ st63:
 	if ( ++p == pe )
 		goto _test_eof63;
 case 63:
-#line 1686 "shortcodes.c"
+#line 1678 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr131;
 		case 34: goto st50;
@@ -1729,7 +1721,7 @@ st64:
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
-#line 1733 "shortcodes.c"
+#line 1725 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st64;
 		case 34: goto tr136;
@@ -1759,7 +1751,7 @@ st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
-#line 1763 "shortcodes.c"
+#line 1755 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr141;
 		case 34: goto st22;
@@ -1797,7 +1789,7 @@ st66:
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
-#line 1801 "shortcodes.c"
+#line 1793 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 123: goto tr106;
@@ -1824,7 +1816,7 @@ st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 1828 "shortcodes.c"
+#line 1820 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr144;
 		case 34: goto st50;
@@ -1871,7 +1863,7 @@ st69:
 	if ( ++p == pe )
 		goto _test_eof69;
 case 69:
-#line 1875 "shortcodes.c"
+#line 1867 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st50;
 		case 123: goto tr106;
@@ -1898,7 +1890,7 @@ st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 1902 "shortcodes.c"
+#line 1894 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr144;
 		case 34: goto st50;
@@ -1930,7 +1922,7 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 1934 "shortcodes.c"
+#line 1926 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr136;
 		case 123: goto tr106;
@@ -1973,7 +1965,7 @@ st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 1977 "shortcodes.c"
+#line 1969 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr153;
 		case 34: goto st50;
@@ -2020,7 +2012,7 @@ st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 2024 "shortcodes.c"
+#line 2016 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st75;
 		case 34: goto tr156;
@@ -2050,7 +2042,7 @@ st76:
 	if ( ++p == pe )
 		goto _test_eof76;
 case 76:
-#line 2054 "shortcodes.c"
+#line 2046 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr159;
 		case 34: goto st50;
@@ -2071,7 +2063,7 @@ st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
-#line 2075 "shortcodes.c"
+#line 2067 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr160;
 		case 34: goto st50;
@@ -2101,7 +2093,7 @@ st78:
 	if ( ++p == pe )
 		goto _test_eof78;
 case 78:
-#line 2105 "shortcodes.c"
+#line 2097 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr160;
 		case 34: goto st50;
@@ -2133,7 +2125,7 @@ st79:
 	if ( ++p == pe )
 		goto _test_eof79;
 case 79:
-#line 2137 "shortcodes.c"
+#line 2129 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr156;
 		case 123: goto tr106;
@@ -2157,7 +2149,7 @@ st80:
 	if ( ++p == pe )
 		goto _test_eof80;
 case 80:
-#line 2161 "shortcodes.c"
+#line 2153 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr164;
 		case 34: goto st22;
@@ -2187,7 +2179,7 @@ st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 2191 "shortcodes.c"
+#line 2183 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr164;
 		case 34: goto st22;
@@ -2219,7 +2211,7 @@ st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 2223 "shortcodes.c"
+#line 2215 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr98;
 		case 123: goto tr51;
@@ -2243,7 +2235,7 @@ st83:
 	if ( ++p == pe )
 		goto _test_eof83;
 case 83:
-#line 2247 "shortcodes.c"
+#line 2239 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr168;
 		case 37: goto tr115;
@@ -2272,7 +2264,7 @@ st84:
 	if ( ++p == pe )
 		goto _test_eof84;
 case 84:
-#line 2276 "shortcodes.c"
+#line 2268 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr168;
 		case 37: goto tr115;
@@ -2303,7 +2295,7 @@ st85:
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 2307 "shortcodes.c"
+#line 2299 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr44;
 		case 123: goto tr25;
@@ -2345,7 +2337,7 @@ st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2349 "shortcodes.c"
+#line 2341 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr173;
 		case 37: goto tr42;
@@ -2391,7 +2383,7 @@ st88:
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 2395 "shortcodes.c"
+#line 2387 "shortcodes.c"
 	switch( (*p) ) {
 		case 123: goto tr1;
 		case 125: goto st89;
@@ -2410,14 +2402,13 @@ tr18:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
 	goto st90;
 st90:
 	if ( ++p == pe )
 		goto _test_eof90;
 case 90:
-#line 2421 "shortcodes.c"
+#line 2412 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st7;
 		case 123: goto tr177;
@@ -2427,14 +2418,13 @@ tr177:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
 	goto st91;
 st91:
 	if ( ++p == pe )
 		goto _test_eof91;
 case 91:
-#line 2438 "shortcodes.c"
+#line 2428 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st7;
 		case 37: goto st92;
@@ -2470,7 +2460,7 @@ st93:
 	if ( ++p == pe )
 		goto _test_eof93;
 case 93:
-#line 2474 "shortcodes.c"
+#line 2464 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr181;
 		case 34: goto st7;
@@ -2517,7 +2507,7 @@ st94:
 	if ( ++p == pe )
 		goto _test_eof94;
 case 94:
-#line 2521 "shortcodes.c"
+#line 2511 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st94;
 		case 34: goto tr186;
@@ -2547,7 +2537,7 @@ st95:
 	if ( ++p == pe )
 		goto _test_eof95;
 case 95:
-#line 2551 "shortcodes.c"
+#line 2541 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr191;
 		case 34: goto st7;
@@ -2585,7 +2575,7 @@ st96:
 	if ( ++p == pe )
 		goto _test_eof96;
 case 96:
-#line 2589 "shortcodes.c"
+#line 2579 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st7;
 		case 123: goto tr18;
@@ -2629,7 +2619,7 @@ st98:
 	if ( ++p == pe )
 		goto _test_eof98;
 case 98:
-#line 2633 "shortcodes.c"
+#line 2623 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st7;
 		case 123: goto tr18;
@@ -2661,7 +2651,7 @@ st145:
 	if ( ++p == pe )
 		goto _test_eof145;
 case 145:
-#line 2665 "shortcodes.c"
+#line 2655 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st7;
 		case 123: goto tr18;
@@ -2677,7 +2667,7 @@ st100:
 	if ( ++p == pe )
 		goto _test_eof100;
 case 100:
-#line 2681 "shortcodes.c"
+#line 2671 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr197;
 		case 34: goto st7;
@@ -2707,7 +2697,7 @@ st101:
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 2711 "shortcodes.c"
+#line 2701 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr197;
 		case 34: goto st7;
@@ -2739,7 +2729,7 @@ st102:
 	if ( ++p == pe )
 		goto _test_eof102;
 case 102:
-#line 2743 "shortcodes.c"
+#line 2733 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr186;
 		case 123: goto tr18;
@@ -2781,7 +2771,7 @@ st104:
 	if ( ++p == pe )
 		goto _test_eof104;
 case 104:
-#line 2785 "shortcodes.c"
+#line 2775 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr204;
 		case 34: goto st7;
@@ -2828,7 +2818,7 @@ st105:
 	if ( ++p == pe )
 		goto _test_eof105;
 case 105:
-#line 2832 "shortcodes.c"
+#line 2822 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st105;
 		case 34: goto tr207;
@@ -2858,7 +2848,7 @@ st106:
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 2862 "shortcodes.c"
+#line 2852 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr211;
 		case 34: goto st108;
@@ -2879,7 +2869,7 @@ st107:
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
-#line 2883 "shortcodes.c"
+#line 2873 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st108;
 		case 123: goto tr215;
@@ -2925,7 +2915,7 @@ st109:
 	if ( ++p == pe )
 		goto _test_eof109;
 case 109:
-#line 2929 "shortcodes.c"
+#line 2919 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st109;
 		case 34: goto tr218;
@@ -2955,7 +2945,7 @@ st110:
 	if ( ++p == pe )
 		goto _test_eof110;
 case 110:
-#line 2959 "shortcodes.c"
+#line 2949 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr221;
 		case 37: goto tr222;
@@ -2984,7 +2974,7 @@ st111:
 	if ( ++p == pe )
 		goto _test_eof111;
 case 111:
-#line 2988 "shortcodes.c"
+#line 2978 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr221;
 		case 37: goto tr222;
@@ -3015,7 +3005,7 @@ st112:
 	if ( ++p == pe )
 		goto _test_eof112;
 case 112:
-#line 3019 "shortcodes.c"
+#line 3009 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr218;
 		case 123: goto tr1;
@@ -3033,14 +3023,13 @@ tr215:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
 	goto st113;
 st113:
 	if ( ++p == pe )
 		goto _test_eof113;
 case 113:
-#line 3044 "shortcodes.c"
+#line 3033 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st108;
 		case 123: goto tr227;
@@ -3050,14 +3039,13 @@ tr227:
 #line 67 "shortcodes.rl"
 	{
       sc_list[c_sc].whole.start = p-start-1;
-      sc_list[c_sc].argcount = 0;
     }
 	goto st114;
 st114:
 	if ( ++p == pe )
 		goto _test_eof114;
 case 114:
-#line 3061 "shortcodes.c"
+#line 3049 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st108;
 		case 37: goto st115;
@@ -3093,7 +3081,7 @@ st116:
 	if ( ++p == pe )
 		goto _test_eof116;
 case 116:
-#line 3097 "shortcodes.c"
+#line 3085 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr231;
 		case 34: goto st108;
@@ -3140,7 +3128,7 @@ st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 3144 "shortcodes.c"
+#line 3132 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st117;
 		case 34: goto tr236;
@@ -3170,7 +3158,7 @@ st118:
 	if ( ++p == pe )
 		goto _test_eof118;
 case 118:
-#line 3174 "shortcodes.c"
+#line 3162 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr241;
 		case 34: goto st7;
@@ -3208,7 +3196,7 @@ st119:
 	if ( ++p == pe )
 		goto _test_eof119;
 case 119:
-#line 3212 "shortcodes.c"
+#line 3200 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st108;
 		case 123: goto tr215;
@@ -3235,7 +3223,7 @@ st121:
 	if ( ++p == pe )
 		goto _test_eof121;
 case 121:
-#line 3239 "shortcodes.c"
+#line 3227 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr243;
 		case 34: goto st108;
@@ -3282,7 +3270,7 @@ st122:
 	if ( ++p == pe )
 		goto _test_eof122;
 case 122:
-#line 3286 "shortcodes.c"
+#line 3274 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st108;
 		case 123: goto tr215;
@@ -3314,7 +3302,7 @@ st146:
 	if ( ++p == pe )
 		goto _test_eof146;
 case 146:
-#line 3318 "shortcodes.c"
+#line 3306 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto st108;
 		case 123: goto tr215;
@@ -3330,7 +3318,7 @@ st124:
 	if ( ++p == pe )
 		goto _test_eof124;
 case 124:
-#line 3334 "shortcodes.c"
+#line 3322 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr243;
 		case 34: goto st108;
@@ -3362,7 +3350,7 @@ st125:
 	if ( ++p == pe )
 		goto _test_eof125;
 case 125:
-#line 3366 "shortcodes.c"
+#line 3354 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr236;
 		case 123: goto tr215;
@@ -3404,7 +3392,7 @@ st127:
 	if ( ++p == pe )
 		goto _test_eof127;
 case 127:
-#line 3408 "shortcodes.c"
+#line 3396 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr252;
 		case 34: goto st108;
@@ -3451,7 +3439,7 @@ st128:
 	if ( ++p == pe )
 		goto _test_eof128;
 case 128:
-#line 3455 "shortcodes.c"
+#line 3443 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto st128;
 		case 34: goto tr255;
@@ -3481,7 +3469,7 @@ st129:
 	if ( ++p == pe )
 		goto _test_eof129;
 case 129:
-#line 3485 "shortcodes.c"
+#line 3473 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr258;
 		case 34: goto st108;
@@ -3502,7 +3490,7 @@ st130:
 	if ( ++p == pe )
 		goto _test_eof130;
 case 130:
-#line 3506 "shortcodes.c"
+#line 3494 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr259;
 		case 34: goto st108;
@@ -3532,7 +3520,7 @@ st131:
 	if ( ++p == pe )
 		goto _test_eof131;
 case 131:
-#line 3536 "shortcodes.c"
+#line 3524 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr259;
 		case 34: goto st108;
@@ -3564,7 +3552,7 @@ st132:
 	if ( ++p == pe )
 		goto _test_eof132;
 case 132:
-#line 3568 "shortcodes.c"
+#line 3556 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr255;
 		case 123: goto tr215;
@@ -3588,7 +3576,7 @@ st133:
 	if ( ++p == pe )
 		goto _test_eof133;
 case 133:
-#line 3592 "shortcodes.c"
+#line 3580 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr263;
 		case 34: goto st7;
@@ -3618,7 +3606,7 @@ st134:
 	if ( ++p == pe )
 		goto _test_eof134;
 case 134:
-#line 3622 "shortcodes.c"
+#line 3610 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr263;
 		case 34: goto st7;
@@ -3650,7 +3638,7 @@ st135:
 	if ( ++p == pe )
 		goto _test_eof135;
 case 135:
-#line 3654 "shortcodes.c"
+#line 3642 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr207;
 		case 123: goto tr18;
@@ -3674,7 +3662,7 @@ st136:
 	if ( ++p == pe )
 		goto _test_eof136;
 case 136:
-#line 3678 "shortcodes.c"
+#line 3666 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr267;
 		case 37: goto tr224;
@@ -3703,7 +3691,7 @@ st137:
 	if ( ++p == pe )
 		goto _test_eof137;
 case 137:
-#line 3707 "shortcodes.c"
+#line 3695 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr267;
 		case 37: goto tr224;
@@ -3734,7 +3722,7 @@ st138:
 	if ( ++p == pe )
 		goto _test_eof138;
 case 138:
-#line 3738 "shortcodes.c"
+#line 3726 "shortcodes.c"
 	switch( (*p) ) {
 		case 34: goto tr11;
 		case 123: goto tr1;
@@ -3775,7 +3763,7 @@ st140:
 	if ( ++p == pe )
 		goto _test_eof140;
 case 140:
-#line 3779 "shortcodes.c"
+#line 3767 "shortcodes.c"
 	switch( (*p) ) {
 		case 32: goto tr272;
 		case 37: goto tr9;
@@ -3946,7 +3934,7 @@ case 140:
 	_test_eof: {}
 	}
 
-#line 135 "shortcodes.rl"
+#line 134 "shortcodes.rl"
 
   result.sccount = c_sc;
   return result;