JavaScript: provide mechanism via which C++ js engines can fz_throw errors

1 files changed, 118 insertions, 0 deletions

diff --git a/pdf/pdf_jsimp_cpp.c b/pdf/pdf_jsimp_cpp.c
new file mode 100644
index 00000000..1e98d680
--- /dev/null
+++ b/pdf/pdf_jsimp_cpp.c
@@ -0,0 +1,118 @@
+/* This file contains wrapper functions for pdf_jsimp functions implemented
+ * in C++, from which calls to fz_throw aren't safe. The C++ versions
+ * return errors explicitly, and these wrappers then throw them. */
+
+#include "fitz-internal.h"
+#include "mupdf-internal.h"
+#include "pdf_jsimp_cpp.h"
+
+
+pdf_jsimp *pdf_new_jsimp(fz_context *ctx, void *jsctx)
+{
+	pdf_jsimp *jsi = NULL;
+	char *err = pdf_new_jsimp_cpp(ctx, jsctx, &jsi);
+	if (err != NULL)
+		fz_throw(ctx, "%s", err);
+
+	return jsi;
+}
+
+void pdf_drop_jsimp(pdf_jsimp *imp)
+{
+	if (imp)
+	{
+		fz_context *ctx = pdf_jsimp_ctx_cpp(imp);
+		char *err = pdf_drop_jsimp_cpp(imp);
+		if (err != NULL)
+			fz_warn(ctx, "%s", err);
+	}
+}
+
+pdf_jsimp_type *pdf_jsimp_new_type(pdf_jsimp *imp, pdf_jsimp_dtr *dtr)
+{
+	pdf_jsimp_type *type = NULL;
+	char *err = pdf_jsimp_new_type_cpp(imp, dtr, &type);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+
+	return type;
+}
+
+void pdf_jsimp_drop_type(pdf_jsimp *imp, pdf_jsimp_type *type)
+{
+	char *err = pdf_jsimp_drop_type_cpp(imp, type);
+	if (err != NULL)
+		fz_warn(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}
+
+void pdf_jsimp_addmethod(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf_jsimp_method *meth)
+{
+	char *err = pdf_jsimp_addmethod_cpp(imp, type, name, meth);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}
+
+void pdf_jsimp_addproperty(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf_jsimp_getter *get, pdf_jsimp_setter *set)
+{
+	char *err = pdf_jsimp_addproperty_cpp(imp, type, name, get, set);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}
+
+void pdf_jsimp_set_global_type(pdf_jsimp *imp, pdf_jsimp_type *type)
+{
+	char *err = pdf_jsimp_set_global_type_cpp(imp, type);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}
+
+pdf_jsimp_obj *pdf_jsimp_new_obj(pdf_jsimp *imp, pdf_jsimp_type *type, void *natobj)
+{
+	pdf_jsimp_obj *obj = NULL;
+	char *err = pdf_jsimp_new_obj_cpp(imp, type, natobj, &obj);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+
+	return obj;
+}
+
+void pdf_jsimp_drop_obj(pdf_jsimp *imp, pdf_jsimp_obj *obj)
+{
+	char *err = pdf_jsimp_drop_obj_cpp(imp, obj);
+	if (err != NULL)
+		fz_warn(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}
+
+pdf_jsimp_obj *pdf_jsimp_fromString(pdf_jsimp *imp, char *str)
+{
+	pdf_jsimp_obj *obj = NULL;
+	char *err = pdf_jsimp_fromString_cpp(imp, str, &obj);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+
+	return obj;
+}
+
+char *pdf_jsimp_toString(pdf_jsimp *imp, pdf_jsimp_obj *obj)
+{
+	char *str = NULL;
+	char *err = pdf_jsimp_toString_cpp(imp, obj, &str);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+
+	return str;
+}
+
+void pdf_jsimp_execute(pdf_jsimp *imp, char *code)
+{
+	char *err = pdf_jsimp_execute_cpp(imp, code);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}
+
+void pdf_jsimp_execute_count(pdf_jsimp *imp, char *code, int count)
+{
+	char *err = pdf_jsimp_execute_count_cpp(imp, code, count);
+	if (err != NULL)
+		fz_throw(pdf_jsimp_ctx_cpp(imp), "%s", err);
+}