oga 0.2.3 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +1 -0
  3. data/README.md +38 -8
  4. data/ext/c/extconf.rb +3 -5
  5. data/ext/c/lexer.c +545 -537
  6. data/ext/c/lexer.rl +6 -5
  7. data/ext/java/org/liboga/xml/Lexer.java +159 -153
  8. data/ext/ragel/base_lexer.rl +1 -1
  9. data/lib/oga.rb +4 -2
  10. data/lib/oga/css/lexer.rb +2 -3
  11. data/lib/oga/css/parser.rb +619 -473
  12. data/lib/oga/html/entities.rb +2150 -0
  13. data/lib/oga/lru.rb +158 -0
  14. data/lib/oga/version.rb +1 -1
  15. data/lib/oga/xml/attribute.rb +1 -1
  16. data/lib/oga/xml/default_namespace.rb +13 -0
  17. data/lib/oga/xml/element.rb +25 -1
  18. data/lib/oga/xml/entities.rb +40 -15
  19. data/lib/oga/xml/lexer.rb +2 -2
  20. data/lib/oga/xml/namespace.rb +8 -0
  21. data/lib/oga/xml/node.rb +16 -0
  22. data/lib/oga/xml/node_set.rb +2 -2
  23. data/lib/oga/xml/parser.rb +367 -408
  24. data/lib/oga/xml/pull_parser.rb +1 -3
  25. data/lib/oga/xml/querying.rb +1 -1
  26. data/lib/oga/xml/sax_parser.rb +50 -1
  27. data/lib/oga/xml/text.rb +33 -4
  28. data/lib/oga/xpath/evaluator.rb +6 -1
  29. data/lib/oga/xpath/lexer.rb +2 -3
  30. data/lib/oga/xpath/parser.rb +528 -470
  31. data/oga.gemspec +1 -1
  32. metadata +13 -17
  33. data/doc/changelog.md +0 -324
data/ext/c/lexer.rl CHANGED
@@ -38,7 +38,7 @@ ID id_literal_html_element_p;
38
38
  */
39
39
  void liboga_xml_lexer_callback(
40
40
  VALUE self,
41
- VALUE name,
41
+ ID name,
42
42
  rb_encoding *encoding,
43
43
  const char *ts,
44
44
  const char *te
@@ -73,14 +73,13 @@ void liboga_xml_lexer_callback_simple(VALUE self, VALUE name)
73
73
  VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
74
74
  {
75
75
  OgaLexerState *state;
76
+ int lines;
76
77
 
77
78
  /* Make sure that all data passed back to Ruby has the proper encoding. */
78
79
  rb_encoding *encoding = rb_enc_get(data_block);
79
80
 
80
81
  char *data_str_val = StringValueCStr(data_block);
81
82
 
82
- Data_Get_Struct(self, OgaLexerState, state);
83
-
84
83
  const char *p = data_str_val;
85
84
  const char *pe = data_str_val + strlen(data_str_val);
86
85
  const char *eof = pe;
@@ -88,8 +87,6 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
88
87
  const char *te = 0;
89
88
  const char *mark = 0;
90
89
 
91
- int lines = state->lines;
92
-
93
90
  ID id_advance_line = rb_intern("advance_line");
94
91
  ID id_on_attribute = rb_intern("on_attribute");
95
92
  ID id_on_attribute_ns = rb_intern("on_attribute_ns");
@@ -115,6 +112,10 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
115
112
  ID id_on_xml_decl_end = rb_intern("on_xml_decl_end");
116
113
  ID id_on_xml_decl_start = rb_intern("on_xml_decl_start");
117
114
 
115
+ Data_Get_Struct(self, OgaLexerState, state);
116
+
117
+ lines = state->lines;
118
+
118
119
  %% write exec;
119
120
 
120
121
  state->lines = lines;
data/ext/java/org/liboga/xml/Lexer.java CHANGED
@@ -49,11 +49,11 @@ private static byte[] init__java_lexer_actions_0()
49
49
  22, 1, 23, 1, 24, 1, 25, 1, 26, 1, 27, 1,
50
50
  28, 1, 29, 1, 30, 1, 31, 1, 32, 1, 33, 1,
51
51
  34, 1, 35, 1, 36, 1, 37, 1, 38, 1, 39, 1,
52
- 40, 1, 41, 1, 42, 1, 43, 1, 45, 1, 46, 1,
53
- 47, 1, 50, 1, 51, 1, 52, 1, 53, 1, 54, 1,
54
- 55, 1, 56, 1, 57, 1, 58, 1, 59, 2, 0, 1,
55
- 2, 0, 2, 2, 3, 4, 2, 6, 16, 2, 6, 17,
56
- 2, 6, 48, 2, 6, 49, 3, 6, 0, 44
52
+ 40, 1, 41, 1, 42, 1, 43, 1, 44, 1, 46, 1,
53
+ 47, 1, 48, 1, 51, 1, 52, 1, 53, 1, 54, 1,
54
+ 55, 1, 56, 1, 57, 1, 58, 1, 59, 1, 60, 2,
55
+ 0, 1, 2, 0, 2, 2, 3, 4, 2, 6, 16, 2,
56
+ 6, 17, 2, 6, 49, 2, 6, 50, 3, 6, 0, 45
57
57
  };
58
58
  }
