Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-06-25 06:53:15 +05:30
parent 1d88cbb7ff
commit cc225a808a
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/calibre/gui2/tweak_book/editor/syntax/html.c
View File

@ -68,16 +68,26 @@ html_Tag_copy(html_Tag *self, PyObject *args, PyObject *kwargs) {
static PyObject * static PyObject *
html_Tag_compare(html_Tag *a, html_Tag *b, int op) { html_Tag_compare(html_Tag *a, html_Tag *b, int op) {
if (!PyObject_TypeCheck(a, &html_TagType) || !PyObject_TypeCheck(b, &html_TagType)) Py_RETURN_FALSE; if (!PyObject_TypeCheck(a, &html_TagType) || !PyObject_TypeCheck(b, &html_TagType)) {
switch (op) { switch (op) {
case Py_EQ: case Py_EQ:
if (COMPARE(name, Py_EQ) && COMPARE(lang, Py_EQ)) Py_RETURN_TRUE; Py_RETURN_FALSE;
Py_RETURN_FALSE; case Py_NE:
case Py_NE: Py_RETURN_TRUE;
if (COMPARE(name, Py_NE) || COMPARE(lang, Py_NE)) Py_RETURN_TRUE; default:
Py_RETURN_FALSE; break;
default: }
break; } else {
switch (op) {
case Py_EQ:
if (COMPARE(name, Py_EQ) && COMPARE(lang, Py_EQ)) Py_RETURN_TRUE;
Py_RETURN_FALSE;
case Py_NE:
if (COMPARE(name, Py_NE) || COMPARE(lang, Py_NE)) Py_RETURN_TRUE;
Py_RETURN_FALSE;
default:
break;
}
} }
PyErr_SetString(PyExc_TypeError, "Only equals comparison is supported for Tag objects"); PyErr_SetString(PyExc_TypeError, "Only equals comparison is supported for Tag objects");
return NULL; return NULL;
@ -278,16 +288,26 @@ end:
static PyObject * static PyObject *
html_State_compare(html_State *a, html_State *b, int op) { html_State_compare(html_State *a, html_State *b, int op) {
if (!PyObject_TypeCheck(a, &html_StateType) || !PyObject_TypeCheck(b, &html_StateType)) Py_RETURN_FALSE; if (!PyObject_TypeCheck(a, &html_StateType) || !PyObject_TypeCheck(b, &html_StateType)) {
switch (op) { switch (op) {
case Py_EQ: case Py_EQ:
if (COMPARE(parse, Py_EQ) && COMPARE(sub_parser_state, Py_EQ) && COMPARE(tag_being_defined, Py_EQ) && COMPARE(attribute_name, Py_EQ) && COMPARE(tags, Py_EQ)) Py_RETURN_TRUE; Py_RETURN_FALSE;
Py_RETURN_FALSE; case Py_NE:
case Py_NE: Py_RETURN_TRUE;
if (COMPARE(parse, Py_NE) || COMPARE(sub_parser_state, Py_NE) || COMPARE(tag_being_defined, Py_NE) || COMPARE(attribute_name, Py_NE) || COMPARE(tags, Py_NE)) Py_RETURN_TRUE; default:
Py_RETURN_FALSE; break;
default: }
break; } else {
switch (op) {
case Py_EQ:
if (COMPARE(parse, Py_EQ) && COMPARE(sub_parser_state, Py_EQ) && COMPARE(tag_being_defined, Py_EQ) && COMPARE(attribute_name, Py_EQ) && COMPARE(tags, Py_EQ)) Py_RETURN_TRUE;
Py_RETURN_FALSE;
case Py_NE:
if (COMPARE(parse, Py_NE) || COMPARE(sub_parser_state, Py_NE) || COMPARE(tag_being_defined, Py_NE) || COMPARE(attribute_name, Py_NE) || COMPARE(tags, Py_NE)) Py_RETURN_TRUE;
Py_RETURN_FALSE;
default:
break;
}
} }
PyErr_SetString(PyExc_TypeError, "Only equals comparison is supported for State objects"); PyErr_SetString(PyExc_TypeError, "Only equals comparison is supported for State objects");
return NULL; return NULL;