oga 1.0.3 → 1.1.0

data/ext/java/org/liboga/xml/Lexer.java

@@ -49,16 +49,15 @@ private static byte[] init__java_lexer_actions_0()
 	   18,    1,   21,    1,   22,    1,   23,    1,   24,    1,   25,    1,
 	   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,   34,    1,
 	   35,    1,   36,    1,   37,    1,   38,    1,   41,    1,   43,    1,
-	   44,    1,   47,    1,   48,    1,   49,    1,   50,    1,   51,    1,
-	   52,    1,   53,    1,   54,    1,   55,    1,   56,    1,   57,    1,
-	   58,    1,   59,    1,   60,    1,   61,    1,   62,    1,   63,    1,
-	   64,    1,   65,    1,   66,    1,   67,    1,   68,    1,   69,    1,
-	   70,    1,   73,    1,   74,    1,   75,    1,   76,    1,   77,    1,
-	   78,    1,   79,    1,   80,    1,   81,    1,   82,    2,    0,    1,
+	   44,    1,   45,    1,   46,    1,   47,    1,   48,    1,   49,    1,
+	   50,    1,   51,    1,   52,    1,   53,    1,   54,    1,   55,    1,
+	   56,    1,   57,    1,   58,    1,   59,    1,   60,    1,   61,    1,
+	   62,    1,   63,    1,   64,    1,   65,    1,   66,    1,   67,    1,
+	   68,    1,   71,    1,   72,    1,   73,    1,   74,    1,   75,    1,
+	   76,    1,   77,    1,   78,    1,   79,    1,   80,    2,    0,    1,
 	    2,    0,   33,    2,    0,   40,    2,    0,   42,    2,    4,    0,
-	    2,    4,   19,    2,    4,   20,    2,    4,   45,    2,    4,   46,
-	    2,    4,   71,    2,    4,   72,    2,   31,    0,    2,   32,    0,
-	    2,   39,    0
+	    2,    4,   19,    2,    4,   20,    2,    4,   69,    2,    4,   70,
+	    2,   31,    0,    2,   32,    0,    2,   39,    0
 	};
 }
 
@@ -74,8 +73,8 @@ private static short[] init__java_lexer_key_offsets_0()
 	   75,   84,   93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
 	  103,  104,  105,  106,  107,  108,  126,  127,  135,  144,  153,  162,
 	  171,  180,  189,  198,  207,  216,  225,  236,  244,  245,  253,  262,
-	  271,  280,  284,  285,  291,  298,  300,  313,  314,  323,  324,  325,
-	  326,  337,  348,  349,  350,  352,  353,  354,  355,  357
+	  271,  280,  286,  287,  292,  297,  299,  312,  313,  322,  323,  324,
+	  325,  336,  347,  348,  349,  351,  352,  353,  354,  356
 	};
 }
 
@@ -108,13 +107,13 @@ private static char[] init__java_lexer_trans_keys_0()
 	   65,   90,   97,  122,   62,   45,   95,   48,   57,   65,   90,   97,
 	  122,   45,   58,   95,   48,   57,   65,   90,   97,  122,   45,   62,
 	   95,   48,   57,   65,   90,   97,  122,   45,   58,   95,   48,   57,
-	   65,   90,   97,  122,   13,   32,    9,   10,   10,   13,   32,   34,
-	   39,    9,   10,   13,   32,   96,    9,   10,   60,   62,   34,   39,
-	   10,   13,   45,   47,   61,   62,   95,   48,   57,   65,   90,   97,
-	  122,   10,   45,   58,   95,   48,   57,   65,   90,   97,  122,   62,
-	   60,   60,   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,
-	  122,   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,
-	   60,   60,   47,   60,   60,   60,   60,   47,   60,   60,    0
+	   65,   90,   97,  122,   13,   32,   34,   39,    9,   10,   10,   13,
+	   32,   62,    9,   10,   13,   32,   62,    9,   10,   34,   39,   10,
+	   13,   45,   47,   61,   62,   95,   48,   57,   65,   90,   97,  122,
+	   10,   45,   58,   95,   48,   57,   65,   90,   97,  122,   62,   60,
+	   60,   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,
+	   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,   60,
+	   60,   47,   60,   60,   60,   60,   47,   60,   60,    0
 	};
 }
 
@@ -130,7 +129,7 @@ private static byte[] init__java_lexer_single_lengths_0()
 	    3,    3,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
 	    1,    1,    1,    1,    1,   12,    1,    2,    3,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    5,    2,    1,    2,    3,    3,
-	    3,    2,    1,    4,    3,    2,    7,    1,    3,    1,    1,    1,
+	    3,    4,    1,    3,    3,    2,    7,    1,    3,    1,    1,    1,
 	    5,    5,    1,    1,    2,    1,    1,    1,    2,    1
 	};
 }
