xrb 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec15e8b31b37bcb608d2e1fb7e5748081e76872a8aa5c31b4ec6fc4d4e74122c
-  data.tar.gz: d57336048d69699d54a16016dd1bcaf3764372828baa41a3b7da59273cf50f18
+  metadata.gz: 5f64c9b5e726af2122bf7031ea5c0acfd6e25619b7d73faff0ad4c9191efb823
+  data.tar.gz: c6088d6f0c819d894a96b3129005a7c9c8fda372e149a5323cc01e200f195b09
 SHA512:
-  metadata.gz: 7f8f906db2c28206e7892ce08775015d090785f29a6c095959a3de25e56d6a40ace9e7941613fc9158ce9bab588d1bfa6add5d0b72ab1f251174d7ef9de2cfce
-  data.tar.gz: fe3707d210322d99d85f1b75be28e9990a3a22addf1a56a675ba95fcb262fd1669185edeb5dd7bb3caec1995535f74fc9cb8efa6921e9476314080e89e244395
+  metadata.gz: 489dd6c69569b06cc6fb4be56ab98877b90866f1c140b0e0b502255ec505182de7e0b14a44feac14108bdfa5c2b66c350ab3f271b0cf541970b5583a4d9721d3
+  data.tar.gz: bb85136e9ed1ebb887165451d45c851cd7aa39d05eefff8b26ad930035e8c92d62f128c8a21d23090a53e4923dfe217f299e3f47cc4293a467f2782680809f39

data/bake/xrb/parsers.rb

@@ -5,34 +5,26 @@
 
 # Generate the pure Ruby parsers.
 def generate_fallback
-	Dir.chdir(fallback_directory) do
-		Dir.glob("*.rl").each do |parser_path|
-			system("ragel", "-I", parsers_directory, "-R", parser_path, "-F1")
-		end
-		
-		# sh("ruby-beautify", "--tabs", "--overwrite", *Dir.glob("*.rb"))
+	pattern = File.join(fallback_directory, "*.rl")
+	
+	Dir.glob(pattern, base: context.root).each do |parser_path|
+		system("ragel", "-I", parsers_directory, "-R", parser_path, "-F1", chdir: context.root)
 	end
 end
 
 # Generate the native C parsers.
 def generate_native
-	Dir.chdir(native_directory) do
-		Dir.glob("*.rl").each do |parser_path|
-			system("ragel", "-I", parsers_directory, "-C", parser_path, "-G2")
-		end
+	pattern = File.join(native_directory, "*.rl")
+	
+	Dir.glob(pattern, base: context.root).each do |parser_path|
+		system("ragel", "-I", parsers_directory, "-C", parser_path, "-G2", chdir: context.root)
 	end
 end
 
-# Compile the C extension.
-def compile
-	system("rake", "compile", chdir: extensions_directory)
-end
-
 # Generate the parsers and compile them as required.
 def generate
 	self.generate_native
 	self.generate_fallback
-	self.compile
 end
 
 # Generate a visualisation of the parsers.
@@ -53,17 +45,22 @@ end
 private
 
 def parsers_directory
-	File.expand_path("parsers", context.root)
+	"parsers"
 end
 
 def fallback_directory
-	File.expand_path("lib/xrb/fallback", context.root)
+	"lib/xrb/fallback"
 end
 
 def extensions_directory
-	File.expand_path("ext", context.root)
+	"ext"
 end
 
 def native_directory
-	File.expand_path("ext/xrb", context.root)
+	"ext/xrb"
+end
+
+def system(*arguments, **options)
+	Console.info(self, arguments: arguments, options: options)
+	super
 end

data/ext/extconf.rb

@@ -11,7 +11,6 @@ $CFLAGS << " -O3 -Wall -Wno-unknown-pragmas -std=c99"
 
 have_func("rb_sym2str")
 have_func("rb_str_cat_cstr")
-have_func("rb_str_reserve")
 
 $srcs = Dir.glob("xrb/*.c")
 $VPATH << "$(srcdir)/xrb"

data/ext/xrb/escape.c

@@ -135,7 +135,7 @@ VALUE XRB_Markup_escape_string(VALUE self, VALUE string) {
 	return XRB_Markup_append_buffer(XRB_buffer_for(string), s, p, end);
 }
 
-void Init_xrb_escape() {
+void Init_XRB_escape(void) {
 	rb_XRB_MarkupString = rb_define_class_under(rb_XRB, "MarkupString", rb_cString);
 	rb_gc_register_mark_object(rb_XRB_MarkupString);
 	

data/ext/xrb/escape.h

@@ -3,7 +3,7 @@
 
 #include "xrb.h"
 
-void Init_xrb_escape();
+void Init_XRB_escape(void);
 
 // Given a string, replace it's class with XRB::MarkupString so that it would be output as is.
 VALUE XRB_MarkupString_raw(VALUE self, VALUE string);