oga 0.1.3 → 0.2.0

data/ext/c/lexer.h

@@ -5,4 +5,12 @@
 
 extern void Init_liboga_xml_lexer();
 
+typedef struct {
+    int act;
+    int cs;
+    int lines;
+    int stack[4];
+    int top;
+} OgaLexerState;
+
 #endif

data/ext/c/lexer.rl

@@ -22,6 +22,9 @@ on `ts` and `te`) so the macro ignores this argument.
 #define oga_ivar_set(owner, name, value) \
     rb_ivar_set(owner, rb_intern(name), value)
 
+#define advance_line(amount) \
+    rb_funcall(self, rb_intern("advance_line"), 1, INT2NUM(amount));
+
 %%machine c_lexer;
 
 /**
@@ -72,10 +75,14 @@ void liboga_xml_lexer_callback_simple(VALUE self, const char *name)
  */
 VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 {
+    OgaLexerState *state;
+
     /* Make sure that all data passed back to Ruby has the proper encoding. */
     rb_encoding *encoding = rb_enc_get(data_block);
 
-    char *data_str_val = StringValuePtr(data_block);
+    char *data_str_val = StringValueCStr(data_block);
+
+    Data_Get_Struct(self, OgaLexerState, state);
 
     const char *p    = data_str_val;
     const char *pe   = data_str_val + strlen(data_str_val);
@@ -84,13 +91,11 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     const char *te   = 0;
     const char *mark = 0;
 
-    int act = NUM2INT(oga_ivar_get(self, "@act"));
-    int cs  = NUM2INT(oga_ivar_get(self, "@cs"));
+    int lines = state->lines;
 
     %% write exec;
 
-    oga_ivar_set(self, "@act", INT2NUM(act));
-    oga_ivar_set(self, "@cs", INT2NUM(cs));
+    state->lines = lines;
 
     return Qnil;
 }
@@ -100,14 +105,44 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
  */
 VALUE oga_xml_lexer_reset(VALUE self)
 {
-    oga_ivar_set(self, "@act", INT2NUM(0));
-    oga_ivar_set(self, "@cs", INT2NUM(c_lexer_start));
+    OgaLexerState *state;
+
+    Data_Get_Struct(self, OgaLexerState, state);
+
+    state->act   = 0;
+    state->cs    = c_lexer_start;
+    state->lines = 0;
+    state->top   = 0;
 
     return Qnil;
 }
 
+/**
+ * Frees the associated lexer state struct.
+ */
+void oga_xml_lexer_free(void *state)
+{
+    free((OgaLexerState *) state);
+}
+
+/**
+ * Allocates and wraps the C lexer state struct. This state is used to keep
+ * track of the current position, line numbers, etc.
+ */
+VALUE oga_xml_lexer_allocate(VALUE klass)
+{
+    OgaLexerState *state = malloc(sizeof(OgaLexerState));
+
+    return Data_Wrap_Struct(klass, NULL, oga_xml_lexer_free, state);
+}
+
 %%{
     include base_lexer "base_lexer.rl";
+
+    variable top state->top;
+    variable stack state->stack;
+    variable act state->act;
+    variable cs state->cs;
 }%%
 
 void Init_liboga_xml_lexer()
@@ -118,4 +153,6 @@ void Init_liboga_xml_lexer()
 
     rb_define_method(cLexer, "advance_native", oga_xml_lexer_advance, 1);
     rb_define_method(cLexer, "reset_native", oga_xml_lexer_reset, 0);
+
+    rb_define_alloc_func(cLexer, oga_xml_lexer_allocate);
 }

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

@@ -43,14 +43,16 @@ public class Lexer extends RubyObject
 private static byte[] init__java_lexer_actions_0()
 {
 	return new byte [] {
-	    0,    1,    0,    1,    1,    1,    2,    1,    3,    1,    4,    1,
-	    5,    1,    6,    1,    9,    1,   10,    1,   11,    1,   12,    1,
-	   13,    1,   14,    1,   15,    1,   16,    1,   17,    1,   18,    1,
-	   19,    1,   20,    1,   21,    1,   22,    1,   23,    1,   24,    1,
-	   25,    1,   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,
-	   31,    1,   32,    1,   35,    1,   36,    1,   37,    1,   38,    1,
-	   39,    1,   40,    1,   41,    1,   42,    1,   43,    1,   44,    2,
-	    3,    7,    2,    3,    8,    2,    3,   33,    2,    3,   34
+	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
+	    6,    1,    7,    1,    8,    1,    9,    1,   10,    1,   11,    1,
+	   14,    1,   15,    1,   16,    1,   17,    1,   18,    1,   19,    1,
+	   20,    1,   21,    1,   22,    1,   23,    1,   24,    1,   25,    1,
+	   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,   31,    1,
+	   32,    1,   33,    1,   34,    1,   35,    1,   36,    1,   37,    1,
+	   38,    1,   39,    1,   42,    1,   43,    1,   44,    1,   45,    1,
+	   46,    1,   47,    1,   48,    1,   49,    1,   50,    1,   51,    2,
+	    0,    1,    2,    4,   12,    2,    4,   13,    2,    4,   40,    2,
+	    4,   41
 	};
 }
 
