name/sortedname: Fix wrong sort inference.

Value for sending should be NameSort not VarSort.

Author: nickng

name/sortedname/infer.go

@@ -32,7 +32,7 @@ func InferSortsByUsage(p asyncpi.Process) error {
 	if err := upgrade(p); err != nil {
 		return errInferSort(errors.Wrap(err, "cannot upgrade process Names to SortedNames"))
 	}
-	nameVar := make(map[asyncpi.Name]bool)
+	isVarSort := make(map[asyncpi.Name]bool)
 	procs := []asyncpi.Process{p}
 	for len(procs) > 0 {
 		p, procs = procs[0], procs[1:]
@@ -45,7 +45,7 @@ func InferSortsByUsage(p asyncpi.Process) error {
 			procs = append(procs, p.Procs...)
 		case *asyncpi.Recv:
 			for i := range p.Vars {
-				nameVar[p.Vars[i]] = true
+				isVarSort[p.Vars[i]] = true
 				if s, canSetSort := p.Vars[i].(setter); canSetSort {
 					s.SetSort(VarSort)
 				} else {
@@ -55,17 +55,17 @@ func InferSortsByUsage(p asyncpi.Process) error {
 			procs = append(procs, p.Cont)
 		case *asyncpi.Send:
 			for i := range p.Vals {
-				if _, ok := nameVar[p.Vals[i]]; !ok {
-					nameVar[p.Vals[i]] = true
+				if _, ok := isVarSort[p.Vals[i]]; !ok { // if not seen
+					isVarSort[p.Vals[i]] = false
 					if s, canSetSort := p.Vals[i].(setter); canSetSort {
-						s.SetSort(VarSort)
+						s.SetSort(NameSort)
 					} else {
 						return errInferSort(asyncpi.ImmutableNameError{Name: p.Vals[i]})
 					}
 				}
 			}
 		case *asyncpi.Restrict:
-			nameVar[p.Name] = false // new name = not var
+			isVarSort[p.Name] = false // new name = not var
 			procs = append(procs, p.Proc)
 		default:
 			return errInferSort(asyncpi.UnknownProcessError{Proc: p})

name/sortedname/sortedname_test.go

@@ -45,11 +45,11 @@ func TestParSort(t *testing.T) {
 	}
 	t.Logf("fn(%s) = %s", p.Calculi(), p.FreeNames())
 	t.Logf("fv(%s) = %s", p.Calculi(), p.FreeVars())
-	if expect, got := 2, len(p.FreeNames()); expect != got {
+	if expect, got := 5, len(p.FreeNames()); expect != got {
 		t.Errorf("Expecting %s to have %d free names but got %d.",
 			p.Calculi(), expect, got)
 	}
-	if expect, got := 3, len(p.FreeVars()); expect != got {
+	if expect, got := 0, len(p.FreeVars()); expect != got {
 		t.Errorf("Expecting %s to have %d free vars but got %d",
 			p.Calculi(), expect, got)
 	}
@@ -65,11 +65,11 @@ func TestParSortOverlap(t *testing.T) {
 	}
 	t.Logf("fn(%s) = %s", p.Calculi(), p.FreeNames())
 	t.Logf("fv(%s) = %s", p.Calculi(), p.FreeVars())
-	if expect, got := 1, len(p.FreeNames()); expect != got {
+	if expect, got := 4, len(p.FreeNames()); expect != got {
 		t.Errorf("Expecting %s to have %d free names but got %d.",
 			p.Calculi(), expect, got)
 	}
-	if expect, got := 3, len(p.FreeVars()); expect != got {
+	if expect, got := 0, len(p.FreeVars()); expect != got {
 		t.Errorf("Expecting %s to have %d free vars but got %d.",
 			p.Calculi(), expect, got)
 	}
@@ -117,22 +117,18 @@ func TestSendSort(t *testing.T) {
 	}
 	t.Logf("fn(%s) = %s", p.Calculi(), p.FreeNames())
 	t.Logf("fv(%s) = %s", p.Calculi(), p.FreeVars())
-	if expect, got := 1, len(p.FreeNames()); expect != got {
+	if expect, got := 2, len(p.FreeNames()); expect != got {
 		t.Errorf("Expecting %s to have %d free names but got %d.",
 			p.Calculi(), expect, got)
 	}
 	if p.FreeNames()[0] != p.Chan {
 		t.Errorf("Expecting fn(%s) to be %s but got %s",
 			p.Calculi(), p.Chan, p.FreeNames()[0])
 	}
-	if expect, got := 1, len(p.FreeVars()); expect != got {
+	if expect, got := 0, len(p.FreeVars()); expect != got {
 		t.Errorf("Expecting %s to have %d free vars but got %d",
 			p.Calculi(), expect, got)
 	}
-	if p.FreeVars()[0] != p.Vals[0] {
-		t.Errorf("Expecting fv(%s) to be %s but got %s",
-			p.Calculi(), p.Vals[0], p.FreeVars()[0])
-	}
 }
 
 func TestRecvSort(t *testing.T) {