@@ -147,7 +146,7 @@ private static byte[] init__java_lexer_range_lengths_0()
 	    3,    3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    3,    0,    3,    3,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    3,    3,    0,    3,    3,    3,
-	    3,    1,    0,    1,    2,    0,    3,    0,    3,    0,    0,    0,
+	    3,    1,    0,    1,    1,    0,    3,    0,    3,    0,    0,    0,
 	    3,    3,    0,    0,    0,    0,    0,    0,    0,    0
 	};
 }
@@ -164,7 +163,7 @@ private static short[] init__java_lexer_index_offsets_0()
 	   99,  106,  113,  115,  117,  119,  121,  123,  125,  127,  129,  131,
 	  133,  135,  137,  139,  141,  143,  159,  161,  167,  174,  181,  188,
 	  195,  202,  209,  216,  223,  230,  237,  246,  252,  254,  260,  267,
-	  274,  281,  285,  287,  293,  299,  302,  313,  315,  322,  324,  326,
+	  274,  281,  287,  289,  294,  299,  302,  313,  315,  322,  324,  326,
 	  328,  337,  346,  348,  350,  353,  355,  357,  359,  362
 	};
 }
@@ -198,8 +197,8 @@ private static byte[] init__java_lexer_trans_targs_0()
 	   68,   67,   67,   67,   67,   66,   67,   67,   67,   67,   67,   66,
 	   66,   66,   70,   70,   70,   70,   70,    0,   70,   69,   70,   70,
 	   70,   70,   69,   72,   71,   72,   72,   72,   72,   71,   72,   71,
-	   72,   72,   72,   72,   71,   74,   73,   73,   73,   73,   73,   75,
-	   75,   75,   75,   75,   76,   75,   75,   75,   75,   75,   76,   77,
+	   72,   72,   72,   72,   71,   74,   73,   73,   73,   73,   73,   73,
+	   73,   75,   75,   75,   75,   76,   75,   75,   75,   75,   76,   77,
 	   77,   77,   78,   79,   80,   81,   78,   78,   80,   80,   80,   80,
 	   78,   78,   78,   80,   78,   80,   80,   80,   80,   78,   78,   78,
 	   85,   83,   84,   83,   82,   82,   84,   82,   82,   82,   82,   82,
@@ -224,13 +223,13 @@ private static short[] init__java_lexer_trans_actions_0()
 	    0,    0,    0,    0,  137,  121,  137,    0,    0,  137,    0,    0,
 	  137,    0,    0,  137,    0,    0,  137,    0,    0,  137,    0,    0,
 	  137,    1,    1,    1,  137,    0,  137,    0,  137,    0,  137,    0,
-	  137,    0,  137,  123,  137,  171,  171,    0,  171,  171,  171,  137,
+	  137,    0,  137,  123,  137,  165,  165,    0,  165,  165,  165,  137,
 	    9,   13,   15,   19,    0,  113,    0,  113,    0,  113,    0,  113,
 	    0,  113,    0,  113,  109,  113,    0,  119,    0,  119,    0,  119,
 	    0,  119,    0,  119,  115,  119,    7,  129,    0,  125,  127,    0,
-	  125,  125,  125,  125,  135,    1,    1,    1,  131,  171,  171,  171,
-	  171,  171,  139,  171,  171,    0,  171,  171,  171,  133,  171,  171,
-	  168,  171,  171,  171,  133,  153,    1,   11,    1,    0,   11,  153,
+	  125,  125,  125,  125,  135,    1,    1,    1,  131,  165,  165,  165,
+	  165,  165,  139,  165,  165,    0,  165,  165,  165,  133,  165,  165,
+	  162,  165,  165,  165,  133,  153,    1,   11,    1,    0,   11,  153,
 	    1,   17,    1,    0,   17,    1,    1,   23,    1,   21,   23,   25,
 	    1,   27,    1,   29,    1,   31,    1,   33,    1,   35,    1,   47,
 	   45,    0,   47,   41,   39,  159,   43,    0,    0,   37,  159,  159,
@@ -240,12 +239,12 @@ private static short[] init__java_lexer_trans_actions_0()
 	  159,  159,   49,  159,  156,  159,  159,  159,  159,   49,  159,    0,
 	  159,  159,  159,  159,   49,  159,    0,  159,  159,  159,  159,   49,
 	  159,    0,  159,  159,  159,  159,   49,  159,    0,  159,  159,  159,