@@ -62,10 +64,10 @@ private static short[] init__java_lexer_key_offsets_0()
 	return new short [] {
 	    0,    0,    4,    5,    6,    7,    9,   11,   13,   15,   17,   19,
 	   21,   23,   24,   25,   26,   27,   28,   29,   30,   31,   33,   41,
-	   51,   60,   61,   62,   62,   63,   64,   65,   66,   67,   68,   69,
-	   70,   81,   83,   91,  100,  109,  110,  111,  127,  135,  144,  153,
-	  162,  171,  180,  189,  198,  207,  216,  225,  236,  237,  238,  246,
-	  247,  255,  264,  281,  290,  291,  292,  303
+	   51,   60,   60,   61,   62,   63,   64,   75,   77,   85,   94,  103,
+	  104,  105,  106,  107,  108,  109,  125,  133,  142,  151,  160,  169,
+	  178,  187,  196,  205,  214,  223,  234,  242,  243,  251,  260,  277,
+	  286,  287,  288,  299
 	};
 }
 
@@ -80,28 +82,27 @@ private static char[] init__java_lexer_trans_keys_0()
 	   68,   65,   84,   65,   91,   93,   93,   62,   93,   45,   95,   48,
 	   57,   65,   90,   97,  122,   45,   58,   62,   95,   48,   57,   65,
 	   90,   97,  122,   45,   95,  120,   48,   57,   65,   90,   97,  122,
-	   34,   39,   93,   34,   39,   10,   34,   39,   62,   60,   33,   45,
-	   47,   63,   95,   48,   57,   65,   90,   97,  122,    9,   32,   45,
-	   95,   48,   57,   65,   90,   97,  122,   45,   95,  109,   48,   57,
-	   65,   90,   97,  122,   45,   95,  108,   48,   57,   65,   90,   97,
-	  122,   63,   62,    9,   32,   34,   39,   45,   62,   80,   83,   91,
-	   95,   48,   57,   65,   90,   97,  122,   45,   95,   48,   57,   65,
-	   90,   97,  122,   45,   85,   95,   48,   57,   65,   90,   97,  122,
-	   45,   66,   95,   48,   57,   65,   90,   97,  122,   45,   76,   95,
-	   48,   57,   65,   90,   97,  122,   45,   73,   95,   48,   57,   65,
-	   90,   97,  122,   45,   67,   95,   48,   57,   65,   90,   97,  122,
-	   45,   89,   95,   48,   57,   65,   90,   97,  122,   45,   83,   95,
-	   48,   57,   65,   90,   97,  122,   45,   84,   95,   48,   57,   65,
-	   90,   97,  122,   45,   69,   95,   48,   57,   65,   90,   97,  122,
-	   45,   77,   95,   48,   57,   65,   90,   97,  122,   34,   39,   45,
-	   63,   95,   48,   57,   65,   90,   97,  122,   34,   39,   45,   95,
-	   48,   57,   65,   90,   97,  122,   62,   45,   95,   48,   57,   65,
-	   90,   97,  122,   45,   58,   95,   48,   57,   65,   90,   97,  122,
-	    9,   10,   13,   32,   34,   39,   45,   47,   61,   62,   95,   48,
-	   57,   65,   90,   97,  122,   45,   58,   95,   48,   57,   65,   90,
-	   97,  122,   60,   60,   33,   45,   60,   63,   95,   47,   57,   65,
-	   90,   97,  122,   33,   45,   60,   63,   95,   47,   57,   65,   90,
-	   97,  122,    0
+	   93,   10,   62,   60,   33,   45,   47,   63,   95,   48,   57,   65,
+	   90,   97,  122,    9,   32,   45,   95,   48,   57,   65,   90,   97,
+	  122,   45,   95,  109,   48,   57,   65,   90,   97,  122,   45,   95,
+	  108,   48,   57,   65,   90,   97,  122,   63,   62,   39,   39,   34,
+	   34,    9,   32,   34,   39,   45,   62,   80,   83,   91,   95,   48,
+	   57,   65,   90,   97,  122,   45,   95,   48,   57,   65,   90,   97,
+	  122,   45,   85,   95,   48,   57,   65,   90,   97,  122,   45,   66,
+	   95,   48,   57,   65,   90,   97,  122,   45,   76,   95,   48,   57,
+	   65,   90,   97,  122,   45,   73,   95,   48,   57,   65,   90,   97,
+	  122,   45,   67,   95,   48,   57,   65,   90,   97,  122,   45,   89,
+	   95,   48,   57,   65,   90,   97,  122,   45,   83,   95,   48,   57,
+	   65,   90,   97,  122,   45,   84,   95,   48,   57,   65,   90,   97,
+	  122,   45,   69,   95,   48,   57,   65,   90,   97,  122,   45,   77,
+	   95,   48,   57,   65,   90,   97,  122,   34,   39,   45,   63,   95,
+	   48,   57,   65,   90,   97,  122,   45,   95,   48,   57,   65,   90,
+	   97,  122,   62,   45,   95,   48,   57,   65,   90,   97,  122,   45,
+	   58,   95,   48,   57,   65,   90,   97,  122,    9,   10,   13,   32,
+	   34,   39,   45,   47,   61,   62,   95,   48,   57,   65,   90,   97,
+	  122,   45,   58,   95,   48,   57,   65,   90,   97,  122,   60,   60,
+	   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,   33,
+	   45,   60,   63,   95,   47,   57,   65,   90,   97,  122,    0
 	};
 }
 
