mongrel_esi 0.4.1 → 0.5.0

data/ext/esi/test/common.rl

@@ -1,41 +1,46 @@
+/** 
+ * Copyright (c) 2008 Todd A. Fisher
+ * see LICENSE
+ */
 %%{
   machine esi_common_parser;
 
-  # inline tags e.g. <esi:comment text='some useless text'/> or <esi:include src='/foo/'/>, etc...
-  esi_inline_tag = (
-    start: (
-      '<esi:' [a-z]+ space @see_start_tag -> start_attribute |
-      '<esi:' [a-z]+ space* '/>' >see_start_tag %see_end_tag -> final
-    ),
-    start_attribute: (
-      space* [a-zA-Z_\-]+ [a-zA-Z_\-0-9]* '=' @see_attribute_key -> end_attribute |
-      space* '/>' @see_end_tag -> final
-    ),
-    end_attribute: (
-      space* ['"][!{}#-&(-/:-@a-zA-Z0-9+_\-]+['"] @see_attribute_value -> start_attribute
-    )
-  ) >begin %finish;
+  # valid attribute key characters
+  attr_key = [a-zA-Z_\-]+ [a-zA-Z_\-0-9]*;
+
+  # attribute values can be contained within either double or single quotes, when single quoted then double quotes are valid
+  # when double quoted then single quotes are valid
+  attr_valueq1 = ('"' ("\\\""| [^"])* '"');
+  attr_valueq2 = ("'" ("\\\'"| [^'])* "'");
 
-  # block tags e.g. <esi:try>  <esi:attempt>, etc..
-  esi_block_tag = (
+  # an attribute value is either single or double quoted 
+  attr_value = ( attr_valueq1 | attr_valueq2 );
+
+  # inline tags e.g. <esi:comment text='some useless text'/> or <esi:include src='/foo/'/>, etc...
+  # block tags e.g. <esi:try><esi:attempt></esi:attempt></esi:try>
+  # NOTE: not verifying the tag nesting
+  esi_tags = (
     start: (
-      '<esi:' [a-z]+ '>' @block_start_tag -> start |
+      # first match block start tag with no attributes
+      '<esi:' [a-z]+ '>' @block_start_tag -> final |
+      # next match either an inline or block tag with attributes
       '<esi:' [a-z]+ space @see_start_tag -> start_attribute |
+      # finally match a closing block tag
       '</esi:' [a-z]+ '>' @block_end_tag
     ),
     start_attribute: (
-      space* [a-zA-Z_\-]+ [a-zA-Z_\-0-9]* '=' @see_attribute_key -> end_attribute | '>' @see_block_start_with_attributes -> final
+      # match the attribute key up to the begining = allowing for arbitrary whitespace before the start of the key
+      space* attr_key '=' @see_attribute_key -> end_attribute |
+      # match the end of an inline tag, triggers start and end callbacks
+      space* '/>' @see_end_tag -> final |
+      # matching the end of a block tag, triggers start callback
+      '>' @see_block_start_with_attributes -> final
     ),
     end_attribute: (
-      space* ['"][!{}#-&(-/:-@a-zA-Z0-9+_\-]+['"] @see_attribute_value -> start_attribute
+      # match the attribute value and return to matching attribute start
+      space* attr_value @see_attribute_value -> start_attribute
     )
-  ) >begin  %finish;
-
-  echo_state = (
-    start: (
-      /./ @echo
-    )
-  );
+  ) >begin %finish;
 
-  main := ((/.*/)? @echo (esi_inline_tag|esi_block_tag) )*;
+  main := ((/.*/)? @echo (esi_tags) )*;
 }%%

data/ext/esi/test/parser.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <unistd.h>
 #include "parser.h"
 
 /* define default callbacks */
@@ -27,7 +27,8 @@ esi_parser_default_output_cp(const void *data,
                              void *user_data)
 {
 }
-#ifdef DEBUG
+
+#if defined(DEBUG)
 static void debug_string( const char *msg, const char *str, size_t len )
 {
   char *pstr = esi_strndup( str, len );
@@ -65,33 +66,219 @@ static void esi_parser_concat_to_echobuffer( ESIParser *parser, char ch )
 //  debug_string( "echo buffer", parser->echobuffer, parser->echobuffer_index+1 );
 }
 
-static void ltrim_pointer( const char **ptr, const char *bounds, size_t *len )
-{
-  // remove any spaces or = at the before the value
-  while( isspace( **ptr ) ||
-         **ptr == '=' ||
-         **ptr == '"' ||
-         **ptr == '<' ||
-         **ptr == '\'' &&
-         *len > 0 &&
-         (*ptr != bounds) ){
-    (*ptr)++;
-    (*len)--;
-  }
-}
+#line 164 "parser.rl"
 
-#line 198 "parser.rl"
 
 
+#line 74 "parser.c"
+static const char _esi_actions[] = {
+	0, 1, 9, 2, 9, 0, 2, 9, 
+	1, 2, 9, 2, 2, 9, 3, 2, 
+	9, 4, 2, 9, 5, 2, 9, 6, 
+	2, 9, 7, 2, 9, 8, 3, 9, 
+	0, 1, 3, 9, 3, 1, 4, 9, 
+	0, 3, 1, 4, 9, 3, 6, 1
+	
+};
+
+static const short _esi_key_offsets[] = {
+	0, 1, 4, 6, 8, 10, 12, 15, 
+	19, 21, 23, 25, 28, 36, 48, 59, 
+	69, 75, 85, 94, 106, 117, 119, 130, 
+	140, 150, 160, 170, 180, 191, 201, 211, 
+	221, 231, 246, 256, 265, 277, 288, 298, 
+	304, 314, 325, 335, 345, 355, 365, 375, 
+	386, 396, 406, 416, 426, 441, 451, 453, 
+	455, 456, 457, 466, 475
+};
+
+static const char _esi_trans_keys[] = {
+	60, 47, 60, 101, 60, 101, 60, 115, 
+	60, 105, 58, 60, 60, 97, 122, 60, 
+	62, 97, 122, 60, 115, 60, 105, 58, 
+	60, 60, 97, 122, 32, 47, 60, 62, 
+	9, 13, 97, 122, 32, 45, 47, 60, 
+	62, 95, 9, 13, 65, 90, 97, 122, 
+	32, 45, 47, 60, 95, 9, 13, 65, 
+	90, 97, 122, 45, 60, 61, 95, 48, 
+	57, 65, 90, 97, 122, 32, 34, 39, 
+	60, 9, 13, 33, 60, 95, 125, 35, 
+	38, 40, 90, 97, 123, 34, 39, 60, 
+	95, 125, 33, 90, 97, 123, 32, 45, 
+	47, 60, 62, 95, 9, 13, 65, 90, 
+	97, 122, 32, 45, 47, 60, 95, 9, 
+	13, 65, 90, 97, 122, 60, 62, 34, 
+	39, 47, 60, 95, 101, 125, 33, 90, 
+	97, 123, 34, 39, 60, 95, 101, 125, 
+	33, 90, 97, 123, 34, 39, 60, 95, 
+	115, 125, 33, 90, 97, 123, 34, 39, 
+	60, 95, 105, 125, 33, 90, 97, 123, 
+	34, 39, 58, 60, 95, 125, 33, 90, 
+	97, 123, 34, 39, 60, 95, 123, 125, 
+	33, 90, 97, 122, 34, 39, 60, 62, 
+	95, 123, 125, 33, 90, 97, 122, 34, 
+	39, 60, 95, 115, 125, 33, 90, 97, 
+	123, 34, 39, 60, 95, 105, 125, 33, 
+	90, 97, 123, 34, 39, 58, 60, 95, 
+	125, 33, 90, 97, 123, 34, 39, 60, 
+	95, 123, 125, 33, 90, 97, 122, 32, 
+	34, 39, 47, 60, 62, 95, 123, 125, 
+	9, 13, 33, 90, 97, 122, 34, 39, 
+	60, 62, 95, 125, 33, 90, 97, 123, 
+	34, 39, 60, 95, 125, 33, 90, 97, 
+	123, 32, 45, 47, 60, 62, 95, 9, 
+	13, 65, 90, 97, 122, 32, 45, 47, 
+	60, 95, 9, 13, 65, 90, 97, 122, 
+	45, 60, 61, 95, 48, 57, 65, 90, 
+	97, 122, 32, 34, 39, 60, 9, 13, 
+	33, 60, 95, 125, 35, 38, 40, 90, 
+	97, 123, 34, 39, 47, 60, 95, 101, 
+	125, 33, 90, 97, 123, 34, 39, 60, 
+	95, 101, 125, 33, 90, 97, 123, 34, 
+	39, 60, 95, 115, 125, 33, 90, 97, 
+	123, 34, 39, 60, 95, 105, 125, 33, 
+	90, 97, 123, 34, 39, 58, 60, 95, 
+	125, 33, 90, 97, 123, 34, 39, 60, 
+	95, 123, 125, 33, 90, 97, 122, 34, 
+	39, 60, 62, 95, 123, 125, 33, 90, 
+	97, 122, 34, 39, 60, 95, 115, 125, 
+	33, 90, 97, 123, 34, 39, 60, 95, 
+	105, 125, 33, 90, 97, 123, 34, 39, 
+	58, 60, 95, 125, 33, 90, 97, 123, 
+	34, 39, 60, 95, 123, 125, 33, 90, 
+	97, 122, 32, 34, 39, 47, 60, 62, 
+	95, 123, 125, 9, 13, 33, 90, 97, 
+	122, 34, 39, 60, 62, 95, 125, 33, 
+	90, 97, 123, 60, 62, 60, 62, 60, 
+	60, 34, 39, 60, 95, 125, 33, 90, 
+	97, 123, 34, 39, 60, 95, 125, 33, 
+	90, 97, 123, 60, 0
+};
+
+static const char _esi_single_lengths[] = {
+	1, 3, 2, 2, 2, 2, 1, 2, 
+	2, 2, 2, 1, 4, 6, 5, 4, 
+	4, 4, 5, 6, 5, 2, 7, 6, 
+	6, 6, 6, 6, 7, 6, 6, 6, 
+	6, 9, 6, 5, 6, 5, 4, 4, 
+	4, 7, 6, 6, 6, 6, 6, 7, 
+	6, 6, 6, 6, 9, 6, 2, 2, 
+	1, 1, 5, 5, 1
+};
+
+static const char _esi_range_lengths[] = {
+	0, 0, 0, 0, 0, 0, 1, 1, 
+	0, 0, 0, 1, 2, 3, 3, 3, 
+	1, 3, 2, 3, 3, 0, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 3, 2, 2, 3, 3, 3, 1, 
+	3, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 3, 2, 0, 0, 
+	0, 0, 2, 2, 0
+};
+
+static const short _esi_index_offsets[] = {
+	0, 2, 6, 9, 12, 15, 18, 21, 
+	25, 28, 31, 34, 37, 44, 54, 63, 
+	71, 77, 85, 93, 103, 112, 115, 125, 
+	134, 143, 152, 161, 170, 180, 189, 198, 
+	207, 216, 229, 238, 246, 256, 265, 273, 
+	279, 287, 297, 306, 315, 324, 333, 342, 
+	352, 361, 370, 379, 388, 401, 410, 413, 
+	416, 418, 420, 428, 436
+};
+
+static const char _esi_indicies[] = {
+	1, 0, 2, 1, 3, 0, 1, 4, 
+	0, 1, 5, 0, 1, 6, 0, 7, 
+	1, 0, 1, 8, 0, 1, 9, 8, 
+	0, 1, 10, 0, 1, 11, 0, 12, 
+	1, 0, 1, 13, 0, 14, 15, 1, 
+	16, 14, 13, 0, 17, 18, 19, 1, 
+	20, 18, 17, 18, 18, 0, 17, 18, 
+	19, 1, 18, 17, 18, 18, 0, 18, 
+	1, 21, 18, 18, 18, 18, 0, 22, 
+	23, 23, 1, 22, 0, 24, 25, 24, 
+	24, 24, 24, 24, 0, 26, 26, 25, 
+	24, 24, 24, 24, 0, 27, 18, 28, 
+	1, 20, 18, 27, 18, 18, 0, 27, 
+	18, 28, 1, 18, 27, 18, 18, 0, 
+	1, 29, 0, 26, 26, 30, 25, 24, 
+	31, 24, 24, 24, 0, 26, 26, 25, 
+	24, 32, 24, 24, 24, 0, 26, 26, 
+	25, 24, 33, 24, 24, 24, 0, 26, 
+	26, 25, 24, 34, 24, 24, 24, 0, 
+	26, 26, 35, 25, 24, 24, 24, 24, 
+	0, 26, 26, 25, 24, 24, 24, 24, 
+	36, 0, 26, 26, 25, 37, 24, 24, 
+	24, 24, 36, 0, 26, 26, 25, 24, 
+	38, 24, 24, 24, 0, 26, 26, 25, 
+	24, 39, 24, 24, 24, 0, 26, 26, 
+	40, 25, 24, 24, 24, 24, 0, 26, 
+	26, 25, 24, 24, 24, 24, 41, 0, 
+	14, 26, 26, 42, 25, 43, 24, 24, 
+	24, 14, 24, 41, 0, 26, 26, 25, 
+	44, 24, 24, 24, 24, 0, 46, 46, 
+	47, 45, 45, 45, 45, 0, 48, 49, 
+	28, 1, 20, 49, 48, 49, 49, 0, 
+	48, 49, 28, 1, 49, 48, 49, 49, 
+	0, 49, 1, 50, 49, 49, 49, 49, 
+	0, 51, 52, 52, 1, 51, 0, 45, 
+	47, 45, 45, 45, 45, 45, 0, 46, 
+	46, 53, 47, 45, 54, 45, 45, 45, 
+	0, 46, 46, 47, 45, 55, 45, 45, 
+	45, 0, 46, 46, 47, 45, 56, 45, 
+	45, 45, 0, 46, 46, 47, 45, 57, 
+	45, 45, 45, 0, 46, 46, 58, 47, 
+	45, 45, 45, 45, 0, 46, 46, 47, 
+	45, 45, 45, 45, 59, 0, 46, 46, 
+	47, 60, 45, 45, 45, 45, 59, 0, 
+	46, 46, 47, 45, 61, 45, 45, 45, 
+	0, 46, 46, 47, 45, 62, 45, 45, 
+	45, 0, 46, 46, 63, 47, 45, 45, 
+	45, 45, 0, 46, 46, 47, 45, 45, 
+	45, 45, 64, 0, 14, 46, 46, 65, 
+	47, 66, 45, 45, 45, 14, 45, 64, 
+	0, 46, 46, 47, 67, 45, 45, 45, 
+	45, 0, 1, 68, 0, 1, 69, 0, 
+	1, 0, 71, 70, 74, 74, 75, 73, 
+	73, 73, 73, 72, 74, 74, 75, 73, 
+	73, 73, 73, 72, 76, 72, 0
+};
+
+static const char _esi_trans_targs_wi[] = {
+	0, 1, 2, 8, 3, 4, 5, 6, 
+	7, 0, 9, 10, 11, 12, 13, 55, 
+	0, 14, 15, 54, 57, 16, 16, 17, 
+	18, 22, 19, 20, 21, 57, 23, 29, 
+	24, 25, 26, 27, 28, 18, 30, 31, 
+	32, 33, 34, 18, 58, 35, 36, 41, 
+	37, 38, 39, 39, 40, 42, 48, 43, 
+	44, 45, 46, 47, 35, 49, 50, 51, 
+	52, 53, 35, 59, 60, 60, 0, 1, 
+	0, 35, 36, 41, 1
+};
+
+static const char _esi_trans_actions_wi[] = {
+	1, 3, 1, 1, 1, 1, 1, 1, 
+	1, 27, 1, 1, 1, 1, 9, 9, 
+	24, 1, 1, 9, 15, 18, 1, 1, 
+	1, 3, 21, 1, 1, 12, 1, 1, 
+	1, 1, 1, 1, 1, 27, 1, 1, 
+	1, 1, 9, 24, 1, 1, 21, 3, 
+	1, 1, 18, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 27, 1, 1, 1, 
+	1, 9, 24, 1, 12, 1, 6, 30, 
+	34, 34, 43, 38, 38
+};
 
-#line 88 "parser.c"
 static const int esi_start = 56;
 static const int esi_first_final = 56;
 static const int esi_error = -1;
 
 static const int esi_en_main = 56;
 
-#line 201 "parser.rl"
+#line 167 "parser.rl"
 
 char *esi_strndup( const char *str, size_t len )
 {
@@ -110,29 +297,6 @@ ESIAttribute *esi_attribute_new( const char *name, size_t name_length, const cha
   return attr;
 }
 
-ESIAttribute *esi_attribute_copy( ESIAttribute *attribute )
-{
-  ESIAttribute *head, *nattr;
-  if( !attribute ){ return NULL; }
-
-  // copy the first attribute
-  nattr = esi_attribute_new( attribute->name, strlen( attribute->name ),
-                             attribute->value, strlen( attribute->value ) );
-  // save a pointer for return
-  head = nattr;
-  // copy next attributes
-  attribute = attribute->next;
-  while( attribute ) {
-    // set the next attribute
-    nattr->next = esi_attribute_new( attribute->name, strlen( attribute->name ),
-                                     attribute->value, strlen( attribute->value ) );
-    // next attribute
-    nattr = nattr->next;
-    attribute = attribute->next;
-  }
-  return head;
-}
-
 void esi_attribute_free( ESIAttribute *attribute )
 {
   ESIAttribute *ptr;
@@ -186,11 +350,11 @@ int esi_parser_init( ESIParser *parser )
 {
   int cs;
   
-#line 190 "parser.c"
+#line 354 "parser.c"
 	{
 	cs = esi_start;
 	}
-#line 295 "parser.rl"
+#line 238 "parser.rl"
   parser->prev_state = parser->cs = cs;
   return 0;
 }
@@ -227,10 +391,10 @@ int esi_parser_execute( ESIParser *parser, const char *data, size_t length )
     p = parser->overflow_data + parser->overflow_data_size;
     
     // in our new memory space mark will now be
-    parser->mark = ( mark_offset >= 0 ) ? parser->overflow_data + mark_offset : NULL;
-    parser->tag_text = ( tag_text_offset >= 0 ) ? parser->overflow_data + tag_text_offset : NULL;
-    parser->attr_key = ( attr_key_offset >= 0 ) ? parser->overflow_data + attr_key_offset : NULL;
-    parser->attr_value = ( attr_value_offset >= 0 ) ? parser->overflow_data + attr_value_offset : NULL;
+    parser->mark = ( mark_offset > 0 ) ? parser->overflow_data + mark_offset : NULL;
+    parser->tag_text = ( tag_text_offset > 0 ) ? parser->overflow_data + tag_text_offset : NULL;
+    parser->attr_key = ( attr_key_offset > 0 ) ? parser->overflow_data + attr_key_offset : NULL;
+    parser->attr_value = ( attr_value_offset > 0 ) ? parser->overflow_data + attr_value_offset : NULL;
  
     data = parser->overflow_data;
     parser->overflow_data_size = length = length + parser->overflow_data_size;
@@ -247,1107 +411,135 @@ int esi_parser_execute( ESIParser *parser, const char *data, size_t length )
 //  debug_string( "data", data, length );
 
   
-#line 251 "parser.c"
+#line 415 "parser.c"
 	{
+	int _klen;
+	unsigned int _trans;
+	const char *_acts;
+	unsigned int _nacts;
+	const char *_keys;
+
 	if ( p == pe )
 		goto _out;
 _resume:
-	switch ( cs ) {
-case 56:
-	if ( (*p) == 60 )
-		goto tr1;
-	goto tr0;
-case 0:
-	if ( (*p) == 60 )
-		goto tr1;
-	goto tr0;
-case 1:
-	switch( (*p) ) {
-		case 47: goto tr2;
-		case 60: goto tr1;
-		case 101: goto tr3;
-	}
-	goto tr0;
-case 2:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 101: goto tr4;
-	}
-	goto tr0;
-case 3:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 115: goto tr5;
-	}
-	goto tr0;
-case 4:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 105: goto tr6;
-	}
-	goto tr0;
-case 5:
-	switch( (*p) ) {
-		case 58: goto tr7;
-		case 60: goto tr1;
-	}
-	goto tr0;
-case 6:
-	if ( (*p) == 60 )
-		goto tr1;
-	if ( 97 <= (*p) && (*p) <= 122 )
-		goto tr8;
-	goto tr0;
-case 7:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 62: goto tr9;
-	}
-	if ( 97 <= (*p) && (*p) <= 122 )
-		goto tr8;
-	goto tr0;
-case 8:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 115: goto tr10;
-	}
-	goto tr0;
-case 9:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 105: goto tr11;
-	}
-	goto tr0;
-case 10:
-	switch( (*p) ) {
-		case 58: goto tr12;
-		case 60: goto tr1;
-	}
-	goto tr0;
-case 11:
-	if ( (*p) == 60 )
-		goto tr1;
-	if ( 97 <= (*p) && (*p) <= 122 )
-		goto tr13;
-	goto tr0;
-case 12:
-	switch( (*p) ) {
-		case 32: goto tr14;
-		case 47: goto tr15;
-		case 60: goto tr1;
-		case 62: goto tr16;
-	}
-	if ( (*p) > 13 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr13;
-	} else if ( (*p) >= 9 )
-		goto tr14;
-	goto tr0;
-case 13:
-	switch( (*p) ) {
-		case 32: goto tr17;
-		case 45: goto tr18;
-		case 47: goto tr19;
-		case 60: goto tr1;
-		case 62: goto tr20;
-		case 95: goto tr18;
-	}
-	if ( (*p) < 65 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr17;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr18;
-	} else
-		goto tr18;
-	goto tr0;
-case 14:
-	switch( (*p) ) {
-		case 32: goto tr17;
-		case 45: goto tr18;
-		case 47: goto tr19;
-		case 60: goto tr1;
-		case 95: goto tr18;
-	}
-	if ( (*p) < 65 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr17;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr18;
-	} else
-		goto tr18;
-	goto tr0;
-case 15:
-	switch( (*p) ) {
-		case 45: goto tr18;
-		case 60: goto tr1;
-		case 61: goto tr21;
-		case 95: goto tr18;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr18;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr18;
-	} else
-		goto tr18;
-	goto tr0;
-case 16:
-	switch( (*p) ) {
-		case 32: goto tr22;
-		case 34: goto tr23;
-		case 39: goto tr23;
-		case 60: goto tr1;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto tr22;
-	goto tr0;
-case 17:
-	switch( (*p) ) {
-		case 33: goto tr24;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) < 40 ) {
-		if ( 35 <= (*p) && (*p) <= 38 )
-			goto tr24;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else
-		goto tr24;
-	goto tr0;
-case 18:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 19:
-	switch( (*p) ) {
-		case 32: goto tr27;
-		case 45: goto tr18;
-		case 47: goto tr28;
-		case 60: goto tr1;
-		case 62: goto tr20;
-		case 95: goto tr18;
-	}
-	if ( (*p) < 65 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr27;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr18;
-	} else
-		goto tr18;
-	goto tr0;
-case 20:
-	switch( (*p) ) {
-		case 32: goto tr27;
-		case 45: goto tr18;
-		case 47: goto tr28;
-		case 60: goto tr1;
-		case 95: goto tr18;
-	}
-	if ( (*p) < 65 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr27;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr18;
-	} else
-		goto tr18;
-	goto tr0;
-case 21:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 62: goto tr29;
-	}
-	goto tr0;
-case 57:
-	if ( (*p) == 60 )
-		goto tr71;
-	goto tr70;
-case 22:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 47: goto tr30;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 101: goto tr31;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 23:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 101: goto tr32;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 24:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 115: goto tr33;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 25:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 105: goto tr34;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 26:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 58: goto tr35;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 27:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 123: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr36;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 28:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 62: goto tr37;
-		case 95: goto tr24;
-		case 123: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr36;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 29:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 115: goto tr38;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 30:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 105: goto tr39;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 31:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 58: goto tr40;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 32:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 95: goto tr24;
-		case 123: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr41;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 33:
-	switch( (*p) ) {
-		case 32: goto tr14;
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 47: goto tr42;
-		case 60: goto tr25;
-		case 62: goto tr43;
-		case 95: goto tr24;
-		case 123: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) < 33 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr14;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr41;
-	} else
-		goto tr24;
-	goto tr0;
-case 34:
-	switch( (*p) ) {
-		case 34: goto tr26;
-		case 39: goto tr26;
-		case 60: goto tr25;
-		case 62: goto tr44;
-		case 95: goto tr24;
-		case 125: goto tr24;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr24;
-	} else if ( (*p) >= 33 )
-		goto tr24;
-	goto tr0;
-case 58:
-	switch( (*p) ) {
-		case 34: goto tr74;
-		case 39: goto tr74;
-		case 60: goto tr75;
-		case 95: goto tr73;
-		case 125: goto tr73;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr73;
-	} else if ( (*p) >= 33 )
-		goto tr73;
-	goto tr72;
-case 35:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 36:
-	switch( (*p) ) {
-		case 32: goto tr48;
-		case 45: goto tr49;
-		case 47: goto tr28;
-		case 60: goto tr1;
-		case 62: goto tr20;
-		case 95: goto tr49;
-	}
-	if ( (*p) < 65 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr48;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr49;
-	} else
-		goto tr49;
-	goto tr0;
-case 37:
-	switch( (*p) ) {
-		case 32: goto tr48;
-		case 45: goto tr49;
-		case 47: goto tr28;
-		case 60: goto tr1;
-		case 95: goto tr49;
-	}
-	if ( (*p) < 65 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr48;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr49;
-	} else
-		goto tr49;
-	goto tr0;
-case 38:
-	switch( (*p) ) {
-		case 45: goto tr49;
-		case 60: goto tr1;
-		case 61: goto tr50;
-		case 95: goto tr49;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr49;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr49;
-	} else
-		goto tr49;
-	goto tr0;
-case 39:
-	switch( (*p) ) {
-		case 32: goto tr51;
-		case 34: goto tr52;
-		case 39: goto tr52;
-		case 60: goto tr1;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto tr51;
-	goto tr0;
-case 40:
-	switch( (*p) ) {
-		case 33: goto tr45;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) < 40 ) {
-		if ( 35 <= (*p) && (*p) <= 38 )
-			goto tr45;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else
-		goto tr45;
-	goto tr0;
-case 41:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 47: goto tr53;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 101: goto tr54;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 42:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 101: goto tr55;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 43:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 115: goto tr56;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 44:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 105: goto tr57;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 45:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 58: goto tr58;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 46:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 123: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 47:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 62: goto tr60;
-		case 95: goto tr45;
-		case 123: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr59;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 48:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 115: goto tr61;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 49:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 105: goto tr62;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 50:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 58: goto tr63;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 51:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 95: goto tr45;
-		case 123: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 52:
-	switch( (*p) ) {
-		case 32: goto tr14;
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 47: goto tr65;
-		case 60: goto tr47;
-		case 62: goto tr66;
-		case 95: goto tr45;
-		case 123: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) < 33 ) {
-		if ( 9 <= (*p) && (*p) <= 13 )
-			goto tr14;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
-	} else
-		goto tr45;
-	goto tr0;
-case 53:
-	switch( (*p) ) {
-		case 34: goto tr46;
-		case 39: goto tr46;
-		case 60: goto tr47;
-		case 62: goto tr67;
-		case 95: goto tr45;
-		case 125: goto tr45;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr45;
-	} else if ( (*p) >= 33 )
-		goto tr45;
-	goto tr0;
-case 59:
-	switch( (*p) ) {
-		case 34: goto tr74;
-		case 39: goto tr74;
-		case 60: goto tr75;
-		case 95: goto tr73;
-		case 125: goto tr73;
-	}
-	if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 123 )
-			goto tr73;
-	} else if ( (*p) >= 33 )
-		goto tr73;
-	goto tr72;
-case 54:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 62: goto tr68;
-	}
-	goto tr0;
-case 60:
-	if ( (*p) == 60 )
-		goto tr76;
-	goto tr72;
-case 55:
-	switch( (*p) ) {
-		case 60: goto tr1;
-		case 62: goto tr69;
-	}
-	goto tr0;
-	}
-
-	tr0: cs = 0; goto f0;
-	tr9: cs = 0; goto f2;
-	tr16: cs = 0; goto f4;
-	tr70: cs = 0; goto f9;
-	tr72: cs = 0; goto f11;
-	tr1: cs = 1; goto f1;
-	tr71: cs = 1; goto f10;
-	tr76: cs = 1; goto f13;
-	tr2: cs = 2; goto f0;
-	tr4: cs = 3; goto f0;
-	tr5: cs = 4; goto f0;
-	tr6: cs = 5; goto f0;
-	tr7: cs = 6; goto f0;
-	tr8: cs = 7; goto f0;
-	tr3: cs = 8; goto f0;
-	tr10: cs = 9; goto f0;
-	tr11: cs = 10; goto f0;
-	tr12: cs = 11; goto f0;
-	tr13: cs = 12; goto f0;
-	tr14: cs = 13; goto f3;
-	tr17: cs = 14; goto f0;
-	tr18: cs = 15; goto f0;
-	tr22: cs = 16; goto f0;
-	tr21: cs = 16; goto f6;
-	tr23: cs = 17; goto f0;
-	tr24: cs = 18; goto f0;
-	tr37: cs = 18; goto f2;
-	tr43: cs = 18; goto f4;
-	tr26: cs = 19; goto f7;
-	tr27: cs = 20; goto f0;
-	tr28: cs = 21; goto f0;
-	tr25: cs = 22; goto f1;
-	tr30: cs = 23; goto f0;
-	tr32: cs = 24; goto f0;
-	tr33: cs = 25; goto f0;
-	tr34: cs = 26; goto f0;
-	tr35: cs = 27; goto f0;
-	tr36: cs = 28; goto f0;
-	tr31: cs = 29; goto f0;
-	tr38: cs = 30; goto f0;
-	tr39: cs = 31; goto f0;
-	tr40: cs = 32; goto f0;
-	tr41: cs = 33; goto f0;
-	tr42: cs = 34; goto f3;
-	tr45: cs = 35; goto f0;
-	tr60: cs = 35; goto f2;
-	tr66: cs = 35; goto f4;
-	tr73: cs = 35; goto f11;
-	tr46: cs = 36; goto f7;
-	tr74: cs = 36; goto f12;
-	tr48: cs = 37; goto f0;
-	tr49: cs = 38; goto f0;
-	tr51: cs = 39; goto f0;
-	tr50: cs = 39; goto f6;
-	tr52: cs = 40; goto f0;
-	tr47: cs = 41; goto f1;
-	tr75: cs = 41; goto f13;
-	tr53: cs = 42; goto f0;
-	tr55: cs = 43; goto f0;
-	tr56: cs = 44; goto f0;
-	tr57: cs = 45; goto f0;
-	tr58: cs = 46; goto f0;
-	tr59: cs = 47; goto f0;
-	tr54: cs = 48; goto f0;
-	tr61: cs = 49; goto f0;
-	tr62: cs = 50; goto f0;
-	tr63: cs = 51; goto f0;
-	tr64: cs = 52; goto f0;
-	tr65: cs = 53; goto f3;
-	tr19: cs = 54; goto f3;
-	tr15: cs = 55; goto f3;
-	tr20: cs = 57; goto f5;
-	tr29: cs = 57; goto f8;
-	tr44: cs = 58; goto f0;
-	tr67: cs = 59; goto f0;
-	tr69: cs = 60; goto f0;
-	tr68: cs = 60; goto f8;
-
-f0:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-	goto _again;
-f1:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 85 "parser.rl"
+	_keys = _esi_trans_keys + _esi_key_offsets[cs];
+	_trans = _esi_index_offsets[cs];
+
+	_klen = _esi_single_lengths[cs];
+	if ( _klen > 0 ) {
+		const char *_lower = _keys;
+		const char *_mid;
+		const char *_upper = _keys + _klen - 1;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( (*p) < *_mid )
+				_upper = _mid - 1;
+			else if ( (*p) > *_mid )
+				_lower = _mid + 1;
+			else {
+				_trans += (_mid - _keys);
+				goto _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _esi_range_lengths[cs];
+	if ( _klen > 0 ) {
+		const char *_lower = _keys;
+		const char *_mid;
+		const char *_upper = _keys + (_klen<<1) - 2;
+		while (1) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( (*p) < _mid[0] )
+				_upper = _mid - 2;
+			else if ( (*p) > _mid[1] )
+				_lower = _mid + 2;
+			else {
+				_trans += ((_mid - _keys)>>1);
+				goto _match;
+			}
+		}
+		_trans += _klen;
+	}
+
+_match:
+	_trans = _esi_indicies[_trans];
+	cs = _esi_trans_targs_wi[_trans];
+
+	if ( _esi_trans_actions_wi[_trans] == 0 )
+		goto _again;
+
+	_acts = _esi_actions + _esi_trans_actions_wi[_trans];
+	_nacts = (unsigned int) *_acts++;
+	while ( _nacts-- > 0 )
+	{
+		switch ( *_acts++ )
+		{
+	case 0:
+#line 71 "parser.rl"
 	{
     parser->mark = p;
-    //debug_string( "begin", p, 1 );
+//    printf( "begin\n" );
   }
-	goto _again;
-f9:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 89 "parser.rl"
+	break;
+	case 1:
+#line 75 "parser.rl"
 	{
 //    printf( "finish\n" );
   }
-	goto _again;
-f3:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 94 "parser.rl"
+	break;
+	case 2:
+#line 80 "parser.rl"
 	{
     parser->tag_text = parser->mark+1;
     parser->tag_text_length = p - (parser->mark+1);
 //    debug_string( "have esi start", parser->tag_text, parser->tag_text_length );
     parser->mark = p;
-    //debug_string( "see_start_tag", p, 1 );
-  }
-	goto _again;
-f8:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
   }
-#line 102 "parser.rl"
+	break;
+	case 3:
+#line 87 "parser.rl"
 	{
-    //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
-    //debug_string( "see_end_tag: after parsed esi tag", parser->tag_text, parser->tag_text_length );
+//    debug_string( "parsed esi tag", parser->tag_text, parser->tag_text_length );
     parser->start_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->attributes, parser->user_data );
-    //debug_string( "see_end_tag: after start parsed esi tag", parser->tag_text, parser->tag_text_length );
     parser->end_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->user_data );
-    //debug_string( "see_end_tag: after end parsed esi tag", parser->tag_text, parser->tag_text_length );
     parser->tag_text = NULL;
     parser->tag_text_length = 0;
-    parser->mark = p;
-    //debug_string( "see_end_tag", p, 1 );
   }
-	goto _again;
-f5:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 116 "parser.rl"
+	break;
+	case 4:
+#line 95 "parser.rl"
 	{
 //    debug_string( "parsed esi tag", parser->tag_text, parser->tag_text_length );
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
     parser->start_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->attributes, parser->user_data );
     parser->tag_text = NULL;
     parser->tag_text_length = 0;
   }
