Rename GateDef -> Gate

evaluator/env.go

@@ -13,7 +13,7 @@ type Environ struct {
 	Bit       *Bit
 	Qubit     *Qubit
 	Const     Const
-	GateDef   GateDef
+	Gate      Gate
 	Modifier  []ast.Modifier
 	Decl      []ast.Decl
 	CtrlQArgs []ast.Expr
@@ -25,7 +25,7 @@ func NewEnviron() *Environ {
 		Outer:     nil,
 		Bit:       NewBit(),
 		Qubit:     NewQubit(),
-		GateDef:   make(map[string]ast.Decl),
+		Gate:      make(map[string]ast.Decl),
 		Const:     make(map[string]object.Object),
 		Modifier:  make([]ast.Modifier, 0),
 		Decl:      make([]ast.Decl, 0),
@@ -39,18 +39,18 @@ func (e *Environ) NewEnclosed(decl ast.Decl, mod []ast.Modifier) *Environ {
 		Outer:    e,
 		Bit:      NewBit(),
 		Qubit:    NewQubit(),
-		GateDef:  e.GateDef,
+		Gate:     e.Gate,
 		Const:    e.Const,
 		Modifier: mod,
 		Decl:     append(e.Decl, decl),
 	}
 }
 
 func (e *Environ) String() string {
-	return fmt.Sprintf("gatedef: %v, const: %v, bit: %v, qubit: %v, modifier: %v, decl: %v", e.GateDef, e.Const, e.Bit, e.Qubit, e.Modifier, e.Decl)
+	return fmt.Sprintf("gate: %v, const: %v, bit: %v, qubit: %v, modifier: %v, decl: %v", e.Gate, e.Const, e.Bit, e.Qubit, e.Modifier, e.Decl)
 }
 
-type GateDef map[string]ast.Decl
+type Gate map[string]ast.Decl
 
 type Const map[string]object.Object
 

evaluator/env_test.go

@@ -67,5 +67,5 @@ func ExampleEnviron() {
 	fmt.Println(env)
 
 	// Output:
-	// gatedef: map[], const: map[], bit: [], map[], qubit: [], map[], modifier: [], decl: []
+	// gate: map[], const: map[], bit: [], map[], qubit: [], map[], modifier: [], decl: []
 }

evaluator/evaluator.go

@@ -137,11 +137,11 @@ func (e *Evaluator) eval(n ast.Node, env *Environ) (obj object.Object, err error
 		return &object.Nil{}, e.GenDecl(n, env)
 
 	case *ast.GateDecl:
-		env.GateDef[ast.Must(ast.Ident(n))] = n
+		env.Gate[ast.Must(ast.Ident(n))] = n
 		return &object.Nil{}, nil
 
 	case *ast.FuncDecl:
-		env.GateDef[ast.Must(ast.Ident(n))] = n
+		env.Gate[ast.Must(ast.Ident(n))] = n
 		return &object.Nil{}, nil
 
 	case *ast.IdentExpr:
@@ -671,7 +671,7 @@ func (e *Evaluator) ModifyU(mod []ast.Modifier, u matrix.Matrix, env *Environ) m
 }
 
 func (e *Evaluator) Call(x *ast.CallExpr, outer *Environ) (object.Object, error) {
-	f, ok := outer.GateDef[x.Name]
+	f, ok := outer.Gate[x.Name]
 	if !ok {
 		return nil, fmt.Errorf("decl=%v not found", x.Name)
 	}