@@ -113,10 +114,10 @@ private static byte[] init__java_lexer_single_lengths_0()
 	return new byte [] {
 	    0,    4,    1,    1,    1,    2,    2,    2,    2,    2,    2,    2,
 	    2,    1,    1,    1,    1,    1,    1,    1,    1,    2,    2,    4,
-	    3,    1,    1,    0,    1,    1,    1,    1,    1,    1,    1,    1,
-	    5,    2,    2,    3,    3,    1,    1,   10,    2,    3,    3,    3,
-	    3,    3,    3,    3,    3,    3,    3,    5,    1,    1,    2,    1,
-	    2,    3,   11,    3,    1,    1,    5,    5
+	    3,    0,    1,    1,    1,    1,    5,    2,    2,    3,    3,    1,
+	    1,    1,    1,    1,    1,   10,    2,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    5,    2,    1,    2,    3,   11,    3,
+	    1,    1,    5,    5
 	};
 }
 
@@ -128,10 +129,10 @@ private static byte[] init__java_lexer_range_lengths_0()
 	return new byte [] {
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,    3,
-	    3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    3,    0,    3,    3,    3,    0,    0,    3,    3,    3,    3,    3,
-	    3,    3,    3,    3,    3,    3,    3,    3,    0,    0,    3,    0,
-	    3,    3,    3,    3,    0,    0,    3,    3
+	    3,    0,    0,    0,    0,    0,    3,    0,    3,    3,    3,    0,
+	    0,    0,    0,    0,    0,    3,    3,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    3,    3,    0,    3,    3,    3,    3,
+	    0,    0,    3,    3
 	};
 }
 
@@ -143,10 +144,10 @@ private static short[] init__java_lexer_index_offsets_0()
 	return new short [] {
 	    0,    0,    5,    7,    9,   11,   14,   17,   20,   23,   26,   29,
 	   32,   35,   37,   39,   41,   43,   45,   47,   49,   51,   54,   60,
-	   68,   75,   77,   79,   80,   82,   84,   86,   88,   90,   92,   94,
-	   96,  105,  108,  114,  121,  128,  130,  132,  146,  152,  159,  166,
-	  173,  180,  187,  194,  201,  208,  215,  222,  231,  233,  235,  241,
-	  243,  249,  256,  271,  278,  280,  282,  291
+	   68,   75,   76,   78,   80,   82,   84,   93,   96,  102,  109,  116,
+	  118,  120,  122,  124,  126,  128,  142,  148,  155,  162,  169,  176,
+	  183,  190,  197,  204,  211,  218,  227,  233,  235,  241,  248,  263,
+	  270,  272,  274,  283
 	};
 }
 
@@ -162,26 +163,25 @@ private static byte[] init__java_lexer_indicies_0()
 	    0,   16,    0,   17,    0,   18,    0,   19,    0,   20,    0,   21,
 	   20,   22,   20,   23,   22,   20,   24,   24,   24,   24,   24,    0,
 	   24,   25,   26,   24,   24,   24,   24,    0,   27,   27,   28,   27,