-	goto _again;
-f6:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 124 "parser.rl"
+	break;
+	case 5:
+#line 102 "parser.rl"
 	{
     parser->attr_key = parser->mark;
     parser->attr_key_length = p - parser->mark;
     parser->mark = p;
-    ltrim_pointer( &(parser->attr_key), p, &(parser->attr_key_length) );
 //    debug_string( "\tattribute key", parser->attr_key, parser->attr_key_length );
-    //debug_string( "see_attribute_key", p, 1 );
   }
-	goto _again;
-f7:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 133 "parser.rl"
+	break;
+	case 6:
+#line 109 "parser.rl"
 	{
     ESIAttribute *attr;
     parser->attr_value = parser->mark;
     parser->attr_value_length = p - parser->mark;
     parser->mark = p;
-
-    ltrim_pointer( &(parser->attr_value), p, &(parser->attr_value_length) );
-
     // allocate a new attribute
     attr = esi_attribute_new( parser->attr_key, parser->attr_key_length, 
                               parser->attr_value, parser->attr_value_length );
@@ -1359,201 +551,28 @@ f7:
       parser->last = parser->attributes = attr;
     }
 //    debug_string( "\tattribute value", parser->attr_value, parser->attr_value_length );
-    //debug_string( "see_attribute_value", p, 1 );
-  }
-	goto _again;
-f4:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
   }