59
59
 
@@ -65,9 +65,9 @@ private static short[] init__java_lexer_key_offsets_0()
65
65
  return new short [] {
66
66
  0, 0, 4, 5, 6, 7, 9, 11, 13, 15, 17, 19,
67
67
  21, 23, 24, 25, 26, 27, 28, 29, 30, 31, 33, 41,
68
- 51, 60, 61, 62, 63, 74, 76, 84, 93, 102, 103, 104,
69
- 105, 106, 107, 108, 109, 110, 126, 134, 143, 152, 161, 170,
70
- 179, 188, 197, 206, 215, 224, 235, 243, 244, 252, 261, 278,
68
+ 51, 60, 61, 62, 73, 75, 83, 92, 101, 102, 103, 104,
69
+ 105, 106, 107, 108, 109, 125, 133, 142, 151, 160, 169, 178,
70
+ 187, 196, 205, 214, 223, 234, 242, 243, 251, 260, 277, 278,
71
71
  287, 288, 289, 300, 311, 312, 313, 315, 317, 320, 322, 324,
72
72
  326, 328, 330, 332, 334
73
73
  };
@@ -84,25 +84,25 @@ private static char[] init__java_lexer_trans_keys_0()
84
84
  68, 65, 84, 65, 91, 93, 93, 62, 93, 45, 95, 48,
85
85
  57, 65, 90, 97, 122, 45, 58, 62, 95, 48, 57, 65,
86
86
  90, 97, 122, 45, 95, 120, 48, 57, 65, 90, 97, 122,
87
- 10, 62, 60, 33, 45, 47, 63, 95, 48, 57, 65, 90,
88
- 97, 122, 9, 32, 45, 95, 48, 57, 65, 90, 97, 122,
89
- 45, 95, 109, 48, 57, 65, 90, 97, 122, 45, 95, 108,
90
- 48, 57, 65, 90, 97, 122, 63, 62, 39, 39, 34, 34,
91
- 93, 93, 9, 32, 34, 39, 45, 62, 80, 83, 91, 95,
87
+ 62, 60, 33, 45, 47, 63, 95, 48, 57, 65, 90, 97,
88
+ 122, 9, 32, 45, 95, 48, 57, 65, 90, 97, 122, 45,
89
+ 95, 109, 48, 57, 65, 90, 97, 122, 45, 95, 108, 48,
90
+ 57, 65, 90, 97, 122, 63, 62, 39, 39, 34, 34, 93,
91
+ 93, 9, 32, 34, 39, 45, 62, 80, 83, 91, 95, 48,
92
+ 57, 65, 90, 97, 122, 45, 95, 48, 57, 65, 90, 97,
93
+ 122, 45, 85, 95, 48, 57, 65, 90, 97, 122, 45, 66,
94
+ 95, 48, 57, 65, 90, 97, 122, 45, 76, 95, 48, 57,
95
+ 65, 90, 97, 122, 45, 73, 95, 48, 57, 65, 90, 97,
96
+ 122, 45, 67, 95, 48, 57, 65, 90, 97, 122, 45, 89,
97
+ 95, 48, 57, 65, 90, 97, 122, 45, 83, 95, 48, 57,
98
+ 65, 90, 97, 122, 45, 84, 95, 48, 57, 65, 90, 97,
99
+ 122, 45, 69, 95, 48, 57, 65, 90, 97, 122, 45, 77,
100
+ 95, 48, 57, 65, 90, 97, 122, 34, 39, 45, 63, 95,
92
101
  48, 57, 65, 90, 97, 122, 45, 95, 48, 57, 65, 90,
93
- 97, 122, 45, 85, 95, 48, 57, 65, 90, 97, 122, 45,
94
- 66, 95, 48, 57, 65, 90, 97, 122, 45, 76, 95, 48,
95
- 57, 65, 90, 97, 122, 45, 73, 95, 48, 57, 65, 90,
96
- 97, 122, 45, 67, 95, 48, 57, 65, 90, 97, 122, 45,
97
- 89, 95, 48, 57, 65, 90, 97, 122, 45, 83, 95, 48,
98
- 57, 65, 90, 97, 122, 45, 84, 95, 48, 57, 65, 90,
99
- 97, 122, 45, 69, 95, 48, 57, 65, 90, 97, 122, 45,
100
- 77, 95, 48, 57, 65, 90, 97, 122, 34, 39, 45, 63,
101
- 95, 48, 57, 65, 90, 97, 122, 45, 95, 48, 57, 65,
102
- 90, 97, 122, 62, 45, 95, 48, 57, 65, 90, 97, 122,
103
- 45, 58, 95, 48, 57, 65, 90, 97, 122, 9, 10, 13,
104
- 32, 34, 39, 45, 47, 61, 62, 95, 48, 57, 65, 90,
105
- 97, 122, 45, 58, 95, 48, 57, 65, 90, 97, 122, 60,
102
+ 97, 122, 62, 45, 95, 48, 57, 65, 90, 97, 122, 45,
103
+ 58, 95, 48, 57, 65, 90, 97, 122, 9, 10, 13, 32,
104
+ 34, 39, 45, 47, 61, 62, 95, 48, 57, 65, 90, 97,
105
+ 122, 10, 45, 58, 95, 48, 57, 65, 90, 97, 122, 60,
106
106
  60, 33, 45, 60, 63, 95, 47, 57, 65, 90, 97, 122,