-	   27,   27,    0,   30,   29,   30,   31,   32,   33,   32,   36,   35,
-	   36,   37,   38,   39,   41,   40,   41,   42,   43,   39,   45,   44,
-	   47,   48,   25,   49,   48,   48,   48,   48,   46,   14,   14,   50,
-	   27,   27,   27,   27,   27,   51,   27,   27,   53,   27,   27,   27,
-	   52,   27,   27,   54,   27,   27,   27,   52,   56,   55,   58,   57,
-	   59,   59,   29,   31,   60,   61,   62,   63,   64,   60,   60,   60,
-	   60,   39,   60,   60,   60,   60,   60,   65,   60,   67,   60,   60,
-	   60,   60,   66,   60,   68,   60,   60,   60,   60,   66,   60,   69,
-	   60,   60,   60,   60,   66,   60,   70,   60,   60,   60,   60,   66,
-	   60,   71,   60,   60,   60,   60,   66,   60,   72,   60,   60,   60,
-	   60,   66,   60,   73,   60,   60,   60,   60,   66,   60,   74,   60,
-	   60,   60,   60,   66,   60,   75,   60,   60,   60,   60,   66,   60,
-	   71,   60,   60,   60,   60,   66,   77,   78,   79,   80,   79,   79,
-	   79,   79,   76,   36,   35,   36,   37,   79,   79,   79,   79,   79,
-	   82,   83,   81,   84,   84,   84,   84,   84,   39,   84,   86,   84,
-	   84,   84,   84,   85,   87,   38,   88,   87,   40,   42,   89,   90,
-	   87,   91,   89,   89,   89,   89,   39,   89,   93,   89,   89,   89,
-	   89,   92,   95,   94,   97,   94,   98,   98,   97,   98,   98,   98,
-	   98,   98,   94,   99,   99,   97,   99,   99,   99,   99,   99,   94,
-	    0
+	   27,   27,    0,   29,   30,   29,   31,   32,   33,   32,   35,   34,
+	   37,   38,   25,   39,   38,   38,   38,   38,   36,   14,   14,   40,
+	   27,   27,   27,   27,   27,   41,   27,   27,   43,   27,   27,   27,
+	   42,   27,   27,   44,   27,   27,   27,   42,   46,   45,   48,   47,
+	   50,   49,   51,   49,   53,   52,   54,   52,   55,   55,   56,   57,
+	   58,   59,   60,   61,   62,   58,   58,   58,   58,   32,   58,   58,
+	   58,   58,   58,   63,   58,   65,   58,   58,   58,   58,   64,   58,
+	   66,   58,   58,   58,   58,   64,   58,   67,   58,   58,   58,   58,
+	   64,   58,   68,   58,   58,   58,   58,   64,   58,   69,   58,   58,
+	   58,   58,   64,   58,   70,   58,   58,   58,   58,   64,   58,   71,
+	   58,   58,   58,   58,   64,   58,   72,   58,   58,   58,   58,   64,
+	   58,   73,   58,   58,   58,   58,   64,   58,   69,   58,   58,   58,
+	   58,   64,   75,   76,   77,   78,   77,   77,   77,   77,   74,   77,
+	   77,   77,   77,   77,   79,   81,   80,   82,   82,   82,   82,   82,
+	   32,   82,   84,   82,   82,   82,   82,   83,   85,   31,   86,   85,
+	   87,   88,   89,   90,   85,   91,   89,   89,   89,   89,   32,   89,
+	   93,   89,   89,   89,   89,   92,   95,   94,   97,   94,   98,   98,
+	   97,   98,   98,   98,   98,   98,   94,   99,   99,   97,   99,   99,
+	   99,   99,   99,   94,    0
 	};
 }
 
@@ -191,15 +191,15 @@ private static final byte _java_lexer_indicies[] = init__java_lexer_indicies_0()
 private static byte[] init__java_lexer_trans_targs_0()
 {
 	return new byte [] {
-	   35,    2,    6,   13,    3,    4,    5,   35,    7,    8,    9,   10,
-	   11,   12,   37,   14,   15,   16,   17,   18,   19,   20,   21,   35,
-	   23,   22,   35,   38,   39,   25,   43,   26,   28,   43,   55,   29,
-	   55,   30,   62,    0,   32,   62,   33,   62,   35,   36,   35,    1,
-	   35,   24,   35,   35,   35,   40,   38,   41,   42,   41,   41,   43,
-	   44,   43,   45,   50,   27,   43,   43,   46,   47,   48,   49,   44,
-	   51,   52,   53,   54,   55,   56,   57,   58,   59,   55,   55,   55,
-	   61,   60,   60,   62,   31,   63,   34,   62,   62,   62,   65,   67,
-	   64,   66,   64,   64
+	   29,    2,    6,   13,    3,    4,    5,   29,    7,    8,    9,   10,
+	   11,   12,   31,   14,   15,   16,   17,   18,   19,   20,   21,   29,
+	   23,   22,   29,   32,   33,   26,   41,   58,    0,   58,   29,   30,
+	   29,    1,   29,   24,   29,   29,   29,   34,   32,   35,   36,   35,
+	   35,   38,   37,   37,   40,   39,   39,   41,   41,   41,   42,   41,
+	   43,   48,   25,   41,   41,   44,   45,   46,   47,   42,   49,   50,
+	   51,   52,   53,   53,   53,   54,   55,   53,   53,   53,   57,   56,
+	   56,   58,   27,   58,   58,   59,   28,   58,   58,   58,   61,   63,
+	   60,   62,   60,   60
 	};
 }
 
