Browse Source

Fix object calls.

tags/v0.2
Ben Kurtovic 12 years ago
parent
commit
9993f1ba76
2 changed files with 15 additions and 17 deletions
  1. +15
    -16
      mwparserfromhell/parser/tokenizer.c
  2. +0
    -1
      mwparserfromhell/parser/tokenizer.h

+ 15
- 16
mwparserfromhell/parser/tokenizer.c View File

@@ -124,7 +124,7 @@ Tokenizer_push_textbuffer(Tokenizer* self)
PyDict_SetItemString(kwargs, "text", text); PyDict_SetItemString(kwargs, "text", text);
Py_DECREF(text); Py_DECREF(text);


PyObject* token = PyInstance_New(class, NOARGS, kwargs);
PyObject* token = PyObject_Call(class, NOARGS, kwargs);
Py_DECREF(class); Py_DECREF(class);
Py_DECREF(kwargs); Py_DECREF(kwargs);
if (!token) return -1; if (!token) return -1;
@@ -472,7 +472,7 @@ Tokenizer_parse_template(Tokenizer* self)
Py_DECREF(template); Py_DECREF(template);
return -1; return -1;
} }
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) { if (!token) {
Py_DECREF(template); Py_DECREF(template);
@@ -494,7 +494,7 @@ Tokenizer_parse_template(Tokenizer* self)


class = PyObject_GetAttrString(tokens, "TemplateClose"); class = PyObject_GetAttrString(tokens, "TemplateClose");
if (!class) return -1; if (!class) return -1;
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -531,7 +531,7 @@ Tokenizer_parse_argument(Tokenizer* self)
Py_DECREF(argument); Py_DECREF(argument);
return -1; return -1;
} }
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) { if (!token) {
Py_DECREF(argument); Py_DECREF(argument);
@@ -553,7 +553,7 @@ Tokenizer_parse_argument(Tokenizer* self)


class = PyObject_GetAttrString(tokens, "ArgumentClose"); class = PyObject_GetAttrString(tokens, "ArgumentClose");
if (!class) return -1; if (!class) return -1;
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -706,7 +706,7 @@ Tokenizer_handle_template_param(Tokenizer* self)


PyObject* class = PyObject_GetAttrString(tokens, "TemplateParamSeparator"); PyObject* class = PyObject_GetAttrString(tokens, "TemplateParamSeparator");
if (!class) return -1; if (!class) return -1;
PyObject* token = PyInstance_New(class, NOARGS, NOKWARGS);
PyObject* token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -754,7 +754,7 @@ Tokenizer_handle_template_param_value(Tokenizer* self)


PyObject* class = PyObject_GetAttrString(tokens, "TemplateParamEquals"); PyObject* class = PyObject_GetAttrString(tokens, "TemplateParamEquals");
if (!class) return -1; if (!class) return -1;
PyObject* token = PyInstance_New(class, NOARGS, NOKWARGS);
PyObject* token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -813,7 +813,7 @@ Tokenizer_handle_argument_separator(Tokenizer* self)


PyObject* class = PyObject_GetAttrString(tokens, "ArgumentSeparator"); PyObject* class = PyObject_GetAttrString(tokens, "ArgumentSeparator");
if (!class) return -1; if (!class) return -1;
PyObject* token = PyInstance_New(class, NOARGS, NOKWARGS);
PyObject* token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -870,7 +870,7 @@ Tokenizer_parse_wikilink(Tokenizer* self)
Py_DECREF(wikilink); Py_DECREF(wikilink);
return -1; return -1;
} }
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) { if (!token) {
Py_DECREF(wikilink); Py_DECREF(wikilink);
@@ -892,7 +892,7 @@ Tokenizer_parse_wikilink(Tokenizer* self)


class = PyObject_GetAttrString(tokens, "WikilinkClose"); class = PyObject_GetAttrString(tokens, "WikilinkClose");
if (!class) return -1; if (!class) return -1;
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -923,7 +923,7 @@ Tokenizer_handle_wikilink_separator(Tokenizer* self)


PyObject* class = PyObject_GetAttrString(tokens, "WikilinkSeparator"); PyObject* class = PyObject_GetAttrString(tokens, "WikilinkSeparator");
if (!class) return -1; if (!class) return -1;
PyObject* token = PyInstance_New(class, NOARGS, NOKWARGS);
PyObject* token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -1014,7 +1014,7 @@ Tokenizer_parse_heading(Tokenizer* self)
PyDict_SetItemString(kwargs, "level", level); PyDict_SetItemString(kwargs, "level", level);
Py_DECREF(level); Py_DECREF(level);


PyObject* token = PyInstance_New(class, NOARGS, kwargs);
PyObject* token = PyObject_Call(class, NOARGS, kwargs);
Py_DECREF(class); Py_DECREF(class);
Py_DECREF(kwargs); Py_DECREF(kwargs);
if (!token) { if (!token) {
@@ -1061,7 +1061,7 @@ Tokenizer_parse_heading(Tokenizer* self)


class = PyObject_GetAttrString(tokens, "HeadingEnd"); class = PyObject_GetAttrString(tokens, "HeadingEnd");
if (!class) return -1; if (!class) return -1;
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -1225,7 +1225,7 @@ Tokenizer_parse_comment(Tokenizer* self)
Py_DECREF(comment); Py_DECREF(comment);
return -1; return -1;
} }
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) { if (!token) {
Py_DECREF(comment); Py_DECREF(comment);
@@ -1247,7 +1247,7 @@ Tokenizer_parse_comment(Tokenizer* self)


class = PyObject_GetAttrString(tokens, "CommentEnd"); class = PyObject_GetAttrString(tokens, "CommentEnd");
if (!class) return -1; if (!class) return -1;
token = PyInstance_New(class, NOARGS, NOKWARGS);
token = PyObject_CallObject(class, NULL);
Py_DECREF(class); Py_DECREF(class);
if (!token) return -1; if (!token) return -1;


@@ -1436,7 +1436,6 @@ init_tokenizer(void)


EMPTY = PyUnicode_FromString(""); EMPTY = PyUnicode_FromString("");
NOARGS = PyTuple_New(0); NOARGS = PyTuple_New(0);
NOKWARGS = PyDict_New();


char* name = "mwparserfromhell.parser"; char* name = "mwparserfromhell.parser";
PyObject* globals = PyEval_GetGlobals(); PyObject* globals = PyEval_GetGlobals();


+ 0
- 1
mwparserfromhell/parser/tokenizer.h View File

@@ -40,7 +40,6 @@ static const int BAD_ROUTE = 1;


static PyObject* EMPTY; static PyObject* EMPTY;
static PyObject* NOARGS; static PyObject* NOARGS;
static PyObject* NOKWARGS;
static PyObject* tokens; static PyObject* tokens;






Loading…
Cancel
Save