107
107
  33, 45, 60, 63, 95, 47, 57, 65, 90, 97, 122, 60,
108
108
  60, 47, 60, 60, 115, 60, 99, 116, 60, 114, 60, 105,
@@ -119,9 +119,9 @@ private static byte[] init__java_lexer_single_lengths_0()
119
119
  return new byte [] {
120
120
  0, 4, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2,
121
121
  2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 4,
122
- 3, 1, 1, 1, 5, 2, 2, 3, 3, 1, 1, 1,
123
- 1, 1, 1, 1, 1, 10, 2, 3, 3, 3, 3, 3,
124
- 3, 3, 3, 3, 3, 5, 2, 1, 2, 3, 11, 3,
122
+ 3, 1, 1, 5, 2, 2, 3, 3, 1, 1, 1, 1,
123
+ 1, 1, 1, 1, 10, 2, 3, 3, 3, 3, 3, 3,
124
+ 3, 3, 3, 3, 5, 2, 1, 2, 3, 11, 1, 3,
125
125
  1, 1, 5, 5, 1, 1, 2, 2, 3, 2, 2, 2,
126
126
  2, 2, 2, 2, 2
127
127
  };
@@ -135,9 +135,9 @@ private static byte[] init__java_lexer_range_lengths_0()
135
135
  return new byte [] {
136
136
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
137
137
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3,
138
- 3, 0, 0, 0, 3, 0, 3, 3, 3, 0, 0, 0,
139
- 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3,
140
- 3, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3,
138
+ 3, 0, 0, 3, 0, 3, 3, 3, 0, 0, 0, 0,
139
+ 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3,
140
+ 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 0, 3,
141
141
  0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0,
142
142
  0, 0, 0, 0, 0
143
143
  };
@@ -151,9 +151,9 @@ private static short[] init__java_lexer_index_offsets_0()
151
151
  return new short [] {
152
152
  0, 0, 5, 7, 9, 11, 14, 17, 20, 23, 26, 29,
153
153
  32, 35, 37, 39, 41, 43, 45, 47, 49, 51, 54, 60,
154
- 68, 75, 77, 79, 81, 90, 93, 99, 106, 113, 115, 117,
155
- 119, 121, 123, 125, 127, 129, 143, 149, 156, 163, 170, 177,
156
- 184, 191, 198, 205, 212, 219, 228, 234, 236, 242, 249, 264,
154
+ 68, 75, 77, 79, 88, 91, 97, 104, 111, 113, 115, 117,
155
+ 119, 121, 123, 125, 127, 141, 147, 154, 161, 168, 175, 182,
156
+ 189, 196, 203, 210, 217, 226, 232, 234, 240, 247, 262, 264,
157
157
  271, 273, 275, 284, 293, 295, 297, 300, 303, 307, 310, 313,
158
158
  316, 319, 322, 325, 328
159
159
  };
@@ -171,28 +171,28 @@ private static byte[] init__java_lexer_indicies_0()
171
171
  0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21,
172
172
  20, 22, 20, 23, 22, 20, 24, 24, 24, 24, 24, 0,
173
173
  24, 25, 26, 24, 24, 24, 24, 0, 27, 27, 28, 27,