-#line 155 "parser.rl"
+	break;
+	case 7:
+#line 127 "parser.rl"
 	{
     parser->tag_text = parser->mark;
     parser->tag_text_length = p - parser->mark;
     parser->mark = p;
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
     parser->start_tag_handler( data, parser->tag_text, parser->tag_text_length, NULL, parser->user_data );
-    //debug_string( "block_start_tag", p, 1 );
   }
-	goto _again;
-f2:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 164 "parser.rl"
+	break;
+	case 8:
+#line 134 "parser.rl"
 	{
     parser->tag_text = parser->mark+2;
     parser->tag_text_length = p - (parser->mark+2);
-    //printf( "mark: [%s], p: [%s], length: %d\n", parser->mark, p, parser->tag_text_length );
-    parser->mark = p;
-    //debug_string( "block_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
-    //debug_string( "block_end_tag: after parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->end_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->user_data );
-  }
-	goto _again;
-f10:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 85 "parser.rl"
-	{
-    parser->mark = p;
-    //debug_string( "begin", p, 1 );
-  }
-#line 89 "parser.rl"
-	{
-//    printf( "finish\n" );
-  }
-	goto _again;
-f11:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 102 "parser.rl"
-	{
-    //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
-    //debug_string( "see_end_tag: after parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->start_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->attributes, parser->user_data );
-    //debug_string( "see_end_tag: after start parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->end_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->user_data );
-    //debug_string( "see_end_tag: after end parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->tag_text = NULL;
-    parser->tag_text_length = 0;
-    parser->mark = p;
-    //debug_string( "see_end_tag", p, 1 );
-  }
-#line 89 "parser.rl"
-	{
-//    printf( "finish\n" );
-  }
-	goto _again;
-f13:
-#line 175 "parser.rl"
-	{
-    switch( cs ){
-    case 0:
-      if( parser->prev_state != 12 && parser->prev_state != 7 ){
-        if( parser->echobuffer && (parser->prev_state != (esi_en_main +1)) && parser->prev_state != 60 ){
-          // stream echobuffer
-          esi_parser_echo_buffer( parser );
-        }
-//    printf( "[%d: %c]", cs, *p );
-        // stream the current character
-        esi_parser_echo_char( parser, *p );
-      }
-      // clear the echobuffer
-      esi_parser_echobuffer_clear( parser );
-      break;
-    default:
-      // append characters to echobuffer
-      esi_parser_concat_to_echobuffer( parser, *p );
-    }
-    parser->prev_state = cs;
-  }
-#line 85 "parser.rl"
-	{
     parser->mark = p;
-    //debug_string( "begin", p, 1 );
-  }
-#line 102 "parser.rl"
-	{
-    //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
-    //debug_string( "see_end_tag: after parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->start_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->attributes, parser->user_data );
-    //debug_string( "see_end_tag: after start parsed esi tag", parser->tag_text, parser->tag_text_length );
     parser->end_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->user_data );
