Merge remote-tracking branch 'upstream/master'

Author: phurley67

ext/jsonnet/callbacks.c

@@ -27,7 +27,7 @@ invoke_callback(VALUE args)
 {
     long len = RARRAY_LEN(args);
     VALUE callback = rb_ary_entry(args, 0);
-    return rb_funcall2(callback, id_call, len - 1, RARRAY_PTR(args) + 1);
+    return rb_funcall2(callback, id_call, (int)(len - 1), RARRAY_PTR(args) + 1);
 }
 
 /*

ext/jsonnet/extconf.rb

@@ -16,6 +16,25 @@ def using_system_libraries?
   recipe = MiniPortile.new('jsonnet', 'v0.18.0')
   recipe.files = ['https://github.com/google/jsonnet/archive/v0.18.0.tar.gz']
   class << recipe
+    CORE_OBJS = %w[
+      desugarer.o formatter.o lexer.o libjsonnet.o parser.o pass.o static_analysis.o string_utils.o vm.o
+    ].map {|name| File.join('core', name) }
+    MD5_OBJS = %w[
+      md5.o
+    ].map {|name| File.join('third_party', 'md5', name) }
+    C4_CORE_OBJS = %w[
+      base64.o
+      char_traits.o
+      error.o
+      format.o
+      language.o
+      memory_resource.o
+      memory_util.o
+      time.o
+    ].map {|name| File.join('third_party', 'rapidyaml', 'rapidyaml', 'ext', 'c4core', 'src', 'c4', name) }
+    RAPID_YAML_OBJS = %w[
+      common.o parse.o preprocess.o tree.o
+    ].map {|name| File.join('third_party', 'rapidyaml', 'rapidyaml', 'src', 'c4', 'yml', name) }
 
     def compile
       # We want to create a file a library we can link to. Jsonnet provides us
@@ -24,7 +43,7 @@ def compile
       # we compile the c into .o files and then create an archive that can
       # be linked to
       execute('compile', make_cmd)
-      execute('archive', 'ar rcs libjsonnet.a core/desugarer.o core/formatter.o core/lexer.o core/libjsonnet.o core/parser.o core/pass.o core/static_analysis.o core/string_utils.o core/vm.o third_party/md5/md5.o')
+      execute('archive', 'ar rcs libjsonnet.a ' + target_object_files.join(' '))
     end
 
     def configured?
@@ -41,19 +60,22 @@ def install
       FileUtils.cp(File.join(work_path, 'include', 'libjsonnet.h'), include_path)
       FileUtils.cp(File.join(work_path, 'include', 'libjsonnet_fmt.h'), include_path)
     end
+
+    private
+    def target_object_files
+      if version >= 'v0.18.0'
+        CORE_OBJS + MD5_OBJS + C4_CORE_OBJS + RAPID_YAML_OBJS
+      else
+        CORE_OBJS + MD5_OBJS
+      end
+    end
   end
 
   recipe.cook
   # I tried using recipe.activate here but that caused this file to build ok
   # but the makefile to fail. These commands add the necessary paths to do both
   $LIBPATH = ["#{recipe.path}/lib"] | $LIBPATH
   $CPPFLAGS << " -I#{recipe.path}/include"
-
-  # This resolves an issue where you can get improper linkage when compiling
-  # and get an error like "undefined symbol: _ZTVN10__cxxabiv121__vmi_class_type_infoE"
-  # experienced on ubuntu.
-  # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=193950
-  $LIBS << " -lstdc++"
 end
 
 abort 'libjsonnet.h not found' unless have_header('libjsonnet.h')

ext/jsonnet/vm.c

@@ -7,6 +7,10 @@
 
 #include "ruby_jsonnet.h"
 
+#ifndef NORETURN
+# define NORETURN(x) x
+#endif
+
 /*
  * defines the core part of Jsonnet::VM
  */
@@ -385,7 +389,7 @@ vm_fmt_snippet(VALUE self, VALUE snippet, VALUE fname)
 void
 rubyjsonnet_init_vm(VALUE mJsonnet)
 {
-    cVM = rb_define_class_under(mJsonnet, "VM", rb_cData);
+    cVM = rb_define_class_under(mJsonnet, "VM", rb_cObject);
     rb_define_singleton_method(cVM, "new", vm_s_new, -1);
     rb_define_private_method(cVM, "eval_file", vm_evaluate_file, 3);
     rb_define_private_method(cVM, "eval_snippet", vm_evaluate, 3);
@@ -424,7 +428,7 @@ rubyjsonnet_init_vm(VALUE mJsonnet)
 }
 
 static void
-raise_error(VALUE exception_class, struct JsonnetVm *vm, char *msg, rb_encoding *enc)
+NORETURN(raise_error)(VALUE exception_class, struct JsonnetVm *vm, char *msg, rb_encoding *enc)
 {
     VALUE ex;
     const int state = rubyjsonnet_jump_tag(msg);
@@ -451,13 +455,13 @@ raise_error(VALUE exception_class, struct JsonnetVm *vm, char *msg, rb_encoding
  * @sa rescue_callback
  */
 static void
-raise_eval_error(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
+NORETURN(raise_eval_error)(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
 {
     raise_error(eEvaluationError, vm, msg, enc);
 }
 
 static void
-raise_format_error(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
+NORETURN(raise_format_error)(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
 {
     raise_error(eFormatError, vm, msg, enc);
 }