174
- 27, 27, 0, 29, 30, 31, 30, 33, 32, 35, 36, 25,
175
- 37, 36, 36, 36, 36, 34, 14, 14, 38, 27, 27, 27,
176
- 27, 27, 39, 27, 27, 41, 27, 27, 27, 40, 27, 27,
177
- 42, 27, 27, 27, 40, 44, 43, 46, 45, 48, 47, 49,
178
- 47, 51, 50, 52, 50, 54, 53, 55, 53, 56, 56, 57,
179
- 58, 59, 60, 61, 62, 63, 59, 59, 59, 59, 30, 59,
180
- 59, 59, 59, 59, 64, 59, 66, 59, 59, 59, 59, 65,
181
- 59, 67, 59, 59, 59, 59, 65, 59, 68, 59, 59, 59,
182
- 59, 65, 59, 69, 59, 59, 59, 59, 65, 59, 70, 59,
183
- 59, 59, 59, 65, 59, 71, 59, 59, 59, 59, 65, 59,
184
- 72, 59, 59, 59, 59, 65, 59, 73, 59, 59, 59, 59,
185
- 65, 59, 74, 59, 59, 59, 59, 65, 59, 70, 59, 59,
186
- 59, 59, 65, 76, 77, 78, 79, 78, 78, 78, 78, 75,
187
- 78, 78, 78, 78, 78, 80, 82, 81, 83, 83, 83, 83,
188
- 83, 30, 83, 85, 83, 83, 83, 83, 84, 86, 29, 87,
189
- 86, 88, 89, 90, 91, 86, 92, 90, 90, 90, 90, 30,
190
- 90, 94, 90, 90, 90, 90, 93, 96, 95, 98, 95, 99,
191
- 99, 98, 99, 99, 99, 99, 99, 95, 100, 100, 98, 100,
192
- 100, 100, 100, 100, 95, 102, 101, 102, 101, 105, 102, 101,
193
- 102, 106, 101, 102, 107, 108, 101, 102, 109, 101, 102, 110,
194
- 101, 102, 111, 101, 102, 112, 101, 102, 113, 101, 102, 114,
195
- 101, 102, 115, 101, 102, 112, 101, 0
174
+ 27, 27, 0, 29, 30, 32, 31, 34, 35, 25, 36, 35,
175
+ 35, 35, 35, 33, 14, 14, 37, 27, 27, 27, 27, 27,
176
+ 38, 27, 27, 40, 27, 27, 27, 39, 27, 27, 41, 27,
177
+ 27, 27, 39, 43, 42, 45, 44, 47, 46, 48, 46, 50,
178
+ 49, 51, 49, 53, 52, 54, 52, 55, 55, 56, 57, 58,
179
+ 59, 60, 61, 62, 58, 58, 58, 58, 30, 58, 58, 58,
180
+ 58, 58, 63, 58, 65, 58, 58, 58, 58, 64, 58, 66,
181
+ 58, 58, 58, 58, 64, 58, 67, 58, 58, 58, 58, 64,
182
+ 58, 68, 58, 58, 58, 58, 64, 58, 69, 58, 58, 58,
183
+ 58, 64, 58, 70, 58, 58, 58, 58, 64, 58, 71, 58,
184
+ 58, 58, 58, 64, 58, 72, 58, 58, 58, 58, 64, 58,
185
+ 73, 58, 58, 58, 58, 64, 58, 69, 58, 58, 58, 58,
186
+ 64, 75, 76, 77, 78, 77, 77, 77, 77, 74, 77, 77,
187
+ 77, 77, 77, 79, 81, 80, 82, 82, 82, 82, 82, 30,
188
+ 82, 84, 82, 82, 82, 82, 83, 85, 86, 87, 85, 88,
189
+ 89, 90, 91, 85, 92, 90, 90, 90, 90, 30, 86, 93,
190
+ 90, 95, 90, 90, 90, 90, 94, 97, 96, 99, 96, 100,
191
+ 100, 99, 100, 100, 100, 100, 100, 96, 101, 101, 99, 101,
192
+ 101, 101, 101, 101, 96, 103, 102, 103, 102, 106, 103, 102,
193
+ 103, 107, 102, 103, 108, 109, 102, 103, 110, 102, 103, 111,
194
+ 102, 103, 112, 102, 103, 113, 102, 103, 114, 102, 103, 115,
195
+ 102, 103, 116, 102, 103, 113, 102, 0
196
196
  };
197
197
  }
198
198
 
@@ -202,71 +202,71 @@ private static final byte _java_lexer_indicies[] = init__java_lexer_indicies_0()
202
202
  private static byte[] init__java_lexer_trans_targs_0()
203
203
  {
204
204
  return new byte [] {
205
- 27, 2, 6, 13, 3, 4, 5, 27, 7, 8, 9, 10,
206
- 11, 12, 29, 14, 15, 16, 17, 18, 19, 20, 21, 27,
207
- 23, 22, 27, 30, 31, 58, 0, 58, 27, 28, 27, 1,
208
- 27, 24, 27, 27, 27, 32, 30, 33, 34, 33, 33, 36,
209
- 35, 35, 38, 37, 37, 40, 39, 39, 41, 41, 41, 42,
210
- 41, 43, 48, 41, 41, 41, 44, 45, 46, 47, 42, 49,
211
- 50, 51, 52, 53, 53, 53, 54, 55, 53, 53, 53, 57,
212
- 56, 56, 58, 25, 58, 58, 59, 26, 58, 58, 58, 61,
213
- 63, 60, 62, 60, 60, 65, 66, 64, 64, 67, 68, 69,
214
- 74, 70, 71, 72, 73, 64, 75, 76
205
+ 26, 2, 6, 13, 3, 4, 5, 26, 7, 8, 9, 10,
206
+ 11, 12, 28, 14, 15, 16, 17, 18, 19, 20, 21, 26,
207
+ 23, 22, 26, 29, 30, 57, 0, 26, 27, 26, 1, 26,
208
+ 24, 26, 26, 26, 31, 29, 32, 33, 32, 32, 35, 34,
209
+ 34, 37, 36, 36, 39, 38, 38, 40, 40, 40, 41, 40,
210
+ 42, 47, 40, 40, 40, 43, 44, 45, 46, 41, 48, 49,
211
+ 50, 51, 52, 52, 52, 53, 54, 52, 52, 52, 56, 55,
212
+ 55, 57, 57, 58, 57, 57, 59, 25, 57, 57, 57, 57,
213
+ 61, 63, 60, 62, 60, 60, 65, 66, 64, 64, 67, 68,
214
+ 69, 74, 70, 71, 72, 73, 64, 75, 76
215
215
  };
216
216
  }
