Refactor Nokogiri patch generation.

Author: aardvark179

lib/truffle/truffle/patches/nokogiri_patches.rb

@@ -23,6 +23,16 @@ class NokogiriPatches
   xmlDocPtr doc = (xmlDocPtr)c;
 EOF
 
+  def self.patch_for_system_libraries(replacement)
+    <<-EOF
+#ifdef NOKOGIRI_PACKAGED_LIBRARIES
+\\&
+#else
+#{replacement}
+#endif
+EOF
+  end
+
   PATCHES = {
     gem: 'nokogiri',
     patches: {
@@ -31,26 +41,14 @@ class NokogiriPatches
           # is called with. This works on MRI but causes an error in
           # TruffleRuby.
           match: 'static VALUE to_array(VALUE self, VALUE rb_node)',
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-static VALUE to_array(VALUE self, VALUE rb_node)
-#else
-static VALUE to_array(VALUE self)
-#endif
-EOF
+          replacement: patch_for_system_libraries('static VALUE to_array(VALUE self)')
         },
       ],
       'xslt_stylesheet.c' => [
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: 'va_list args;',
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-va_list args;
-#else
-va_list args; rb_str_cat2(ctx, "Generic error"); return;
-#endif
-EOF
+          replacement: patch_for_system_libraries('va_list args; rb_str_cat2(ctx, "Generic error"); return;')
         }
       ],
       'xml_document.c' => [
@@ -63,69 +61,31 @@ class NokogiriPatches
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: /va_list args;[^}]*id_warning, 1, ruby_message\);/,
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-\\&
-#else
-rb_funcall(doc, id_warning, 1, NOKOGIRI_STR_NEW2("Warning."));
-#endif
-EOF
+          replacement: patch_for_system_libraries('rb_funcall(doc, id_warning, 1, NOKOGIRI_STR_NEW2("Warning."));')
         },
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: /va_list args;[^}]*id_error, 1, ruby_message\);/,
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-\\&
-#else
-rb_funcall(doc, id_error, 1, NOKOGIRI_STR_NEW2("Warning."));
-#endif
-EOF
+          replacement: patch_for_system_libraries('rb_funcall(doc, id_error, 1, NOKOGIRI_STR_NEW2("Warning."));')
         }
       ],
       'xml_xpath_context.c' => [
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: 'va_list args;',
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-va_list args;
-#else
-va_list args; rb_raise(rb_eRuntimeError, "%s", "Exception:"); return;
-#endif
-EOF
+          replacement: patch_for_system_libraries('va_list args; rb_raise(rb_eRuntimeError, "%s", "Exception:"); return;')
         },
         {
           match: 'VALUE thing = Qnil;',
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-VALUE thing = Qnil;
-#else
-VALUE thing = Qnil;
-VALUE errors = rb_ary_new();
-#endif
-EOF
+          replacement: patch_for_system_libraries("VALUE thing = Qnil;\nVALUE errors = rb_ary_new();")
         },
         {
           match: 'xmlSetStructuredErrorFunc(NULL, Nokogiri_error_raise);',
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-xmlSetStructuredErrorFunc(NULL, Nokogiri_error_raise);
-#else
-xmlSetStructuredErrorFunc(errors, Nokogiri_error_array_pusher);
-#endif
-EOF
+          replacement: patch_for_system_libraries('xmlSetStructuredErrorFunc(errors, Nokogiri_error_array_pusher);')
         },
         {
           match: 'if(xpath == NULL)',
-          replacement: <<-EOF
-#ifdef NOKOGIRI_PACKAGED_LIBRARIES
-if(xpath == NULL)
-#else
-if (RARRAY_LEN(errors) > 0) { rb_exc_raise(rb_ary_entry(errors, 0)); }
-if(xpath == NULL)
-#endif
-EOF
+          replacement: patch_for_system_libraries("if (RARRAY_LEN(errors) > 0) { rb_exc_raise(rb_ary_entry(errors, 0)); }\nif(xpath == NULL)")
         },
       ],
     }