@@ -209,15 +209,15 @@ private static final byte _java_lexer_trans_targs[] = init__java_lexer_trans_tar
 private static byte[] init__java_lexer_trans_actions_0()
 {
 	return new byte [] {
-	   79,    0,    0,    0,    0,    0,    0,   63,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   65,
-	    0,    0,   69,   92,    0,    0,   17,    0,    0,   15,   37,    0,
-	   29,    0,   45,    0,    0,   49,    0,   53,   71,    7,   77,    0,
-	   67,    0,   73,   81,   75,    0,   89,   11,    0,   13,    9,   19,
-	   86,   21,    0,    0,    0,   25,   23,    0,    0,    0,    0,   83,
-	    0,    0,    0,    0,   31,    7,    7,    0,    0,   35,   33,   27,
-	    0,   41,   39,   43,    0,    0,    0,   51,   55,   47,    0,    1,
-	   61,    1,   59,   57
+	   91,    0,    0,    0,    0,    0,    0,   75,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   77,
+	    0,    0,   81,  107,    0,    0,   23,   55,    0,   65,   83,    7,
+	   89,    0,   79,    0,   85,   93,   87,    0,  104,   11,    0,   13,
+	    9,    1,   15,   17,    1,   19,   21,   29,   27,   25,  101,   31,
+	    0,    0,    0,   35,   33,    0,    0,    0,    0,   98,    0,    0,
+	    0,    0,   43,   41,   39,    0,    0,   45,   47,   37,    0,   51,
+	   49,   53,    0,   61,   59,    0,    0,   63,   67,   57,    1,   95,
+	   73,   95,   71,   69
 	};
 }
 
@@ -229,10 +229,10 @@ private static byte[] init__java_lexer_to_state_actions_0()
 	return new byte [] {
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,
-	    0,    0,    0,    0,    0,    3,    0,    3,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    3,    0,    0,    0,    0,
-	    3,    0,    3,    0,    3,    0,    0,    0
+	    0,    0,    0,    0,    0,    3,    0,    0,    0,    0,    0,    3,
+	    0,    3,    0,    3,    0,    3,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    3,    0,    0,    3,    0,    3,    0,
+	    3,    0,    0,    0
 	};
 }
 
@@ -244,10 +244,10 @@ private static byte[] init__java_lexer_from_state_actions_0()
 	return new byte [] {
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
-	    0,    0,    0,    0,    0,    5,    0,    5,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    5,    0,    0,    0,    0,
-	    5,    0,    5,    0,    5,    0,    0,    0
+	    0,    0,    0,    0,    0,    5,    0,    0,    0,    0,    0,    5,
+	    0,    5,    0,    5,    0,    5,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    5,    0,    0,    5,    0,    5,    0,
+	    5,    0,    0,    0
 	};
 }
 
@@ -259,27 +259,29 @@ private static short[] init__java_lexer_eof_trans_0()
 	return new short [] {
 	    0,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
 	    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-	    1,    0,    0,    0,    0,   35,   35,    0,    0,    0,    0,    0,
-	   47,   51,   52,   53,   53,    0,   58,    0,   66,   67,   67,   67,
-	   67,   67,   67,   67,   67,   67,   67,    0,   82,   82,   83,   82,
-	    0,   86,    0,   93,    0,   97,   97,   97
+	    1,    0,    0,    0,    0,    0,   37,   41,   42,   43,   43,    0,
+	   48,    0,   52,    0,   55,    0,   64,   65,   65,   65,   65,   65,
+	   65,   65,   65,   65,   65,    0,   80,   81,    0,   84,    0,   93,
+	    0,   97,   97,   97
 	};
 }
 
 private static final short _java_lexer_eof_trans[] = init__java_lexer_eof_trans_0();
 
 
-static final int java_lexer_start = 35;
-static final int java_lexer_first_final = 35;
+static final int java_lexer_start = 29;
+static final int java_lexer_first_final = 29;
 static final int java_lexer_error = 0;
 