217
217
 
218
218
  private static final byte _java_lexer_trans_targs[] = init__java_lexer_trans_targs_0();
219
219
 
220
220
 
221
- private static byte[] init__java_lexer_trans_actions_0()
221
+ private static short[] init__java_lexer_trans_actions_0()
222
222
  {
223
- return new byte [] {
224
- 101, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 0,
225
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87,
226
- 0, 0, 91, 123, 0, 59, 0, 69, 93, 7, 99, 0,
227
- 89, 0, 95, 103, 97, 0, 120, 11, 0, 13, 9, 1,
228
- 15, 17, 1, 19, 21, 1, 23, 25, 33, 31, 29, 117,
229
- 35, 0, 0, 27, 39, 37, 0, 0, 0, 0, 114, 0,
230
- 0, 0, 0, 47, 45, 43, 0, 0, 49, 51, 41, 0,
231
- 55, 53, 57, 0, 65, 63, 0, 0, 67, 71, 61, 1,
232
- 105, 77, 105, 75, 73, 126, 108, 83, 81, 1, 1, 1,
233
- 1, 1, 1, 1, 1, 79, 1, 1
223
+ return new short [] {
224
+ 103, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0,
225
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89,
226
+ 0, 0, 93, 125, 0, 69, 0, 95, 7, 101, 0, 91,
227
+ 0, 97, 105, 99, 0, 122, 11, 0, 13, 9, 1, 15,
228
+ 17, 1, 19, 21, 1, 23, 25, 33, 31, 29, 119, 35,
229
+ 0, 0, 27, 39, 37, 0, 0, 0, 0, 116, 0, 0,
230
+ 0, 0, 47, 45, 43, 0, 0, 49, 51, 41, 0, 55,
231
+ 53, 57, 59, 0, 65, 63, 0, 0, 67, 71, 73, 61,
232
+ 1, 107, 79, 107, 77, 75, 128, 110, 85, 83, 1, 1,
233
+ 1, 1, 1, 1, 1, 1, 81, 1, 1
234
234
  };
235
235
  }
236
236
 
237
- private static final byte _java_lexer_trans_actions[] = init__java_lexer_trans_actions_0();
237
+ private static final short _java_lexer_trans_actions[] = init__java_lexer_trans_actions_0();
238
238
 
239
239
 
240
- private static byte[] init__java_lexer_to_state_actions_0()
240
+ private static short[] init__java_lexer_to_state_actions_0()
241
241
  {
242
- return new byte [] {
242
+ return new short [] {
243
243
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
244
244
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
245
- 0, 0, 0, 3, 0, 0, 0, 0, 0, 3, 0, 3,
246
- 0, 3, 0, 3, 0, 3, 0, 0, 0, 0, 0, 0,
247
- 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0,
248
- 3, 0, 0, 0, 111, 0, 0, 0, 0, 0, 0, 0,
245
+ 0, 0, 3, 0, 0, 0, 0, 0, 3, 0, 3, 0,
246
+ 3, 0, 3, 0, 3, 0, 0, 0, 0, 0, 0, 0,
247
+ 0, 0, 0, 0, 3, 0, 0, 3, 0, 3, 0, 0,
248
+ 3, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0,
249
249
  0, 0, 0, 0, 0
250
250
  };
251
251
  }
252
252
 
253
- private static final byte _java_lexer_to_state_actions[] = init__java_lexer_to_state_actions_0();
253
+ private static final short _java_lexer_to_state_actions[] = init__java_lexer_to_state_actions_0();
254
254
 
255
255
 
256
- private static byte[] init__java_lexer_from_state_actions_0()
256
+ private static short[] init__java_lexer_from_state_actions_0()
257
257
  {
258
- return new byte [] {
258
+ return new short [] {
259
259
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
260
260
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
261
- 0, 0, 0, 5, 0, 0, 0, 0, 0, 5, 0, 5,
262
- 0, 5, 0, 5, 0, 5, 0, 0, 0, 0, 0, 0,
263
- 0, 0, 0, 0, 0, 5, 0, 0, 5, 0, 5, 0,
261
+ 0, 0, 5, 0, 0, 0, 0, 0, 5, 0, 5, 0,
262
+ 5, 0, 5, 0, 5, 0, 0, 0, 0, 0, 0, 0,
263
+ 0, 0, 0, 0, 5, 0, 0, 5, 0, 5, 0, 0,
264
264
  5, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,
265
265
  0, 0, 0, 0, 0
266
266
  };
267
267
  }
268
268
 
269
- private static final byte _java_lexer_from_state_actions[] = init__java_lexer_from_state_actions_0();
269
+ private static final short _java_lexer_from_state_actions[] = init__java_lexer_from_state_actions_0();
270
270
 
271
271
 
272
272
  private static short[] init__java_lexer_eof_trans_0()
@@ -274,32 +274,32 @@ private static short[] init__java_lexer_eof_trans_0()
274
274
  return new short [] {
275
275
  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
276
276
  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
277
- 1, 0, 0, 0, 35, 39, 40, 41, 41, 0, 46, 0,
278
- 50, 0, 53, 0, 56, 0, 65, 66, 66, 66, 66, 66,
279
- 66, 66, 66, 66, 66, 0, 81, 82, 0, 85, 0, 94,
280
- 0, 98, 98, 98, 0, 104, 105, 105, 105, 105, 105, 105,
281
- 105, 105, 105, 105, 105
277
+ 1, 0, 0, 34, 38, 39, 40, 40, 0, 45, 0, 49,
278
+ 0, 52, 0, 55, 0, 64, 65, 65, 65, 65, 65, 65,
279
+ 65, 65, 65, 65, 0, 80, 81, 0, 84, 0, 94, 95,
280
+ 0, 99, 99, 99, 0, 105, 106, 106, 106, 106, 106, 106,
281
+ 106, 106, 106, 106, 106
282
282
  };
283
283
  }
284
284
 
285
285
  private static final short _java_lexer_eof_trans[] = init__java_lexer_eof_trans_0();
286
286
 
287
287
 
288
- static final int java_lexer_start = 27;
289
- static final int java_lexer_first_final = 27;
288
+ static final int java_lexer_start = 26;
289
+ static final int java_lexer_first_final = 26;
290
290
  static final int java_lexer_error = 0;
291
291
 
292
- static final int java_lexer_en_proc_ins_body = 33;
293
- static final int java_lexer_en_string_squote = 35;
294
- static final int java_lexer_en_string_dquote = 37;
295
- static final int java_lexer_en_doctype_inline = 39;
296
- static final int java_lexer_en_doctype = 41;
297
- static final int java_lexer_en_xml_decl = 53;
298
- static final int java_lexer_en_element_name = 56;
299
- static final int java_lexer_en_element_head = 58;
292
+ static final int java_lexer_en_proc_ins_body = 32;
293
+ static final int java_lexer_en_string_squote = 34;
294
+ static final int java_lexer_en_string_dquote = 36;
295
+ static final int java_lexer_en_doctype_inline = 38;
296
+ static final int java_lexer_en_doctype = 40;
297
+ static final int java_lexer_en_xml_decl = 52;
298
+ static final int java_lexer_en_element_name = 55;
299
+ static final int java_lexer_en_element_head = 57;
300
300
  static final int java_lexer_en_text = 60;
301
301
  static final int java_lexer_en_literal_html_element = 64;
302
- static final int java_lexer_en_main = 27;
302
+ static final int java_lexer_en_main = 26;
303
303
 
304
304
 
305
305
  // line 39 "ext/java/org/liboga/xml/Lexer.rl"
@@ -513,7 +513,7 @@ case 3:
513
513
 
514
514
  mark = 0;
515
515
 
516
- ( this.cs) = 27;
516
+ ( this.cs) = 26;
517
517
  }}
