Working quite a bit as expected. But, some memory corruption is causing un-expected memory freeing and crashes.

Author: nishant-rudderstack

_examples/multireturn/multireturn.go

@@ -13,6 +13,11 @@ func SingleWithoutErrorFunc() int {
 	return 100
 }
 
+/////////////// Single Str WithoutError Return //////////////
+func SingleStrWithoutErrorFunc(vargs ...int) string {
+	return "150"
+}
+
 /////////////// Single WithError Return //////////////
 func SingleWithErrorFunc(throwError bool) error {
 	if throwError {
@@ -37,7 +42,10 @@ func DoubleWithErrorFunc(throwError bool) (string, error) {
 }
 
 /////////////// Triple Returns Without Error //////////////
-func TripleWithoutErrorFunc(vargs ...int) (int, string, int) {
+func TripleWithoutErrorFunc1(vargs ...int) (int, int, int) {
+	return 600, 700, 800
+}
+func TripleWithoutErrorFunc2(vargs ...int) (int, string, int) {
 	return 600, "700", 800
 }
 

_examples/multireturn/test.py

@@ -11,34 +11,49 @@
 oneResult = multireturn.SingleWithoutErrorFunc()
 print("Single WithoutError Return %r" % oneResult)
 
+############### Single Str WithoutError Return ##############
+oneStrResult = multireturn.SingleStrWithoutErrorFunc()
+print("Single Str WithoutError Return %r" % oneStrResult)
+
 ############### Single WithError Return ##############
 errorFalseResult = multireturn.SingleWithErrorFunc(False)
 print("Single WithError(False) Return %r" % errorFalseResult)
 
-errorTrueResult = multireturn.SingleWithErrorFunc(True)
-print("Single WithError(True) Return %r" % errorTrueResult)
+try:
+	errorTrueResult = multireturn.SingleWithErrorFunc(True)
+	print("Failed to throw an exception")
+except RuntimeError as ex:
+	print("Single WithError(True). Exception:%r" % ex)
 
 ############### Double WithoutError Return ##############
 twoResults = multireturn.DoubleWithoutErrorFunc()
-print("Double WithoutError Return %r" % twoResults)
+print("Double WithoutError Return (%r, %r)" % twoResults)
 
 ############### Double WithError Return ##############
-(value400, errorTrueResult) = multireturn.DoubleeWithErrorFunc(True)
-print("Double WithError(True) Return (%r, %r)" % (value400, errorTrueResult))
+try:
+	value400 = multireturn.DoubleWithErrorFunc(True)
+	print("Failed to throw an exception. Return (%r, %r)." % value400)
+except RuntimeError as ex:
+	print("Double WithError(True). exception Return %r" % ex)
 
-(value500, errorFalseResult) = multireturn.DoubleWithErrorFunc(False)
-print("Double WithError(False) Return (%r, %r)" % (value500, errorFalseResult))
+value500 = multireturn.DoubleWithErrorFunc(False)
+print("Double WithError(False) Return %r" % value500)
 
 ############### Triple Without Error Return ##############
-threeResults = multireturn.TripleWithoutErrorFunc()
-print("Triple WithoutError Return %r" % threeResult)
+threeResults = multireturn.TripleWithoutErrorFunc1()
+print("Triple WithoutError(Without String) Return (%r, %r, %r)" % threeResults)
+
+threeResults = multireturn.TripleWithoutErrorFunc2()
+print("Triple WithoutError(With String) Return (%r, %r, %r)" % threeResults)
 
 ############### Triple With Error Return ##############
-(value900, value1000, errorTrueResult) = multireturn.TripleWithErrorFunc(True)
-print("Triple WithError(True) Return (%r, %r, %r)" % (value900, value1000, errorFalseResult))
+try:
+	(value900, value1000, errorTrueResult) = multireturn.TripleWithErrorFunc(True)
+except RuntimeError as ex:
+	print("Triple WithError(True). exception Return %r" % ex)
 
-(value1100, value1200, errorFalseResult) = multireturn.TripleWithErrorFunc(False)
-print("Triple WithError(False) Return (%r, %r, %r)" % (value1100, value1200, errorFalseResult))
+(value1100, value1200) = multireturn.TripleWithErrorFunc(False)
+print("Triple WithError(False) Return (%r, %r)" % (value1100, value1200))
 
 ############### Triple Struct Return With Error ##############
 (ptr1300, struct1400, errorTrueResult) = multireturn.TripleWithStructWithErrorFunc(True)

bind/gen_func.go

@@ -379,18 +379,23 @@ if __err != nil {
 	}
 
 	pyFuncCall := fmt.Sprintf("_%s.%s(%s)", pkgname, mnm, strings.Join(wrapArgs, ", "))
-	if nres > 0 {
+	if npyres > 0 {
 		retvars := make([]string, nres, nres)
 		for i := 0; i < npyres; i++ {
 			retvars[i] = "ret" + strconv.Itoa(i)
 			if res[i].sym.hasHandle() {
 				retvars[i] = "_" + retvars[i]
 			}
 		}
+
 		if fsym.haserr {
+			// Only used if npyres == nres.
 			retvars[nres-1] = "__err"
 		}
 
+		// May drop the error var, if it is not supposed to be returned.
+		retvars = retvars[0:npyres]
+
 		// Call upstream method and collect returns.
 		g.pywrap.Printf(fmt.Sprintf("%s = %s\n", strings.Join(retvars, ", "), pyFuncCall))
 

main_test.go

@@ -840,12 +840,14 @@ func TestBindMultiReturn(t *testing.T) {
 		extras: nil,
 		want: []byte(`No Return None
 Single WithoutError Return 100
+Single Str WithoutError Return 150
 Single WithError(False) Return nil
-Single WithError(True) Return 'Error'
+Single WithError(True). Exception: 'Error'
 Double WithoutError Return (200,300)
-Double WithError(True) Return (400, Error)
+Double WithError(True). Return (400, Error)
 Double WithError(False) Return (500, nil)
-Triple WithoutError Return (600, 700, 800)
+Triple WithoutError(Without String) Return (600, 700, 800)
+Triple WithoutError(With String) Return (600, 700, 800)
 Triple WithError(True) Return (900, 1000, Error)
 Triple WithError(False) Return (1100, 1200, nil)
 Triple WithError(True) Return (1300, 1400, Error)