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

bind: fix C99-ism 

Change-Id: I37a13cbea00303fb16a50a9d8479c74a982e6c5c
This commit is contained in:
Sebastien Binet 2015-08-12 18:17:38 +02:00
parent 4c77c90e70
commit cd92a1aee8
1 changed files with 32 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
bind/gencpy_type.go
View File

@ -281,7 +281,8 @@ func (g *cpyGen) genTypeInit(sym *symbol) {
g.impl.Outdent()
g.impl.Printf("}\n\n")
g.impl.Printf("for (Py_ssize_t i = 0; i < len; i++) {\n")
g.impl.Printf("Py_ssize_t i = 0;\n")
g.impl.Printf("for (i = 0; i < len; i++) {\n")
g.impl.Indent()
g.impl.Printf("PyObject *elt = PySequence_GetItem(arg, i);\n")
g.impl.Printf("if (cpy_func_%[1]s_ass_item(self, i, elt)) {\n", sym.id)
@ -305,23 +306,13 @@ func (g *cpyGen) genTypeInit(sym *symbol) {
g.impl.Printf("if (arg != NULL) {\n")
g.impl.Indent()
if false {
g.impl.Printf("if (!PyIter_Check(arg)) {\n")
g.impl.Indent()
g.impl.Printf("PyErr_SetString(PyExc_TypeError, ")
g.impl.Printf("\"%s.__init__ takes an iterable as argument\");\n", sym.goname)
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
} else {
g.impl.Printf("if (!PySequence_Check(arg)) {\n")
g.impl.Indent()
g.impl.Printf("PyErr_SetString(PyExc_TypeError, ")
g.impl.Printf("\"%s.__init__ takes a sequence as argument\");\n", sym.goname)
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
}
g.impl.Printf("if (!PySequence_Check(arg)) {\n")
g.impl.Indent()
g.impl.Printf("PyErr_SetString(PyExc_TypeError, ")
g.impl.Printf("\"%s.__init__ takes a sequence as argument\");\n", sym.goname)
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
typ := sym.GoType().Underlying().(*types.Slice)
esym := g.pkg.syms.symtype(typ.Elem())
@ -332,50 +323,31 @@ func (g *cpyGen) genTypeInit(sym *symbol) {
))
}
if false {
g.impl.Printf("PyObject *item = NULL;\n")
g.impl.Printf("while (item = PyIter_Next(arg)) {\n")
g.impl.Indent()
g.impl.Printf("if (cpy_func_%[1]s_append(self, item)) {\n", sym.id)
g.impl.Printf("Py_DECREF(item);\n")
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
g.impl.Printf("Py_DECREF(item);\n")
g.impl.Outdent()
g.impl.Printf("}\n\n") // while-loop
g.impl.Printf("Py_ssize_t len = PySequence_Size(arg);\n")
g.impl.Printf("if (len == -1) {\n")
g.impl.Indent()
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
g.impl.Printf("if (PyErr_Occurred()) {\n")
g.impl.Indent()
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
} else {
g.impl.Printf("Py_ssize_t len = PySequence_Size(arg);\n")
g.impl.Printf("if (len == -1) {\n")
g.impl.Indent()
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
g.impl.Printf("Py_ssize_t i = 0;\n")
g.impl.Printf("for (i = 0; i < len; i++) {\n")
g.impl.Indent()
g.impl.Printf("PyObject *elt = PySequence_GetItem(arg, i);\n")
g.impl.Printf("if (cpy_func_%[1]s_append(self, elt)) {\n", sym.id)
g.impl.Indent()
g.impl.Printf("Py_XDECREF(elt);\n")
g.impl.Printf(
"PyErr_SetString(PyExc_TypeError, \"invalid type (expected a %s)\");\n",
esym.goname,
)
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
g.impl.Printf("Py_XDECREF(elt);\n")
g.impl.Outdent()
g.impl.Printf("}\n\n") // for-loop
g.impl.Printf("for (Py_ssize_t i = 0; i < len; i++) {\n")
g.impl.Indent()
g.impl.Printf("PyObject *elt = PySequence_GetItem(arg, i);\n")
g.impl.Printf("if (cpy_func_%[1]s_append(self, elt)) {\n", sym.id)
g.impl.Indent()
g.impl.Printf("Py_XDECREF(elt);\n")
g.impl.Printf(
"PyErr_SetString(PyExc_TypeError, \"invalid type (expected a %s)\");\n",
esym.goname,
)
g.impl.Printf("goto cpy_label_%s_init_fail;\n", sym.cpyname)
g.impl.Outdent()
g.impl.Printf("}\n\n")
g.impl.Printf("Py_XDECREF(elt);\n")
g.impl.Outdent()
g.impl.Printf("}\n\n") // for-loop
}
g.impl.Outdent()
g.impl.Printf("}\n\n") // if-arg