-    //debug_string( "see_end_tag: after end parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->tag_text = NULL;
-    parser->tag_text_length = 0;
-    parser->mark = p;
-    //debug_string( "see_end_tag", p, 1 );
-  }
-#line 89 "parser.rl"
-	{
-//    printf( "finish\n" );
   }
-	goto _again;
-f12:
-#line 175 "parser.rl"
+	break;
+	case 9:
+#line 141 "parser.rl"
 	{
     switch( cs ){
     case 0:
@@ -1575,54 +594,17 @@ f12:
     }
     parser->prev_state = cs;
   }
-#line 102 "parser.rl"
-	{
-    //debug_string( "see_end_tag: before parsed esi tag", parser->tag_text, parser->tag_text_length );
-    ltrim_pointer( &(parser->tag_text), p, &(parser->tag_text_length) );
-    //debug_string( "see_end_tag: after parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->start_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->attributes, parser->user_data );
-    //debug_string( "see_end_tag: after start parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->end_tag_handler( data, parser->tag_text, parser->tag_text_length, parser->user_data );
-    //debug_string( "see_end_tag: after end parsed esi tag", parser->tag_text, parser->tag_text_length );
-    parser->tag_text = NULL;
-    parser->tag_text_length = 0;
-    parser->mark = p;
-    //debug_string( "see_end_tag", p, 1 );
-  }
-#line 133 "parser.rl"
-	{
-    ESIAttribute *attr;
-    parser->attr_value = parser->mark;
-    parser->attr_value_length = p - parser->mark;
-    parser->mark = p;
-
-    ltrim_pointer( &(parser->attr_value), p, &(parser->attr_value_length) );
-
-    // allocate a new attribute
-    attr = esi_attribute_new( parser->attr_key, parser->attr_key_length, 
-                              parser->attr_value, parser->attr_value_length );
-    if( parser->attributes ){
-      parser->last->next = attr;
-      parser->last = attr;
-    }
-    else{
-      parser->last = parser->attributes = attr;
-    }
-//    debug_string( "\tattribute value", parser->attr_value, parser->attr_value_length );
-    //debug_string( "see_attribute_value", p, 1 );
-  }
-#line 89 "parser.rl"
-	{
-//    printf( "finish\n" );
-  }
-	goto _again;
+	break;
+#line 599 "parser.c"
+		}
+	}
 
 _again:
 	if ( ++p != pe )
 		goto _resume;
 	_out: {}
 	}
