From 75224ed03123103d28b2aeedbd4cafb3142ae7d8 Mon Sep 17 00:00:00 2001 From: Michael McLoughlin Date: Wed, 2 Jan 2019 21:55:43 -0800 Subject: [PATCH] build: remove Build stutter from BuildConstraint* Address golint failure. --- build/context.go | 10 +++++----- build/global.go | 6 +++--- printer/goasm_test.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/context.go b/build/context.go index 948e042..384f081 100644 --- a/build/context.go +++ b/build/context.go @@ -47,7 +47,7 @@ func (c *Context) Package(path string) { c.pkg = pkg } -func (c *Context) BuildConstraints(t buildtags.ConstraintsConvertable) { +func (c *Context) Constraints(t buildtags.ConstraintsConvertable) { cs := t.ToConstraints() if err := cs.Validate(); err != nil { c.AddError(err) @@ -56,17 +56,17 @@ func (c *Context) BuildConstraints(t buildtags.ConstraintsConvertable) { c.file.Constraints = cs } -func (c *Context) BuildConstraint(t buildtags.ConstraintConvertable) { - c.BuildConstraints(append(c.file.Constraints, t.ToConstraint())) +func (c *Context) Constraint(t buildtags.ConstraintConvertable) { + c.Constraints(append(c.file.Constraints, t.ToConstraint())) } -func (c *Context) BuildConstraintExpr(expr string) { +func (c *Context) ConstraintExpr(expr string) { constraint, err := buildtags.ParseConstraint(expr) if err != nil { c.AddError(err) return } - c.BuildConstraint(constraint) + c.Constraint(constraint) } func (c *Context) Function(name string) { diff --git a/build/global.go b/build/global.go index 34ddeb7..2ac2832 100644 --- a/build/global.go +++ b/build/global.go @@ -53,9 +53,9 @@ func Generate() { } } -func BuildConstraints(t buildtags.ConstraintsConvertable) { ctx.BuildConstraints(t) } -func BuildConstraint(t buildtags.ConstraintConvertable) { ctx.BuildConstraint(t) } -func BuildConstraintExpr(expr string) { ctx.BuildConstraintExpr(expr) } +func Constraints(t buildtags.ConstraintsConvertable) { ctx.Constraints(t) } +func Constraint(t buildtags.ConstraintConvertable) { ctx.Constraint(t) } +func ConstraintExpr(expr string) { ctx.ConstraintExpr(expr) } func GP8v() reg.GPVirtual { return ctx.GP8v() } func GP16v() reg.GPVirtual { return ctx.GP16v() } diff --git a/printer/goasm_test.go b/printer/goasm_test.go index 893249e..f8cc250 100644 --- a/printer/goasm_test.go +++ b/printer/goasm_test.go @@ -70,8 +70,8 @@ func TestTextDecl(t *testing.T) { func TestConstraints(t *testing.T) { ctx := build.NewContext() - ctx.BuildConstraintExpr("linux,386 darwin,!cgo") - ctx.BuildConstraintExpr("!noasm") + ctx.ConstraintExpr("linux,386 darwin,!cgo") + ctx.ConstraintExpr("!noasm") AssertPrintsLines(t, ctx, printer.NewGoAsm, []string{ "// Code generated by avo. DO NOT EDIT.",