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

support subslicing of slices that returns the new Go slice -- was just returning a Python list from elements -- Go-based code then broke with that.

This commit is contained in:
Randall C. O'Reilly 2020-09-11 05:12:53 -07:00
parent 7c8a930907
commit f802d38242
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bind/gen_slice.go
View File

@ -75,6 +75,11 @@ func (g *pyGen) genSliceInit(slc *symbol, extTypes, pyWrapOnly bool, slob *Slice
gocl = ""
}
pysnm := slc.id
if !strings.Contains(pysnm, "Slice_") {
pysnm = strings.TrimPrefix(pysnm, pkgname+"_")
}
if !extTypes || pyWrapOnly {
g.pywrap.Printf("def __init__(self, *args, **kwargs):\n")
g.pywrap.Indent()
@ -154,6 +159,22 @@ otherwise parameter is a python list that we copy from
g.pywrap.Indent()
g.pywrap.Printf("if isinstance(key, slice):\n")
g.pywrap.Indent()
if slc.isSlice() {
g.pywrap.Printf("if key.step == None or key.step == 1:\n")
g.pywrap.Indent()
g.pywrap.Printf("st = key.start\n")
g.pywrap.Printf("ed = key.stop\n")
g.pywrap.Printf("if st == None:\n")
g.pywrap.Indent()
g.pywrap.Printf("st = 0\n")
g.pywrap.Outdent()
g.pywrap.Printf("if ed == None:\n")
g.pywrap.Indent()
g.pywrap.Printf("ed = _%s_len(self.handle)\n", qNm)
g.pywrap.Outdent()
g.pywrap.Printf("return %s(handle=_%s_subslice(self.handle, st, ed))\n", pysnm, qNm)
g.pywrap.Outdent()
}
g.pywrap.Printf("return [self[ii] for ii in range(*key.indices(len(self)))]\n")
g.pywrap.Outdent()
g.pywrap.Printf("elif isinstance(key, int):\n")
@ -294,6 +315,19 @@ otherwise parameter is a python list that we copy from
g.pybuild.Printf("mod.add_function('%s_elem', retval('%s'), [param('%s', 'handle'), param('int', 'idx')])\n", slNm, esym.cpyname, PyHandle)
if slc.isSlice() {
g.gofile.Printf("//export %s_subslice\n", slNm)
g.gofile.Printf("func %s_subslice(handle CGoHandle, _st, _ed int) CGoHandle {\n", slNm)
g.gofile.Indent()
g.gofile.Printf("s := deptrFromHandle_%s(handle)\n", slNm)
g.gofile.Printf("ss := s[_st:_ed]\n")
g.gofile.Printf("return CGoHandle(handleFromPtr_%s(&ss))\n", slNm)
g.gofile.Outdent()
g.gofile.Printf("}\n\n")
g.pybuild.Printf("mod.add_function('%s_subslice', retval('%s'), [param('%s', 'handle'), param('int', 'st'), param('int', 'ed')])\n", slNm, PyHandle, PyHandle)
}
g.gofile.Printf("//export %s_set\n", slNm)
g.gofile.Printf("func %s_set(handle CGoHandle, _idx int, _vl %s) {\n", slNm, esym.cgoname)
g.gofile.Indent()