518
518
  break;
519
519
  case 8:
@@ -568,7 +568,7 @@ case 3:
568
568
  break;
569
569
  case 14:
570
570
  // line 210 "ext/ragel/base_lexer.rl"
571
- {te = p+1;{ ( this.cs) = 41; }}
571
+ {te = p+1;{ ( this.cs) = 40; }}
572
572
  break;
573
573
  case 15:
574
574
  // line 199 "ext/ragel/base_lexer.rl"
@@ -593,14 +593,14 @@ case 3:
593
593
  break;
594
594
  case 18:
595
595
  // line 221 "ext/ragel/base_lexer.rl"
596
- {te = p+1;{ ( this.cs) = 39; }}
596
+ {te = p+1;{ ( this.cs) = 38; }}
597
597
  break;
598
598
  case 19:
599
599
  // line 148 "ext/ragel/base_lexer.rl"
600
600
  {te = p+1;{
601
601
  callback_simple(id_on_string_squote);
602
602
 
603
- {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 35; _goto_targ = 2; if (true) continue _goto;}
603
+ {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 34; _goto_targ = 2; if (true) continue _goto;}
604
604
  }}
605
605
  break;
606
606
  case 20:
@@ -608,7 +608,7 @@ case 3:
608
608
  {te = p+1;{
609
609
  callback_simple(id_on_string_dquote);
610
610
 
611
- {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
611
+ {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 36; _goto_targ = 2; if (true) continue _goto;}
612
612
  }}
613
613
  break;
614
614
  case 21:
@@ -619,7 +619,7 @@ case 3:
619
619
  // line 235 "ext/ragel/base_lexer.rl"
620
620
  {te = p+1;{
621
621
  callback_simple(id_on_doctype_end);
622
- ( this.cs) = 27;
622
+ ( this.cs) = 26;
623
623
  }}
624
624
  break;
625
625
  case 23:
@@ -648,7 +648,7 @@ case 3:
648
648
  // line 255 "ext/ragel/base_lexer.rl"
649
649
  {te = p+1;{
650
650
  callback_simple(id_on_xml_decl_end);
651
- ( this.cs) = 27;
651
+ ( this.cs) = 26;
652
652
  }}
653
653
  break;
654
654
  case 26:
@@ -656,7 +656,7 @@ case 3:
656
656
  {te = p+1;{
657
657
  callback_simple(id_on_string_squote);
658
658
 
659
- {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 35; _goto_targ = 2; if (true) continue _goto;}
659
+ {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 34; _goto_targ = 2; if (true) continue _goto;}
660
660
  }}
661
661
  break;
662
662
  case 27:
@@ -664,7 +664,7 @@ case 3:
664
664
  {te = p+1;{
665
665
  callback_simple(id_on_string_dquote);
666
666
 
667
- {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
667
+ {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 36; _goto_targ = 2; if (true) continue _goto;}
668
668
  }}
669
669
  break;
670
670
  case 28:
@@ -691,7 +691,7 @@ case 3:
691
691
  // line 299 "ext/ragel/base_lexer.rl"
692
692
  {te = p;p--;{
693
693
  callback(id_on_element_name, data, encoding, ts, te);
694
- ( this.cs) = 58;
694
+ ( this.cs) = 57;
695
695
  }}
696
696
  break;
697
697
  case 33:
@@ -715,7 +715,7 @@ case 3:
715
715
  {te = p+1;{
716
716
  callback_simple(id_on_string_squote);
717
717
 
718
- {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 35; _goto_targ = 2; if (true) continue _goto;}
718
+ {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 34; _goto_targ = 2; if (true) continue _goto;}
719
719
  }}
720
720
  break;
721
721
  case 37:
@@ -723,7 +723,7 @@ case 3:
723
723
  {te = p+1;{
724
724
  callback_simple(id_on_string_dquote);
725
725
 
726
- {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 37; _goto_targ = 2; if (true) continue _goto;}
726
+ {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 36; _goto_targ = 2; if (true) continue _goto;}
727
727
  }}
728
728
  break;
729
729
  case 38:
@@ -737,7 +737,7 @@ case 3:
737
737
  }
738
738
  else
739
739
  {
740
- ( this.cs) = 27;
740
+ ( this.cs) = 26;
741
741
  }
742
742
  }}
