Evaluation with quickjs works.

Author: PetterS

Makefile

@@ -5,9 +5,12 @@ test: install
 install: build
 	python3 setup.py install --user
 
-build: Makefile module.c
+build: Makefile module.c third-party/quickjs.c third-party/quickjs.h
 	python3 setup.py build
 
 format:
 	python3 -m yapf -i -r --style .style.yapf  .
 	clang-format-7 -i module.c
+
+clean:
+	rm -rf build/

module.c

@@ -1,11 +1,86 @@
 #include <Python.h>
 
+#include "third-party/quickjs.h"
+
 static PyObject *test(PyObject *self, PyObject *args) {
 	return Py_BuildValue("i", 42);
 }
 
 struct module_state {};
 
+typedef struct {
+	PyObject_HEAD JSRuntime *runtime;
+	JSContext *context;
+} ContextData;
+
+static PyObject *context_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
+	ContextData *self;
+	self = (ContextData *)type->tp_alloc(type, 0);
+	if (self != NULL) {
+		self->runtime = JS_NewRuntime();
+		self->context = JS_NewContext(self->runtime);
+	}
+	return (PyObject *)self;
+}
+
+static void context_dealloc(ContextData *self) {
+	JS_FreeContext(self->context);
+	JS_FreeRuntime(self->runtime);
+	Py_TYPE(self)->tp_free((PyObject *)self);
+}
+
+static PyObject *context_eval(ContextData *self, PyObject *args) {
+	const char *code;
+	if (!PyArg_ParseTuple(args, "s", &code)) {
+		return NULL;
+	}
+	JSValue value = JS_Eval(self->context, code, strlen(code), "<input>", JS_EVAL_TYPE_GLOBAL);
+	int tag = JS_VALUE_GET_TAG(value);
+	PyObject *return_value = NULL;
+
+	if (tag == JS_TAG_INT) {
+		return_value = Py_BuildValue("i", JS_VALUE_GET_INT(value));
+	} else if (tag == JS_TAG_BOOL) {
+		return_value = Py_BuildValue("O", JS_VALUE_GET_BOOL(value) ? Py_True : Py_False);
+	} else if (tag == JS_TAG_NULL) {
+		// None
+	} else if (tag == JS_TAG_UNDEFINED) {
+		// None
+	} else if (tag == JS_TAG_UNINITIALIZED) {
+		// None
+	} else if (tag == JS_TAG_EXCEPTION) {
+		// TODO: Raise exception.
+	} else if (tag == JS_TAG_FLOAT64) {
+		return_value = Py_BuildValue("d", JS_VALUE_GET_FLOAT64(value));
+	} else if (tag == JS_TAG_STRING) {
+		const char *cstring = JS_ToCString(self->context, value);
+		return_value = Py_BuildValue("s", cstring);
+		JS_FreeCString(self->context, cstring);
+	} else {
+		// TODO: Raise exception.
+	}
+
+	JS_FreeValue(self->context, value);
+	if (return_value == NULL) {
+		Py_RETURN_NONE;
+	}
+	return return_value;
+}
+
+static PyMethodDef context_methods[] = {
+    {"eval", (PyCFunction)context_eval, METH_VARARGS, "Evaluates a Javascript string."},
+    {NULL} /* Sentinel */
+};
+
+static PyTypeObject Context = {PyVarObject_HEAD_INIT(NULL, 0).tp_name = "_quickjs.Context",
+                               .tp_doc = "Quickjs context",
+                               .tp_basicsize = sizeof(ContextData),
+                               .tp_itemsize = 0,
+                               .tp_flags = Py_TPFLAGS_DEFAULT,
+                               .tp_new = context_new,
+                               .tp_dealloc = (destructor)context_dealloc,
+                               .tp_methods = context_methods};
+
 static PyMethodDef myextension_methods[] = {{"test", (PyCFunction)test, METH_NOARGS, NULL},
                                             {NULL, NULL}};
 
@@ -20,5 +95,16 @@ static struct PyModuleDef moduledef = {PyModuleDef_HEAD_INIT,
                                        NULL};
 
 PyMODINIT_FUNC PyInit__quickjs(void) {
-	return PyModule_Create(&moduledef);
+	if (PyType_Ready(&Context) < 0) {
+		return NULL;
+	}
+
+	PyObject *module = PyModule_Create(&moduledef);
+	if (module == NULL) {
+		return NULL;
+	}
+
+	Py_INCREF(&Context);
+	PyModule_AddObject(module, "Context", (PyObject *)&Context);
+	return module;
 }

quickjs/__init__.py

@@ -3,3 +3,6 @@
 
 def test():
     return _quickjs.test()
+
+
+Context = _quickjs.Context

setup.py

@@ -1,6 +1,11 @@
 from distutils.core import setup, Extension
 
-_quickjs = Extension('_quickjs', sources=['module.c'])
+_quickjs = Extension('_quickjs',
+                     define_macros=[('CONFIG_VERSION', '"2019-07-09"')],
+                     sources=[
+                         'module.c', 'third-party/quickjs.c', 'third-party/cutils.c',
+                         'third-party/libregexp.c', 'third-party/libunicode.c'
+                     ])
 
 setup(name='quickjs',
       version='1.0',

test_quickjs.py

@@ -6,3 +6,34 @@
 class LoadModule(unittest.TestCase):
     def test_42(self):
         self.assertEqual(quickjs.test(), 42)
+
+
+class Context(unittest.TestCase):
+    def setUp(self):
+        self.context = quickjs.Context()
+
+    def test_eval_int(self):
+        self.assertEqual(self.context.eval("40 + 2"), 42)
+
+    def test_eval_float(self):
+        self.assertEqual(self.context.eval("40.0 + 2.0"), 42.0)
+
+    def test_eval_str(self):
+        self.assertEqual(self.context.eval("'4' + '2'"), "42")
+
+    def test_eval_bool(self):
+        self.assertEqual(self.context.eval("true || false"), True)
+
+    def test_eval_null(self):
+        self.assertIsNone(self.context.eval("null"))
+
+    def test_eval_undefined(self):
+        self.assertIsNone(self.context.eval("undefined"))
+
+    def test_wrong_type(self):
+        with self.assertRaises(TypeError):
+            self.assertEqual(self.context.eval(1), 42)
+
+    def test_context_between_calls(self):
+        self.context.eval("x = 40; y = 2;")
+        self.assertEqual(self.context.eval("x + y"), 42)