-static final int java_lexer_en_proc_ins_body = 41;
-static final int java_lexer_en_doctype = 43;
-static final int java_lexer_en_xml_decl = 55;
-static final int java_lexer_en_element_name = 60;
-static final int java_lexer_en_element_head = 62;
-static final int java_lexer_en_text = 64;
-static final int java_lexer_en_main = 35;
+static final int java_lexer_en_proc_ins_body = 35;
+static final int java_lexer_en_string_squote = 37;
+static final int java_lexer_en_string_dquote = 39;
+static final int java_lexer_en_doctype = 41;
+static final int java_lexer_en_xml_decl = 53;
+static final int java_lexer_en_element_name = 56;
+static final int java_lexer_en_element_head = 58;
+static final int java_lexer_en_text = 60;
+static final int java_lexer_en_main = 29;
 
 
 // line 39 "ext/java/org/liboga/xml/Lexer.rl"
@@ -287,6 +289,9 @@ static final int java_lexer_en_main = 35;
     /* Used by Ragel to keep track of the current state. */
     int act;
     int cs;
+    int top;
+    int lines;
+    int[] stack;
 
     /**
      * Sets up the current class in the Ruby runtime.
@@ -337,15 +342,16 @@ static final int java_lexer_en_main = 35;
 
         byte[] data = rb_str.getBytes();
 
-        int ts   = 0;
-        int te   = 0;
-        int p    = 0;
-        int mark = 0;
-        int pe   = data.length;
-        int eof  = data.length;
+        int ts    = 0;
+        int te    = 0;
+        int p     = 0;
+        int mark  = 0;
+        int lines = this.lines;
+        int pe    = data.length;
+        int eof   = data.length;
 
         
-// line 349 "ext/java/org/liboga/xml/Lexer.java"
+// line 355 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -370,11 +376,11 @@ case 1:
 	_nacts = (int) _java_lexer_actions[_acts++];
 	while ( _nacts-- > 0 ) {
 		switch ( _java_lexer_actions[_acts++] ) {
-	case 2:
+	case 3:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 378 "ext/java/org/liboga/xml/Lexer.java"
+// line 384 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -439,76 +445,136 @@ case 3:
 			switch ( _java_lexer_actions[_acts++] )
 			{
 	case 0:
-// line 304 "ext/ragel/base_lexer.rl"
+// line 40 "ext/ragel/base_lexer.rl"
+	{
+        if ( data[p] == '\n' ) lines++;
+    }
+	break;
+	case 1:
+// line 353 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
-	case 3:
+	case 4:
 // line 1 "NONE"
 	{te = p+1;}
 	break;
-	case 4:
-// line 100 "ext/ragel/base_lexer.rl"
+	case 5:
+// line 105 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_text", data, encoding, mark, ts);
             callback_simple("on_proc_ins_end");
 
-            ( this.cs) = 35;
+            mark = 0;
+
+            ( this.cs) = 29;
         }}
 	break;
-	case 5:
-// line 107 "ext/ragel/base_lexer.rl"
-	{te = p+1;}
-	break;
 	case 6:
-// line 107 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
+// line 114 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
 	break;
 	case 7:
-// line 148 "ext/ragel/base_lexer.rl"
-	{( this.act) = 3;}
+// line 114 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
 	break;
 	case 8:
-// line 165 "ext/ragel/base_lexer.rl"
-	{( this.act) = 7;}
+// line 152 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple("on_string_squote");
+
+            {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
+        }}
 	break;
 	case 9:
-// line 154 "ext/ragel/base_lexer.rl"
+// line 126 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        callback("on_string_body", data, encoding, ts, te);
+
+        if ( lines > 0 )
+        {
+            advance_line(lines);
+
+            lines = 0;
+        }
+    }}
+	break;
+	case 10:
+// line 162 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple("on_string_dquote");
+
+            {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
+        }}
+	break;
+	case 11:
+// line 126 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        callback("on_string_body", data, encoding, ts, te);
+
+        if ( lines > 0 )
+        {
+            advance_line(lines);
+
+            lines = 0;
+        }
+    }}
+	break;
+	case 12:
+// line 189 "ext/ragel/base_lexer.rl"
+	{( this.act) = 7;}
+	break;
+	case 13:
+// line 207 "ext/ragel/base_lexer.rl"
+	{( this.act) = 12;}
+	break;
+	case 14:
+// line 195 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_doctype_inline", data, encoding, ts + 1, te - 1);
         }}
 	break;
-	case 10:
-// line 124 "ext/ragel/base_lexer.rl"
+	case 15:
+// line 137 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback("on_string", data, encoding, ts + 1, te - 1);
+        callback_simple("on_string_squote");
+
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 11:
-// line 163 "ext/ragel/base_lexer.rl"
+	case 16:
+// line 143 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple("on_string_dquote");
+
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 39; _goto_targ = 2; if (true) continue _goto;}
+    }}
+	break;
+	case 17:
+// line 205 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 12:
-// line 169 "ext/ragel/base_lexer.rl"
+	case 18:
+// line 211 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_doctype_end");
-            ( this.cs) = 35;
+            ( this.cs) = 29;
         }}
 	break;
-	case 13:
-// line 165 "ext/ragel/base_lexer.rl"
+	case 19:
+// line 207 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_doctype_name", data, encoding, ts, te);
         }}
 	break;
-	case 14:
+	case 20:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
-	case 3:
+	case 7:
 	{{p = ((te))-1;}
             callback("on_doctype_type", data, encoding, ts, te);
         }
 	break;
-	case 7:
+	case 12:
 	{{p = ((te))-1;}
             callback("on_doctype_name", data, encoding, ts, te);
         }
@@ -516,214 +582,252 @@ case 3:
 	}
 	}
 	break;
-	case 15:
-// line 189 "ext/ragel/base_lexer.rl"
+	case 21:
+// line 231 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_xml_decl_end");
-            ( this.cs) = 35;
+            ( this.cs) = 29;
         }}
 	break;
-	case 16:
-// line 124 "ext/ragel/base_lexer.rl"
+	case 22:
+// line 137 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback("on_string", data, encoding, ts + 1, te - 1);
+        callback_simple("on_string_squote");
+
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 17:
-// line 201 "ext/ragel/base_lexer.rl"
+	case 23:
+// line 143 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple("on_string_dquote");
+
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 39; _goto_targ = 2; if (true) continue _goto;}
+    }}
+	break;
+	case 24:
+// line 244 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 18:
-// line 195 "ext/ragel/base_lexer.rl"
+	case 25:
+// line 237 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_attribute", data, encoding, ts, te);
         }}
 	break;
-	case 19:
-// line 201 "ext/ragel/base_lexer.rl"
+	case 26:
+// line 244 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 20:
-// line 201 "ext/ragel/base_lexer.rl"
-	{{p = ((te))-1;}}
-	break;
-	case 21:
-// line 228 "ext/ragel/base_lexer.rl"
+	case 27:
+// line 271 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_element_ns", data, encoding, ts, te - 1);
         }}
 	break;
-	case 22:
-// line 232 "ext/ragel/base_lexer.rl"
+	case 28:
+// line 275 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_element_name", data, encoding, ts, te);
-            ( this.cs) = 62;
+            ( this.cs) = 58;
         }}
 	break;
-	case 23:
-// line 241 "ext/ragel/base_lexer.rl"
+	case 29:
+// line 284 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 24:
-// line 243 "ext/ragel/base_lexer.rl"
+	case 30:
+// line 286 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("advance_line");
         }}
 	break;
-	case 25:
-// line 248 "ext/ragel/base_lexer.rl"
+	case 31:
+// line 291 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_attribute_ns", data, encoding, ts, te - 1);
         }}
 	break;
-	case 26:
-// line 124 "ext/ragel/base_lexer.rl"
+	case 32:
+// line 137 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback("on_string", data, encoding, ts + 1, te - 1);
+        callback_simple("on_string_squote");
+
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 27:
-// line 260 "ext/ragel/base_lexer.rl"
+	case 33:
+// line 143 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple("on_string_dquote");
+
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 39; _goto_targ = 2; if (true) continue _goto;}
+    }}
+	break;
+	case 34:
+// line 304 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_element_open_end");
-            ( this.cs) = 35;
+            ( this.cs) = 29;
         }}
 	break;
-	case 28:
-// line 266 "ext/ragel/base_lexer.rl"
+	case 35:
+// line 310 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_element_end");
-            ( this.cs) = 35;
+            ( this.cs) = 29;
         }}
 	break;
-	case 29:
-// line 252 "ext/ragel/base_lexer.rl"
+	case 36:
+// line 295 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_attribute", data, encoding, ts, te);
         }}
 	break;
-	case 30:
-// line 297 "ext/ragel/base_lexer.rl"
+	case 37:
+// line 339 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_text", data, encoding, ts, te);
 
-            ( this.cs) = 35;
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            ( this.cs) = 29;
         }}
 	break;
-	case 31:
-// line 304 "ext/ragel/base_lexer.rl"
+	case 38:
+// line 353 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_text", data, encoding, ts, mark);
 
             p    = mark - 1;
             mark = 0;
 
-            ( this.cs) = 35;
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            ( this.cs) = 29;
         }}
 	break;
-	case 32:
-// line 314 "ext/ragel/base_lexer.rl"
+	case 39:
+// line 339 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_text", data, encoding, ts, te);
-            ( this.cs) = 35;
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            ( this.cs) = 29;
         }}
 	break;
-	case 33:
-// line 182 "ext/ragel/base_lexer.rl"
-	{( this.act) = 26;}
+	case 40:
+// line 224 "ext/ragel/base_lexer.rl"
+	{( this.act) = 32;}
 	break;
-	case 34:
-// line 90 "ext/ragel/base_lexer.rl"
-	{( this.act) = 29;}
+	case 41:
+// line 95 "ext/ragel/base_lexer.rl"
+	{( this.act) = 35;}
 	break;
-	case 35:
-// line 56 "ext/ragel/base_lexer.rl"
+	case 42:
+// line 61 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_comment", data, encoding, ts + 4, te - 3);
     }}
 	break;
-	case 36:
-// line 72 "ext/ragel/base_lexer.rl"
+	case 43:
+// line 77 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_cdata", data, encoding, ts + 9, te - 3);
     }}
 	break;
-	case 37:
-// line 216 "ext/ragel/base_lexer.rl"
+	case 44:
+// line 259 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple("on_element_start");
         p--;
-        ( this.cs) = 60;
+        ( this.cs) = 56;
     }}
 	break;
-	case 38:
-// line 222 "ext/ragel/base_lexer.rl"
+	case 45:
+// line 265 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple("on_element_end");
     }}
 	break;
-	case 39:
-// line 280 "ext/ragel/base_lexer.rl"
+	case 46:
+// line 324 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( this.cs) = 64;
+        ( this.cs) = 60;
     }}
 	break;
-	case 40:
-// line 140 "ext/ragel/base_lexer.rl"
+	case 47:
+// line 181 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple("on_doctype_start");
-        ( this.cs) = 43;
+        ( this.cs) = 41;
     }}
 	break;
-	case 41:
-// line 90 "ext/ragel/base_lexer.rl"
+	case 48:
+// line 95 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple("on_proc_ins_start");
         callback("on_proc_ins_name", data, encoding, ts + 2, te);
 
         mark = te;
 
-        ( this.cs) = 41;
+        ( this.cs) = 35;
     }}
 	break;
-	case 42:
-// line 280 "ext/ragel/base_lexer.rl"
+	case 49:
+// line 324 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( this.cs) = 64;
+        ( this.cs) = 60;
     }}
 	break;
-	case 43:
-// line 280 "ext/ragel/base_lexer.rl"
+	case 50:
+// line 324 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( this.cs) = 64;
+        ( this.cs) = 60;
     }}
 	break;
-	case 44:
+	case 51:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
-	case 26:
+	case 32:
 	{{p = ((te))-1;}
         callback_simple("on_xml_decl_start");
-        ( this.cs) = 55;
+        ( this.cs) = 53;
     }
 	break;
-	case 29:
+	case 35:
 	{{p = ((te))-1;}
         callback_simple("on_proc_ins_start");
         callback("on_proc_ins_name", data, encoding, ts + 2, te);
 
         mark = te;
 
-        ( this.cs) = 41;
+        ( this.cs) = 35;
     }
 	break;
 	}
 	}
 	break;
-// line 727 "ext/java/org/liboga/xml/Lexer.java"
+// line 831 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -733,11 +837,11 @@ case 2:
 	_nacts = (int) _java_lexer_actions[_acts++];
 	while ( _nacts-- > 0 ) {
 		switch ( _java_lexer_actions[_acts++] ) {
-	case 1:
+	case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 741 "ext/java/org/liboga/xml/Lexer.java"
+// line 845 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -764,7 +868,9 @@ case 5:
 	break; }
 	}
 
-// line 101 "ext/java/org/liboga/xml/Lexer.rl"
+// line 105 "ext/java/org/liboga/xml/Lexer.rl"
+
+        this.lines = lines;
 
         return context.nil;
     }
@@ -775,8 +881,10 @@ case 5:
     @JRubyMethod
     public IRubyObject reset_native(ThreadContext context)
     {
-        this.act = 0;
-        this.cs  = java_lexer_start;
+        this.act   = 0;
+        this.top   = 0;
+        this.stack = new int[4];
+        this.cs    = java_lexer_start;
 
         return context.nil;
     }
@@ -808,8 +916,19 @@ case 5:
 
         this.callMethod(context, name);
     }
+
+    /**
+     * Advances the line number by `amount` lines.
+     */
+    public void advance_line(int amount)
+    {
+        ThreadContext context = this.runtime.getCurrentContext();
+        RubyFixnum lines      = this.runtime.newFixnum(amount);
+
+        this.callMethod(context, "advance_line", lines);
+    }
 }
 
 
-// line 151 "ext/java/org/liboga/xml/Lexer.rl"
+// line 172 "ext/java/org/liboga/xml/Lexer.rl"