743
743
  break;
@@ -745,16 +745,22 @@ case 3:
745
745
  // line 342 "ext/ragel/base_lexer.rl"
746
746
  {te = p+1;{
747
747
  callback_simple(id_on_element_end);
748
- ( this.cs) = 27;
748
+ ( this.cs) = 26;
749
749
  }}
750
750
  break;
751
751
  case 40:
752
+ // line 310 "ext/ragel/base_lexer.rl"
753
+ {te = p;p--;{
754
+ callback_simple(id_advance_line);
755
+ }}
756
+ break;
757
+ case 41:
752
758
  // line 319 "ext/ragel/base_lexer.rl"
753
759
  {te = p;p--;{
754
760
  callback(id_on_attribute, data, encoding, ts, te);
755
761
  }}
756
762
  break;
757
- case 41:
763
+ case 42:
758
764
  // line 371 "ext/ragel/base_lexer.rl"
759
765
  {te = p+1;{
760
766
  callback(id_on_text, data, encoding, ts, te);
@@ -766,10 +772,10 @@ case 3:
766
772
  lines = 0;
767
773
  }
768
774
 
769
- ( this.cs) = 27;
775
+ ( this.cs) = 26;
770
776
  }}
771
777
  break;
772
- case 42:
778
+ case 43:
773
779
  // line 385 "ext/ragel/base_lexer.rl"
774
780
  {te = p+1;{
775
781
  callback(id_on_text, data, encoding, ts, mark);
@@ -784,10 +790,10 @@ case 3:
784
790
  lines = 0;
785
791
  }
786
792
 
787
- ( this.cs) = 27;
793
+ ( this.cs) = 26;
788
794
  }}
789
795
  break;
790
- case 43:
796
+ case 44:
791
797
  // line 371 "ext/ragel/base_lexer.rl"
792
798
  {te = p;p--;{
793
799
  callback(id_on_text, data, encoding, ts, te);
@@ -799,14 +805,14 @@ case 3:
799
805
  lines = 0;
800
806
  }
801
807
 
802
- ( this.cs) = 27;
808
+ ( this.cs) = 26;
803
809
  }}
804
810
  break;
805
- case 44:
811
+ case 45:
806
812
  // line 409 "ext/ragel/base_lexer.rl"
807
813
  {( this.act) = 33;}
808
814
  break;
809
- case 45:
815
+ case 46:
810
816
  // line 420 "ext/ragel/base_lexer.rl"