-	  159,   49,  159,  156,  159,  159,  159,  159,   49,  177,  174,    1,
+	  159,   49,  159,  156,  159,  159,  159,  159,   49,  171,  168,    1,
 	    1,    1,    1,    1,    1,  144,    0,    0,    0,    0,    0,   57,
 	   55,   59,    0,    0,    0,    0,    0,    0,    0,   61,    0,    0,
-	    0,    0,   63,    1,  180,    1,    1,    1,    1,  147,    0,   65,
-	    0,    0,    0,    0,   67,    1,  150,  150,   69,  150,   71,   75,
-	   75,   73,   73,   75,  165,   77,   77,   77,   77,   77,  162,   81,
+	    0,    0,   63,    1,  174,    1,    1,    1,    1,  147,    0,   65,
+	    0,    0,    0,    0,   67,    1,  150,   69,   69,  150,   71,  150,
+	   73,   75,   75,   75,   75,    0,   77,   77,   77,   77,    0,   81,
 	   79,   83,   85,    0,    0,    0,   89,   91,    0,    0,    0,    0,
 	   95,   85,   97,    0,   87,    0,    0,    0,    0,   99,   93,  101,
 	  141,    1,  141,    1,  105,  105,  141,  105,  105,  105,  105,  105,
@@ -256,7 +255,7 @@ private static short[] init__java_lexer_trans_actions_0()
 	  113,  113,  113,  113,  113,  119,  119,  119,  119,  119,  119,  135,
 	  131,  139,  133,  133,   11,   11,   17,   17,   23,   23,   27,   31,
 	   35,   51,   53,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-	   49,   57,   59,   63,   67,   71,   77,   97,   99,  101,  107,  107,
+	   49,   57,   59,   63,   67,   73,   77,   97,   99,  101,  107,  107,
 	  107,  111,  111,  111,  117,  117,  117,    0
 	};
 }
@@ -330,8 +329,8 @@ static final int java_lexer_en_xml_decl = 66;
 static final int java_lexer_en_element_name = 69;
 static final int java_lexer_en_element_close = 71;
 static final int java_lexer_en_attribute_pre = 73;
-static final int java_lexer_en_html_attribute_value = 75;
-static final int java_lexer_en_xml_attribute_value = 77;
+static final int java_lexer_en_unquoted_attribute_value = 75;
+static final int java_lexer_en_quoted_attribute_value = 77;
 static final int java_lexer_en_element_head = 78;
 static final int java_lexer_en_text = 82;
 static final int java_lexer_en_html_script = 86;
@@ -437,7 +436,7 @@ static final int java_lexer_en_main = 32;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 441 "ext/java/org/liboga/xml/Lexer.java"
+// line 440 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -466,7 +465,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 470 "ext/java/org/liboga/xml/Lexer.java"
+// line 469 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -536,7 +535,7 @@ case 3:
     }
 	break;
 	case 1:
-// line 589 "ext/ragel/base_lexer.rl"
+// line 603 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
 	case 4:
@@ -857,11 +856,26 @@ case 3:
     }}
 	break;
 	case 42:
-// line 432 "ext/ragel/base_lexer.rl"
+// line 425 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 43:
-// line 434 "ext/ragel/base_lexer.rl"
+// line 427 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            p--;
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            ( this.cs) = 77;
+        }}
+	break;
+	case 44:
+// line 440 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
 
@@ -876,102 +890,77 @@ case 3:
             {
                 ( this.cs) = 75;
             }
+            /* XML doesn't support unquoted attribute values */
             else
             {
-                ( this.cs) = 77;
+                {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
             }
         }}
 	break;
-	case 44:
-// line 432 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
-	break;
 	case 45:
-// line 464 "ext/ragel/base_lexer.rl"
-	{( this.act) = 35;}
+// line 425 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
 	break;
 	case 46:
-// line 64 "ext/ragel/base_lexer.rl"
-	{( this.act) = 36;}
-	break;
-	case 47:
-// line 457 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-            p--;
-            ( this.cs) = 77;
-        }}
-	break;
-	case 48:
 // line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 49:
-// line 1 "NONE"
-	{	switch( ( this.act) ) {
-	case 35:
-	{{p = ((te))-1;}
+	case 47:
+// line 478 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
             callback(id_on_string_body, data, encoding, ts, te);
 
             callback_simple(id_on_string_squote);
-        }
-	break;
-	case 36:
-	{{p = ((te))-1;}
-        p--;
-        {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
-    }
-	break;
-	}
-	}
+        }}
 	break;
-	case 50:
-// line 480 "ext/ragel/base_lexer.rl"
+	case 48:
+// line 494 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
             ( this.cs) = 47;
         }}
 	break;
-	case 51:
-// line 486 "ext/ragel/base_lexer.rl"
+	case 49:
+// line 500 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
             ( this.cs) = 49;
         }}
 	break;
