Rooba
/
dukpy
mirror of https://github.com/amol-/dukpy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More love for VisualStudio

This commit is contained in:
Alessandro Molina 2018-04-09 22:51:51 +02:00
parent ed5374002a
commit 7e8f680c24
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pyduktape.c
View File

@ -25,19 +25,25 @@ static PyObject *DukPy_create_context(PyObject *self, PyObject *_) {
static PyObject *DukPy_eval_string(PyObject *self, PyObject *args) { static PyObject *DukPy_eval_string(PyObject *self, PyObject *args) {
PyObject *interpreter; PyObject *interpreter;
PyObject *pyctx;
duk_context *ctx;
const char *command; const char *command;
const char *vars; const char *vars;
int res;
duk_int_t rc;
const char *output;
PyObject *result;
if (!PyArg_ParseTuple(args, CONDITIONAL_PY3("Oyy", "Oss"), &interpreter, &command, &vars)) if (!PyArg_ParseTuple(args, CONDITIONAL_PY3("Oyy", "Oss"), &interpreter, &command, &vars))
return NULL; return NULL;
PyObject *pyctx = PyObject_GetAttrString(interpreter, "_ctx"); pyctx = PyObject_GetAttrString(interpreter, "_ctx");
if (!pyctx) { if (!pyctx) {
PyErr_SetString(DukPyError, "Missing dukpy interpreter context"); PyErr_SetString(DukPyError, "Missing dukpy interpreter context");
return NULL; return NULL;
} }
duk_context *ctx = get_context_from_capsule(pyctx); ctx = get_context_from_capsule(pyctx);
if (!ctx) { if (!ctx) {
PyErr_SetString(DukPyError, "Invalid dukpy interpreter context"); PyErr_SetString(DukPyError, "Invalid dukpy interpreter context");
return NULL; return NULL;
@ -64,7 +70,7 @@ static PyObject *DukPy_eval_string(PyObject *self, PyObject *args) {
duk_push_c_function(ctx, require_set_module_id, 2); duk_push_c_function(ctx, require_set_module_id, 2);
duk_put_global_string(ctx, "_require_set_module_id"); duk_put_global_string(ctx, "_require_set_module_id");
int res = duk_peval_string(ctx, command); res = duk_peval_string(ctx, command);
if (res != 0) { if (res != 0) {
duk_get_prop_string(ctx, -1, "stack"); duk_get_prop_string(ctx, -1, "stack");
PyErr_SetString(DukPyError, duk_safe_to_string(ctx, -1)); PyErr_SetString(DukPyError, duk_safe_to_string(ctx, -1));
@ -72,15 +78,15 @@ static PyObject *DukPy_eval_string(PyObject *self, PyObject *args) {
return NULL; return NULL;
} }
duk_int_t rc = duk_safe_call(ctx, stack_json_encode, 1, 1); rc = duk_safe_call(ctx, stack_json_encode, 1, 1);
if (rc != DUK_EXEC_SUCCESS) { if (rc != DUK_EXEC_SUCCESS) {
PyErr_SetString(DukPyError, duk_safe_to_string(ctx, -1)); PyErr_SetString(DukPyError, duk_safe_to_string(ctx, -1));
duk_pop(ctx); duk_pop(ctx);
return NULL; return NULL;
} }
const char *output = duk_get_string(ctx, -1); output = duk_get_string(ctx, -1);
PyObject *result = Py_BuildValue(CONDITIONAL_PY3("y", "s"), output); result = Py_BuildValue(CONDITIONAL_PY3("y", "s"), output);
duk_pop(ctx); duk_pop(ctx);
return result; return result;