Internal renaming for code clarity (#28)

* returned -> recevied

* minor fix

* minor cleanup

Author: muir

bind.go

@@ -350,7 +350,7 @@ func doBind(sc *Collection, originalInvokeF *provider, originalInitF *provider,
 			return err
 		}
 
-		inMap, err := generateInputMapper(invokeF, 0, returnedParams, invokeF.upRmap, upVmap, "invoke results")
+		inMap, err := generateInputMapper(invokeF, 0, receviedParams, invokeF.upRmap, upVmap, "invoke results")
 		if err != nil {
 			return err
 		}

characterize.go

@@ -13,7 +13,7 @@ type charContext struct {
 	inputsAreStatic bool
 }
 
-type flowMapType [bypassParams + 1][]typeCode
+type flowMapType [lastFlowType][]typeCode
 
 type characterization struct {
 	name   string
@@ -207,7 +207,7 @@ var invokeRegistry = typeRegistry{
 			a.fm.group = invokeGroup
 			a.fm.class = invokeFunc
 			a.fm.flows[outputParams] = toTypeCodes(typesIn(a.t.Elem()))
-			a.fm.flows[returnedParams] = toTypeCodes(typesOut(a.t.Elem()))
+			a.fm.flows[receviedParams] = toTypeCodes(typesOut(a.t.Elem()))
 			a.fm.required = true
 			a.fm.isSynthetic = true
 		},
@@ -464,7 +464,7 @@ var handlerRegistry = typeRegistry{
 			a.fm.flows[inputParams] = toTypeCodes(in)
 			a.fm.flows[outputParams] = toTypeCodes(typesIn(a.t.In(0)))
 			a.fm.flows[returnParams] = toTypeCodes(typesOut(a.t))
-			a.fm.flows[returnedParams] = toTypeCodes(typesOut(a.t.In(0)))
+			a.fm.flows[receviedParams] = toTypeCodes(typesOut(a.t.In(0)))
 		},
 	},
 

characterize_test.go

@@ -52,7 +52,7 @@ type doesJ struct {
 func (dj *doesJ) I() int { return dj.j * 3 }
 
 func params() flowMapType {
-	return [bypassParams + 1][]typeCode{}
+	return [lastFlowType][]typeCode{}
 }
 
 func (flows flowMapType) returns(f ...typeCode) flowMapType {
@@ -71,7 +71,7 @@ func (flows flowMapType) output(f ...typeCode) flowMapType {
 }
 
 func (flows flowMapType) returned(f ...typeCode) flowMapType {
-	flows[returnedParams] = f
+	flows[receviedParams] = f
 	return flows
 }
 

generate.go

@@ -186,7 +186,7 @@ func generateWrappers(
 		if err != nil {
 			return err
 		}
-		retMap, err := generateInputMapper(fm, 0, returnedParams, fm.upRmap, upVmap, "ret(w)") // return values from inner()
+		retMap, err := generateInputMapper(fm, 0, receviedParams, fm.upRmap, upVmap, "ret(w)") // return values from inner()
 		if err != nil {
 			return err
 		}
@@ -199,8 +199,8 @@ func generateWrappers(
 			vCopy := v.Copy()
 			callCount := 0
 
-			rTypes := make([]reflect.Type, len(fm.flows[returnedParams]))
-			for i, tc := range fm.flows[returnedParams] {
+			rTypes := make([]reflect.Type, len(fm.flows[receviedParams]))
+			for i, tc := range fm.flows[receviedParams] {
 				rTypes[i] = tc.Type()
 			}
 

include.go

@@ -351,11 +351,11 @@ func providesReturns(funcs []*provider, initF *provider) error {
 			debugf("\tskipping on upward path %s: %s", fm, fm.cannotInclude)
 			continue
 		}
-		err := requireParameters(fm, returns, returnedParams, returnParams, fm.upRmap, "expected return")
+		err := requireParameters(fm, returns, receviedParams, returnParams, fm.upRmap, "expected return")
 		if err != nil {
 			return err
 		}
-		provideParameters(fm, returns, returnParams, returnedParams, len(funcs)-i+2)
+		provideParameters(fm, returns, returnParams, receviedParams, len(funcs)-i+2)
 	}
 	return nil
 }
@@ -457,7 +457,7 @@ func proposeEliminations(funcs []*provider) []*provider {
 		useLast    bool
 	}{
 		{"down", []flowType{inputParams, bypassParams}, true},
-		{"up", []flowType{returnedParams}, false},
+		{"up", []flowType{receviedParams}, false},
 	} {
 		keep := make([]bool, len(funcs))
 		toKeep := make([]*provider, 0, len(funcs))

stringer_generated.go

@@ -90,8 +90,8 @@ const (
 	outputParams // outputs
 	// recevied from above
 	inputParams // inputs
-	// received from below
-	returnedParams // returned
+	// received from below (callee returned)
+	receviedParams // recevied
 	// returned from init
 	bypassParams // bypass
 	//