More RAII plzkthx.

Moving towards implementing simplifications using C++ RAII awesomeness.
davisp · Jul 27, 2009 · 3eec0ef · 3eec0ef
1 parent 80b5ab7
commit 3eec0ef
Show file tree

Hide file tree

Showing 16 changed files with 418 additions and 588 deletions.
diff --git a/spidermonkey/convert/array.cpp b/spidermonkey/convert/array.cpp
@@ -1,4 +1,4 @@
-#include <spidermonkey.h>
+#include "convert.h"
 
 PyObject*
 js2py_array(Context* cx, jsval val)

diff --git a/spidermonkey/convert/convert.cpp b/spidermonkey/convert/convert.cpp
@@ -6,7 +6,9 @@
  *
  */
 
-#include <spidermonkey.h>
+#include <jsapi.h>
+#include "convert.h"
+#include "python/python.h"
 
 jsval
 py2js(Context* cx, PyObject* obj)

diff --git a/spidermonkey/convert/double.cpp b/spidermonkey/convert/double.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <spidermonkey.h>
+#include "convert.h"
 
 jsval
 py2js_double(Context* cx, PyObject* obj)

diff --git a/spidermonkey/convert/function.cpp b/spidermonkey/convert/function.cpp
@@ -1,5 +1,5 @@
 
-#include <spidermonkey.h>
+#include "convert.h"
 
 PyObject*
 js2py_function(Context* cx, jsval val, jsval parent)

diff --git a/spidermonkey/convert/integer.cpp b/spidermonkey/convert/integer.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <spidermonkey.h>
+#include "convert.h"
 
 jsval
 py2js_integer(Context* cx, PyObject* obj)

diff --git a/spidermonkey/convert/object.cpp b/spidermonkey/convert/object.cpp
@@ -1,5 +1,6 @@
 
-#include <spidermonkey.h>
+#include "convert.h"
+#include "javascript/javascript.h"
 
 jsval
 py2js_object(Context* cx, PyObject* pyobj)

diff --git a/spidermonkey/convert/string.cpp b/spidermonkey/convert/string.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <spidermonkey.h>
+#include "convert.h"
 
 JSString*
 py2js_string_obj(Context* cx, PyObject* str)

diff --git a/spidermonkey/javascript/error.cpp b/spidermonkey/javascript/error.cpp
@@ -9,66 +9,52 @@
 #include <spidermonkey.h>
 #include "frameobject.h"
 
+JSBool
+js_error(JSContext* cx, const char* err)
+{
+    JS_ReportError(cx, err);
+    return JS_FALSE;
+}
+
 void
 add_frame(const char* srcfile, const char* funcname, int linenum)
 {
-    PyObject* src = NULL;
-    PyObject* func = NULL;
-    PyObject* glbl = NULL;
-    PyObject* tpl = NULL;
-    PyObject* str = NULL;
-    PyCodeObject* code = NULL;
-    PyFrameObject* frame = NULL;
+    PyObjectXDR src = PyString_FromString(srcfile);
+    PyObjectXDR func = PyString_FromString(funcname);
+    PyObjectXDR tpl = PyTuple_New(0);
+    PyObjectXDR str = PyString_FromString("");
 
-    src = PyString_FromString(srcfile);
-    if(src == NULL) goto error;
-
-    func = PyString_FromString(funcname);
-    if(func == NULL) goto error;
-
-    glbl = PyModule_GetDict(SpidermonkeyModule);
-    if(glbl == NULL) goto error;
+    // This is a borrowed reference, hence no PyObjectXDR so we
+    // don't decref it.
+    PyPtr<PyObject> glbl = PyModule_GetDict(SpidermonkeyModule);
 
-    tpl = PyTuple_New(0);
-    if(tpl == NULL) goto error;
+    if(!src || !func || !glbl || !tpl || !str) return;
 
-    str = PyString_FromString("");
-    if(str == NULL) goto error;
-
-    code = PyCode_New(
+    PyCodeXDR code = PyCode_New(
         0,                      /*co_argcount*/
         0,                      /*co_nlocals*/
         0,                      /*co_stacksize*/
         0,                      /*co_flags*/
-        str,                    /*co_code*/
-        tpl,                    /*co_consts*/
-        tpl,                    /*co_names*/
-        tpl,                    /*co_varnames*/
-        tpl,                    /*co_freevars*/
-        tpl,                    /*co_cellvars*/
-        src,                    /*co_filename*/
-        func,                   /*co_name*/
+        str.get(),              /*co_code*/
+        tpl.get(),              /*co_consts*/
+        tpl.get(),              /*co_names*/
+        tpl.get(),              /*co_varnames*/
+        tpl.get(),              /*co_freevars*/
+        tpl.get(),              /*co_cellvars*/
+        src.get(),              /*co_filename*/
+        func.get(),             /*co_name*/
         linenum,                /*co_firstlineno*/
-        str                     /*co_lnotab*/
+        str.get()               /*co_lnotab*/
     );
-    if(code == NULL) goto error;
+    if(!code) return;
 
-    frame = PyFrame_New(PyThreadState_Get(), code, glbl, NULL);
-    if(frame == NULL) goto error;
+    PyFrameXDR frame = PyFrame_New(
+        PyThreadState_Get(), code.get(), glbl.get(), NULL
+    );
+    if(!frame) return;
 
     frame->f_lineno = linenum;
-    PyTraceBack_Here(frame);
-
-    goto success;
-
-error:
-success:
-    Py_XDECREF(func);
-    Py_XDECREF(src);
-    Py_XDECREF(tpl);
-    Py_XDECREF(str);
-    Py_XDECREF(code);
-    Py_XDECREF(frame);
+    PyTraceBack_Here(frame.get());
 }
 
 void