-	case 52:
+	case 50:
 // line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 53:
+	case 51:
 // line 60 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	break;
-	case 54:
-// line 501 "ext/ragel/base_lexer.rl"
+	case 52:
+// line 515 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	break;
-	case 55:
-// line 510 "ext/ragel/base_lexer.rl"
+	case 53:
+// line 524 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 73; _goto_targ = 2; if (true) continue _goto;}
         }}
 	break;
-	case 56:
-// line 515 "ext/ragel/base_lexer.rl"
+	case 54:
+// line 529 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
@@ -989,35 +978,35 @@ case 3:
             }
         }}
 	break;
-	case 57:
-// line 533 "ext/ragel/base_lexer.rl"
+	case 55:
+// line 547 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
             ( this.cs) = 32;
         }}
 	break;
-	case 58:
-// line 538 "ext/ragel/base_lexer.rl"
+	case 56:
+// line 552 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 59:
+	case 57:
 // line 60 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
 	break;
-	case 60:
-// line 505 "ext/ragel/base_lexer.rl"
+	case 58:
+// line 519 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
-	case 61:
-// line 538 "ext/ragel/base_lexer.rl"
+	case 59:
+// line 552 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 62:
-// line 575 "ext/ragel/base_lexer.rl"
+	case 60:
+// line 589 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1031,8 +1020,8 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 63:
-// line 589 "ext/ragel/base_lexer.rl"
+	case 61:
+// line 603 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1049,8 +1038,8 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 64:
-// line 575 "ext/ragel/base_lexer.rl"
+	case 62:
+// line 589 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1064,7 +1053,7 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 65:
+	case 63:
 // line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
@@ -1072,8 +1061,8 @@ case 3:
         ( this.cs) = 32;
     }}
 	break;
-	case 66:
-// line 563 "ext/ragel/base_lexer.rl"
+	case 64:
+// line 577 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1085,8 +1074,8 @@ case 3:
         }
     }}
 	break;
-	case 67:
-// line 563 "ext/ragel/base_lexer.rl"
+	case 65:
+// line 577 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1098,7 +1087,7 @@ case 3:
         }
     }}
 	break;
-	case 68:
+	case 66:
 // line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
@@ -1106,8 +1095,8 @@ case 3:
         ( this.cs) = 32;
     }}
 	break;
-	case 69:
-// line 563 "ext/ragel/base_lexer.rl"
+	case 67:
+// line 577 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1119,8 +1108,8 @@ case 3:
         }
     }}
 	break;
-	case 70:
-// line 563 "ext/ragel/base_lexer.rl"
+	case 68:
+// line 577 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1132,15 +1121,15 @@ case 3:
         }
     }}
 	break;
-	case 71:
+	case 69:
 // line 319 "ext/ragel/base_lexer.rl"
 	{( this.act) = 54;}
 	break;
-	case 72:
+	case 70:
 // line 165 "ext/ragel/base_lexer.rl"
 	{( this.act) = 57;}
 	break;
-	case 73:
+	case 71:
 // line 84 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
@@ -1148,7 +1137,7 @@ case 3:
         ( this.cs) = 38;
     }}
 	break;
-	case 74:
+	case 72:
 // line 123 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
@@ -1156,27 +1145,27 @@ case 3:
         ( this.cs) = 41;
     }}
 	break;
-	case 75:
+	case 73:
 // line 366 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( this.cs) = 69;
     }}
 	break;
-	case 76:
+	case 74:
 // line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         ( this.cs) = 71;
     }}
 	break;
-	case 77:
-// line 549 "ext/ragel/base_lexer.rl"
+	case 75:
+// line 563 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( this.cs) = 82;
     }}
 	break;
-	case 78:
+	case 76:
 // line 255 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
@@ -1191,7 +1180,7 @@ case 3:
         ( this.cs) = 53;
     }}
 	break;
-	case 79:
+	case 77:
 // line 165 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
@@ -1200,21 +1189,21 @@ case 3:
         ( this.cs) = 44;
     }}
 	break;
-	case 80:
-// line 549 "ext/ragel/base_lexer.rl"
+	case 78:
+// line 563 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
         ( this.cs) = 82;
     }}
 	break;
-	case 81:
-// line 549 "ext/ragel/base_lexer.rl"
+	case 79:
+// line 563 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
         ( this.cs) = 82;
     }}
 	break;
-	case 82:
+	case 80:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
 	case 54:
@@ -1234,7 +1223,7 @@ case 3:
 	}
 	}
 	break;
-// line 1238 "ext/java/org/liboga/xml/Lexer.java"
+// line 1227 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -1248,7 +1237,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 1252 "ext/java/org/liboga/xml/Lexer.java"
+// line 1241 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}