xrb 0.7.0 → 0.8.0

data/ext/xrb/template.rl

@@ -16,7 +16,7 @@
 		rb_funcall(delegate, id_instruction, 1, XRB_Token_string(instruction, encoding));
 	}
 	
-	action emit_instruction_line {
+	action emit_multiline_instruction {
 		rb_funcall(delegate, id_instruction, 2, XRB_Token_string(instruction, encoding), newline);
 	}
 	
@@ -33,15 +33,54 @@
 	}
 	
 	action emit_expression {
-		rb_funcall(delegate, id_expression, 1, XRB_Token_string(expression, encoding));
+		if (expression.end > expression.begin) {
+			rb_funcall(delegate, id_expression, 1, XRB_Token_string(expression, encoding));
+		}
 	}
 	
 	action expression_error {
 		XRB_raise_error("failed to parse expression", buffer, p-s);
 	}
 	
+	action text_begin {
+		text.begin = p;
+		
+		delimiter.begin = NULL;
+		delimiter.end = NULL;
+	}
+	
+	action text_end {
+		text.end = p;
+	}
+	
+	action text_delimiter_begin {
+		delimiter.begin = p;
+	}
+	
+	action text_delimiter_end {
+		delimiter.end = p;
+	}
+	
 	action emit_text {
-		rb_funcall(delegate, id_text, 1, XRB_string(ts, te, encoding));
+		if (delimiter.begin && delimiter.end) {
+			text.end = delimiter.begin;
+			
+			// Backtrack:
+			p = delimiter.begin - 1;
+		}
+		
+		rb_funcall(delegate, id_text, 1, XRB_Token_string(text, encoding));
+	}
+	
+	action emit_multiline_text {
+		text.begin = ts;
+		text.end = te;
+		
+		rb_funcall(delegate, id_text, 1, XRB_Token_string(text, encoding));
+	}
+	
+	action emit_newline {
+		rb_funcall(delegate, id_instruction, 1, newline);
 	}
 	
 	include template "xrb/template.rl";
@@ -57,9 +96,9 @@ VALUE XRB_Native_parse_template(VALUE self, VALUE buffer, VALUE delegate) {
 	VALUE newline = rb_obj_freeze(rb_enc_str_new("\n", 1, encoding));
 	
 	const char *s, *p, *pe, *eof, *ts, *te;
-	unsigned long cs, act, top = 0, stack[32] = {0};
+	unsigned long cs, top = 0, stack[32] = {0}, act;
 	
-	XRB_Token expression = {0}, instruction = {0};
+	XRB_Token expression = {0}, instruction = {0}, text = {0}, delimiter = {0};
 	
 	s = p = RSTRING_PTR(string);
 	eof = pe = p + RSTRING_LEN(string);

data/lib/xrb/fallback/markup.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-# Released under the MIT License.
-# Copyright, 2016-2024, by Samuel Williams.
 
 # line 1 "lib/xrb/fallback/markup.rl"
 # Released under the MIT License.
@@ -423,6 +421,7 @@ module XRB
 		def self.parse_markup(buffer, delegate, entities)
 			data = buffer.read
 			bytes = data.bytes
+			encoding = data.encoding
 							
 			p = 0
 			# Must set pe here or it gets incorrectly set to data.length
@@ -440,7 +439,7 @@ module XRB
 			has_entities = has_value = false
 							
 							
-			# line 441 "lib/xrb/fallback/markup.rb"
+			# line 442 "lib/xrb/fallback/markup.rb"
 			begin
 				p ||= 0
 				pe ||= data.length
@@ -448,9 +447,9 @@ module XRB
 				top = 0
 			end
 
-			# line 218 "lib/xrb/fallback/markup.rl"
+			# line 219 "lib/xrb/fallback/markup.rl"
 							
-			# line 451 "lib/xrb/fallback/markup.rb"
+			# line 452 "lib/xrb/fallback/markup.rb"
 			begin
 				testEof = false
 				_slen, _trans, _keys, _inds, _acts, _nacts = nil
@@ -602,7 +601,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -614,7 +613,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -718,7 +717,7 @@ module XRB
 								begin
 
 									has_value = false
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 								end
 								# line 7 "lib/xrb/fallback/markup.rl"
 								begin
@@ -813,7 +812,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -829,7 +828,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -905,7 +904,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -928,7 +927,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -956,7 +955,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -979,7 +978,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -1005,7 +1004,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -1026,7 +1025,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -1052,7 +1051,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -1073,7 +1072,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -1099,7 +1098,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -1120,7 +1119,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -1148,7 +1147,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 32 "lib/xrb/fallback/markup.rl"
@@ -1171,7 +1170,7 @@ module XRB
 								# line 15 "lib/xrb/fallback/markup.rl"
 								begin
 
-									pcdata = ""
+									pcdata = String.new(encoding: encoding)
 									has_entities = false
 								end
 								# line 10 "parsers/xrb/entities.rl"
@@ -1510,7 +1509,7 @@ module XRB
 
 									cdata_begin = p
 								end
-								# line 1511 "lib/xrb/fallback/markup.rb"
+								# line 1512 "lib/xrb/fallback/markup.rb"
 							end
 						end
 					end
@@ -1637,7 +1636,7 @@ module XRB
 												
 									delegate.text(pcdata)
 								end
-								# line 1638 "lib/xrb/fallback/markup.rb"
+								# line 1639 "lib/xrb/fallback/markup.rb"
 							end
 						end
 
@@ -1648,7 +1647,7 @@ module XRB
 				end
 			end
 
-			# line 219 "lib/xrb/fallback/markup.rl"
+			# line 220 "lib/xrb/fallback/markup.rl"
 							
 			if p != eof
 				raise ParseError.new("could not consume all input", buffer, p)

data/lib/xrb/fallback/markup.rl

@@ -13,7 +13,7 @@
 	}
 	
 	action pcdata_begin {
-		pcdata = ""
+		pcdata = String.new(encoding: encoding)
 		has_entities = false
 	}
 	
@@ -131,7 +131,7 @@
 	
 	action attribute_begin {
 		has_value = false
-		pcdata = ""
+		pcdata = String.new(encoding: encoding)
 	}
 
 	action attribute_value {
@@ -198,6 +198,7 @@ module XRB
 		def self.parse_markup(buffer, delegate, entities)
 			data = buffer.read
 			bytes = data.bytes
+			encoding = data.encoding
 			
 			p = 0
 			# Must set pe here or it gets incorrectly set to data.length

data/lib/xrb/fallback/query.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-# Released under the MIT License.
-# Copyright, 2020-2024, by Samuel Williams.
 
 # line 1 "lib/xrb/fallback/query.rl"
 # Released under the MIT License.