duktape 1.6.1.0 → 2.0.1.0

data/ext/duktape/duktape_ext.c

@@ -27,7 +27,6 @@ static rb_encoding *utf16enc;
 static VALUE sDefaultFilename;
 static ID id_complex_object;
 
-static void error_handler(duk_context *, int, const char *);
 static int ctx_push_hash_element(VALUE key, VALUE val, VALUE extra);
 
 static unsigned long
@@ -38,11 +37,15 @@ utf8_to_uv(const char *p, long *lenp);
 
 struct state {
   duk_context *ctx;
+  int is_fatal;
   VALUE complex_object;
   int was_complex;
   VALUE blocks;
 };
 
+static void error_handler(void *, const char *);
+static void check_fatal(struct state *);
+
 static void ctx_dealloc(void *ptr)
 {
   struct state *state = (struct state *)ptr;
@@ -58,7 +61,14 @@ static void ctx_mark(struct state *state)
 
 static VALUE ctx_alloc(VALUE klass)
 {
-  duk_context *ctx = duk_create_heap(NULL, NULL, NULL, NULL, error_handler);
+  struct state *state = malloc(sizeof(struct state));
+
+  duk_context *ctx = duk_create_heap(NULL, NULL, NULL, state, error_handler);
+
+  state->ctx = ctx;
+  state->is_fatal = 0;
+  state->complex_object = oComplexObject;
+  state->blocks = rb_ary_new();
 
   // Undefine require property
   duk_push_global_object(ctx);
@@ -66,50 +76,9 @@ static VALUE ctx_alloc(VALUE klass)
   duk_del_prop(ctx, -2);
   duk_set_top(ctx, 0);
 
-  struct state *state = malloc(sizeof(struct state));
-  state->ctx = ctx;
-  state->complex_object = oComplexObject;
-  state->blocks = rb_ary_new();
   return Data_Wrap_Struct(klass, ctx_mark, ctx_dealloc, state);
 }
 
-static VALUE error_code_class(int code) {
-  switch (code) {
-    case DUK_ERR_UNIMPLEMENTED_ERROR:
-      return eUnimplementedError;
-    case DUK_ERR_UNSUPPORTED_ERROR:
-      return eUnsupportedError;
-    case DUK_ERR_INTERNAL_ERROR:
-      return eInternalError;
-    case DUK_ERR_ALLOC_ERROR:
-      return eAllocError;
-    case DUK_ERR_ASSERTION_ERROR:
-      return eAssertionError;
-    case DUK_ERR_API_ERROR:
-      return eAPIError;
-    case DUK_ERR_UNCAUGHT_ERROR:
-      return eUncaughtError;
-
-    case DUK_ERR_ERROR:
-      return eError;
-    case DUK_ERR_EVAL_ERROR:
-      return eEvalError;
-    case DUK_ERR_RANGE_ERROR:
-      return eRangeError;
-    case DUK_ERR_REFERENCE_ERROR:
-      return eReferenceError;
-    case DUK_ERR_SYNTAX_ERROR:
-      return eSyntaxError;
-    case DUK_ERR_TYPE_ERROR:
-      return eTypeError;
-    case DUK_ERR_URI_ERROR:
-      return eURIError;
-
-    default:
-      return eInternalError;
-  }
-}
-
 static VALUE error_name_class(const char* name)
 {
   if (strcmp(name, "EvalError") == 0) {
@@ -351,6 +320,7 @@ static VALUE ctx_eval_string(int argc, VALUE *argv, VALUE self)
 {
   struct state *state;
   Data_Get_Struct(self, struct state, state);
+  check_fatal(state);
 
   VALUE source;
   VALUE filename;
@@ -395,6 +365,7 @@ static VALUE ctx_exec_string(int argc, VALUE *argv, VALUE self)
 {
   struct state *state;
   Data_Get_Struct(self, struct state, state);
+  check_fatal(state);
 
   VALUE source;
   VALUE filename;
@@ -488,6 +459,7 @@ static VALUE ctx_get_prop(VALUE self, VALUE prop)
 {
   struct state *state;
   Data_Get_Struct(self, struct state, state);
+  check_fatal(state);
 
   ctx_get_nested_prop(state, prop);
 
@@ -513,10 +485,10 @@ static VALUE ctx_call_prop(int argc, VALUE* argv, VALUE self)
 {
   struct state *state;
   Data_Get_Struct(self, struct state, state);
+  check_fatal(state);
 
   VALUE prop;
-  VALUE *prop_args;
-  rb_scan_args(argc, argv, "1*", &prop, &prop_args);
+  rb_scan_args(argc, argv, "1*", &prop, NULL);
 
   ctx_get_nested_prop(state, prop);
 
@@ -587,6 +559,8 @@ static VALUE ctx_define_function(VALUE self, VALUE prop)
 
   // get the context
   Data_Get_Struct(self, struct state, state);
+  check_fatal(state);
+
   ctx = state->ctx;
 
   // the c function is available in the global scope
@@ -628,9 +602,37 @@ static VALUE ctx_is_valid(VALUE self)
   }
 }
 
-static void error_handler(duk_context *ctx, int code, const char *msg)
+/*
+ * :nodoc:
+ *
+ * Invokes duk_fatal(). Only used for testing.
+ */
+static VALUE ctx_invoke_fatal(VALUE self)
 {
-  clean_raise(ctx, error_code_class(code), "%s", msg);
+  struct state *state;
+  Data_Get_Struct(self, struct state, state);
+
+  duk_fatal(state->ctx, "induced fatal error");
+
+  return Qnil;
+}
+
+static void error_handler(void *udata, const char *msg)
+{
+  struct state *state = (struct state *)udata;
+
+  if (msg == NULL) {
+    msg = "fatal error";
+  }
+  state->is_fatal = 1;
+  rb_raise(eInternalError, "%s", msg);
+}
+
+static void check_fatal(struct state *state)
+{
+  if (state->is_fatal) {
+    rb_raise(eInternalError, "fatal error");
+  }
 }
 
 VALUE complex_object_instance(VALUE self)
@@ -718,6 +720,7 @@ void Init_duktape_ext()
   rb_define_method(cContext, "call_prop", ctx_call_prop, -1);
   rb_define_method(cContext, "define_function", ctx_define_function, 1);
   rb_define_method(cContext, "_valid?", ctx_is_valid, 0);
+  rb_define_method(cContext, "_invoke_fatal", ctx_invoke_fatal, 0);
 
   oComplexObject = rb_obj_alloc(cComplexObject);
   rb_define_singleton_method(cComplexObject, "instance", complex_object_instance, 0);

data/lib/duktape/version.rb

@@ -1,3 +1,3 @@
 module Duktape
-  VERSION = "1.6.1.0"
+  VERSION = "2.0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duktape
 version: !ruby/object:Gem::Version
-  version: 1.6.1.0
+  version: 2.0.1.0
 platform: ruby
 authors:
 - Magnus Holm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: judofyr@gmail.com
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Bindings to the Duktape JavaScript interpreter