-#line 351 "parser.rl"
+#line 294 "parser.rl"
 
   parser->cs = cs;
 
@@ -1634,18 +616,16 @@ _again:
       int tag_text_offset = compute_offset( parser->tag_text, data );
       int attr_key_offset = compute_offset( parser->attr_key, data );
       int attr_value_offset = compute_offset( parser->attr_value, data );
-      //debug_string( "mark before move", parser->mark, 1 );
 
       parser->overflow_data = (char*)malloc( sizeof( char ) * length );
       memcpy( parser->overflow_data, data, length );
       parser->overflow_data_size = length;
 
       // in our new memory space mark will now be
-      parser->mark = ( mark_offset >= 0 ) ? parser->overflow_data + mark_offset : NULL;
-      parser->tag_text = ( tag_text_offset >= 0 ) ? parser->overflow_data + tag_text_offset : NULL;
-      parser->attr_key = ( attr_key_offset >= 0 ) ? parser->overflow_data + attr_key_offset : NULL;
-      parser->attr_value = ( attr_value_offset >= 0 ) ? parser->overflow_data + attr_value_offset : NULL;
-      //if( parser->mark ){ debug_string( "mark after  move", parser->mark, 1 ); } else { printf( "mark is now empty\n" ); }
+      parser->mark = ( mark_offset > 0 ) ? parser->overflow_data + mark_offset : NULL;
+      parser->tag_text = ( tag_text_offset > 0 ) ? parser->overflow_data + tag_text_offset : NULL;
+      parser->attr_key = ( attr_key_offset > 0 ) ? parser->overflow_data + attr_key_offset : NULL;
+      parser->attr_value = ( attr_value_offset > 0 ) ? parser->overflow_data + attr_value_offset : NULL;
     }
 
   }else if( parser->overflow_data ){
@@ -1659,8 +639,8 @@ _again:
 int esi_parser_finish( ESIParser *parser )
 {
   
-#line 1663 "parser.c"
-#line 387 "parser.rl"
+#line 643 "parser.c"
+#line 328 "parser.rl"
   return 0;
 }