xrb 0.7.0 → 0.9.0

data/lib/xrb/fallback/template.rl

@@ -16,7 +16,7 @@
 		delegate.instruction(data.byteslice(instruction_begin...instruction_end))
 	}
 	
-	action emit_instruction_line {
+	action emit_multiline_instruction {
 		delegate.instruction(data.byteslice(instruction_begin...instruction_end), "\n")
 	}
 	
@@ -40,7 +40,36 @@
 		raise ParseError.new("failed to parse expression", buffer, p)
 	}
 	
+	action text_begin {
+		text_begin = p
+		
+		delimiter_begin = nil
+		delimiter_end = nil
+	}
+	
+	action text_end {
+		text_end = p
+	}
+	
+	action text_delimiter_begin {
+		delimiter_begin = p
+	}
+	
+	action text_delimiter_end {
+		delimiter_end = p
+	}
+	
 	action emit_text {
+		if delimiter_begin
+			text_end = delimiter_begin
+			
+			p = delimiter_begin - 1;
+		end
+		
+		delegate.text(data.byteslice(text_begin...text_end))
+	}
+	
+	action emit_multiline_text {
 		delegate.text(data.byteslice(ts...te))
 	}
 	
@@ -64,8 +93,13 @@ module XRB
 			pe = eof = data.bytesize
 			stack = []
 			
+			ts = te = nil
+			act = nil
+			
 			expression_begin = expression_end = nil
 			instruction_begin = instruction_end = nil
+			text_begin = text_end = nil
+			delimiter_begin = delimiter_end = nil
 			
 			%% write init;
 			%% write exec;

data/lib/xrb/template.rb

@@ -55,11 +55,9 @@ module XRB
 			
 			# Output raw text to the template.
 			def text(text)
+				# We have to use an approach which preserves newlines and tabs as raw characters.
 				text = text.gsub("'", "\\\\'")
 				@code << "#{OUT}.raw('#{text}');"
-				
-				# This is an interesting approach, but it doens't preserve newlines or tabs as raw characters, so template line numbers don't match up.
-				# @parts << "#{OUT}<<#{text.dump};"
 			end
 
 			# Output a ruby expression (or part of).

data/lib/xrb/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2012-2024, by Samuel Williams.
 
 module XRB
-	VERSION = "0.7.0"
+	VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xrb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -57,7 +57,6 @@ files:
 - ext/extconf.h
 - ext/extconf.rb
 - ext/markup.o
-- ext/mkmf.log
 - ext/query.o
 - ext/tag.o
 - ext/template.o
@@ -100,6 +99,7 @@ files:
 - lib/xrb/uri.rb
 - lib/xrb/version.rb
 - license.md
+- notes.md
 - readme.md
 homepage: https://github.com/ioquatix/xrb
 licenses:

data/ext/mkmf.log

@@ -1,69 +0,0 @@
-have_func: checking for rb_sym2str()... -------------------- yes
-
-DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.3/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wextra-tokens -Wdeprecated-declarations -Wdivision-by-zero -Wdiv-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wold-style-definition -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wmisleading-indentation -Wundef -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -lgmp -ldl -lobjc -lpthread   -lpthread  "
-ld: warning: ignoring duplicate libraries: '-lpthread'
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main(int argc, char **argv)
-4: {
-5:   return !!argv[argc];
-6: }
-/* end */
-
-DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.3/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wextra-tokens -Wdeprecated-declarations -Wdivision-by-zero -Wdiv-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wold-style-definition -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wmisleading-indentation -Wundef -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -lgmp -ldl -lobjc -lpthread   -lpthread  "
-ld: warning: ignoring duplicate libraries: '-lpthread'
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: /*top*/
- 4: extern int t(void);
- 5: int main(int argc, char **argv)
- 6: {
- 7:   if (argc > 1000000) {
- 8:     int (* volatile tp)(void)=(int (*)(void))&t;
- 9:     printf("%d", (*tp)());
-10:   }
-11: 
-12:   return !!argv[argc];
-13: }
-14: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_sym2str; return !p; }
-/* end */
-
---------------------
-
-have_func: checking for rb_str_cat_cstr()... -------------------- yes
-
-DYLD_LIBRARY_PATH=.:/Users/samuel/.rubies/ruby-3.3.3/lib "clang -o conftest -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/arm64-darwin23 -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0/ruby/backward -I/Users/samuel/.rubies/ruby-3.3.3/include/ruby-3.3.0 -I. -I/opt/local/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -fdeclspec -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wextra-tokens -Wdeprecated-declarations -Wdivision-by-zero -Wdiv-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wold-style-definition -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wmisleading-indentation -Wundef -pipe -O3 -Wall -Wno-unknown-pragmas -std=c99 conftest.c  -L. -L/Users/samuel/.rubies/ruby-3.3.3/lib -L/opt/local/lib -L. -fstack-protector-strong -L/opt/local/lib  -arch arm64   -lruby.3.3-static -framework CoreFoundation -lgmp -ldl -lobjc -lpthread   -lpthread  "
-ld: warning: ignoring duplicate libraries: '-lpthread'
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: /*top*/
- 4: extern int t(void);
- 5: int main(int argc, char **argv)
- 6: {
- 7:   if (argc > 1000000) {
- 8:     int (* volatile tp)(void)=(int (*)(void))&t;
- 9:     printf("%d", (*tp)());
-10:   }
-11: 
-12:   return !!argv[argc];
-13: }
-14: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_str_cat_cstr; return !p; }
-/* end */
-
---------------------
-
-extconf.h is:
-/* begin */
-1: #ifndef EXTCONF_H
-2: #define EXTCONF_H
-3: #define HAVE_RB_SYM2STR 1
-4: #define HAVE_RB_STR_CAT_CSTR 1
-5: #endif
-/* end */
-