Export Name testing interfaces.

Author: nickng

internal/name/interface.go

@@ -0,0 +1,25 @@
+// Copyright 2018 Nicholas Ng <[email protected]>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package name
+
+// Setter means a name is mutable (can change Name).
+type Setter interface {
+	SetName(string)
+}
+
+// TypeHinter means a name has associated type-hint.
+type TypeHinter interface {
+	TypeHint() string
+}

name/interface.go

@@ -0,0 +1,19 @@
+// Copyright 2018 Nicholas Ng <[email protected]>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package name
+
+type Setter interface {
+	SetName(string)
+}

name/interface_test.go

@@ -0,0 +1,15 @@
+package name
+
+import (
+	"testing"
+
+	"go.nickng.io/asyncpi/internal/name"
+)
+
+// This test ensures the Setter is in sync with internal version.
+func TestSetterSync(t *testing.T) {
+	var n Setter = name.New("base")
+	if _, ok := n.(name.Setter); !ok {
+		t.Fatalf("asyncpi/name.Setter and asyncpi/internal/name.Setter out of sync")
+	}
+}

name/uniq.go

@@ -20,10 +20,6 @@ import (
 	"go.nickng.io/asyncpi"
 )
 
-type setter interface {
-	SetName(string)
-}
-
 func MakeNamesUnique(p asyncpi.Process) error {
 	if err := Walk(new(uniqueNamer), p); err != nil {
 		return err
@@ -45,7 +41,7 @@ func (u *uniqueNamer) VisitName(n asyncpi.Name) error {
 	}
 	s := fmt.Sprintf("%s_%d", n.Ident(), len(u.names))
 	u.names[n] = s
-	if uniq, canSetName := n.(setter); canSetName {
+	if uniq, canSetName := n.(Setter); canSetName {
 		uniq.SetName(s)
 		return nil
 	}

names.go

@@ -14,14 +14,6 @@ func newNames(names ...string) []Name {
 	return pn
 }
 
-type TypeHinter interface {
-	TypeHint() string
-}
-
-type nameSetter interface {
-	SetName(string)
-}
-
 // freeNameser is an interface which Name should
 // provide to have custom FreeNames implementation.
 type freeNameser interface {

reduce.go

@@ -2,6 +2,8 @@ package asyncpi
 
 import (
 	"fmt"
+
+	"go.nickng.io/asyncpi/internal/name"
 )
 
 // Subst is the substitution of variables xs by names vs in Process p.
@@ -22,13 +24,13 @@ func Subst(p Process, vs, xs []Name) error {
 		case *Recv:
 			for i, x := range xs {
 				if IsSameName(p.Chan, x) {
-					if ch, canSetName := p.Chan.(nameSetter); canSetName {
+					if ch, canSetName := p.Chan.(name.Setter); canSetName {
 						ch.SetName(vs[i].Ident())
 					}
 				}
 				for _, rv := range p.Vars {
 					if IsSameName(rv, x) {
-						if ch, canSetName := rv.(nameSetter); canSetName {
+						if ch, canSetName := rv.(name.Setter); canSetName {
 							ch.SetName(vs[i].Ident())
 						}
 					}
@@ -42,7 +44,7 @@ func Subst(p Process, vs, xs []Name) error {
 		case *Send:
 			for i, x := range xs {
 				if IsSameName(p.Chan, x) {
-					if ch, canSetName := p.Chan.(nameSetter); canSetName {
+					if ch, canSetName := p.Chan.(name.Setter); canSetName {
 						ch.SetName(vs[i].Ident())
 					}
 				}

types/name.go

@@ -16,6 +16,7 @@ package types
 
 import (
 	"go.nickng.io/asyncpi"
+	"go.nickng.io/asyncpi/internal/name"
 )
 
 // TypedName is a typed wrapper for Name.
@@ -65,7 +66,7 @@ func AttachType(n asyncpi.Name) TypedName {
 		return tn
 	}
 	// Use type hint
-	if th, hasHint := n.(asyncpi.TypeHinter); hasHint {
+	if th, hasHint := n.(name.TypeHinter); hasHint {
 		tn := newTypedName(n)
 		tn.setType(NewBase(th.TypeHint()))
 		return tn