811
817
  {te = p+1;{
812
818
  callback(id_on_text, data, encoding, ts, mark);
@@ -821,10 +827,10 @@ case 3:
821
827
  lines = 0;
822
828
  }
823
829
 
824
- ( this.cs) = 27;
830
+ ( this.cs) = 26;
825
831
  }}
826
832
  break;
827
- case 46:
833
+ case 47:
828
834
  // line 409 "ext/ragel/base_lexer.rl"
829
835
  {te = p;p--;{
830
836
  callback(id_on_text, data, encoding, ts, te);
@@ -837,7 +843,7 @@ case 3:
837
843
  }
838
844
  }}
839
845
  break;
840
- case 47:
846
+ case 48:
841
847
  // line 1 "NONE"
842
848
  { switch( ( this.act) ) {
843
849
  case 0:
@@ -858,55 +864,55 @@ case 3:
858
864
  }
859
865
  }
860
866
  break;
861
- case 48:
867
+ case 49:
862
868
  // line 248 "ext/ragel/base_lexer.rl"
863
869
  {( this.act) = 36;}
864
870
  break;
865
- case 49:
871
+ case 50:
866
872
  // line 106 "ext/ragel/base_lexer.rl"
867
873
  {( this.act) = 39;}
868
874
  break;
869
- case 50:
875
+ case 51:
870
876
  // line 72 "ext/ragel/base_lexer.rl"
871
877
  {te = p+1;{
872
878
  callback(id_on_comment, data, encoding, ts + 4, te - 3);
873
879
  }}
874
880
  break;
875
- case 51:
881
+ case 52:
876
882
  // line 88 "ext/ragel/base_lexer.rl"
877
883
  {te = p+1;{
878
884
  callback(id_on_cdata, data, encoding, ts + 9, te - 3);
879
885
  }}
880
886
  break;
881
- case 52:
887
+ case 53:
882
888
  // line 283 "ext/ragel/base_lexer.rl"
883
889
  {te = p+1;{
884
890
  callback_simple(id_on_element_start);
885
891
  p--;
886
- ( this.cs) = 56;
892
+ ( this.cs) = 55;
887
893
  }}
888
894
  break;
889
- case 53:
895
+ case 54:
890
896
  // line 289 "ext/ragel/base_lexer.rl"
891
897
  {te = p+1;{
892
898
  callback_simple(id_on_element_end);
893
899
  }}
894
900
  break;
895
- case 54:
901
+ case 55:
896
902
  // line 356 "ext/ragel/base_lexer.rl"
897
903
  {te = p+1;{
898
904
  p--;
899
905
  ( this.cs) = 60;
900
906
  }}
901
907
  break;
902
- case 55:
908
+ case 56:
903
909
  // line 192 "ext/ragel/base_lexer.rl"
904
910
  {te = p;p--;{
905
911
  callback_simple(id_on_doctype_start);
906
- ( this.cs) = 41;
912
+ ( this.cs) = 40;
907
913
  }}
908
914
  break;
909
- case 56:
915
+ case 57:
910
916
  // line 106 "ext/ragel/base_lexer.rl"
911
917
  {te = p;p--;{
912
918
  callback_simple(id_on_proc_ins_start);
@@ -914,30 +920,30 @@ case 3:
914
920
 
915
921
  mark = te;
916
922
 
917
- ( this.cs) = 33;
923
+ ( this.cs) = 32;
918
924
  }}
919
925
  break;
920
- case 57:
926
+ case 58:
921
927
  // line 356 "ext/ragel/base_lexer.rl"
922
928
  {te = p;p--;{
923
929
  p--;
924
930
  ( this.cs) = 60;
925
931
  }}
926
932
  break;
927
- case 58:
933
+ case 59:
928
934
  // line 356 "ext/ragel/base_lexer.rl"
929
935
  {{p = ((te))-1;}{
930
936
  p--;
931
937
  ( this.cs) = 60;
932
938
  }}
933
939
  break;
934
- case 59:
940
+ case 60:
935
941
  // line 1 "NONE"
936
942
  { switch( ( this.act) ) {
937
943
  case 36:
938
944
  {{p = ((te))-1;}
939
945
  callback_simple(id_on_xml_decl_start);
940
- ( this.cs) = 53;
946
+ ( this.cs) = 52;
941
947
  }
942
948
  break;
943
949
  case 39:
@@ -947,13 +953,13 @@ case 3:
947
953
 
948
954
  mark = te;
949
955
 
950
- ( this.cs) = 33;
956
+ ( this.cs) = 32;
951
957
  }
952
958
  break;
953
959
  }
954
960
  }
955
961
  break;
956
- // line 957 "ext/java/org/liboga/xml/Lexer.java"
962
+ // line 963 "ext/java/org/liboga/xml/Lexer.java"
957
963
  }
958
964
  }
959
965
  }
@@ -971,7 +977,7 @@ case 2:
971
977
  // line 1 "NONE"
972
978
  {( this.act) = 0;}
973
979
  break;
974
- // line 975 "ext/java/org/liboga/xml/Lexer.java"
980
+ // line 981 "ext/java/org/liboga/xml/Lexer.java"
975
981
  }
976
982
  }
977
983