From 828334dd95ce8e4bf3662bd5c89d7c417f0741d0 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 6 Nov 2009 14:24:38 -0800 Subject: - fine-tuning of one-line func heuristic (nodes.go) - enabled for function declarations (not just function literals) - applied gofmt -w $GOROOT/src (look for instance at src/pkg/debug/elf/elf.go) R=r, rsc CC=go-dev http://go/go-review/1026006 --- src/pkg/exp/eval/expr.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/pkg/exp/eval/expr.go') diff --git a/src/pkg/exp/eval/expr.go b/src/pkg/exp/eval/expr.go index c2b0dbf7b..af6259a78 100644 --- a/src/pkg/exp/eval/expr.go +++ b/src/pkg/exp/eval/expr.go @@ -402,9 +402,7 @@ func (a *assignCompiler) compile(b *block, lt Type) (func(Value, *Thread)) { rf := a.rs[i].asPtr(); a.rs[i] = a.rs[i].newExpr(lt, a.rs[i].desc); len := at.Len; - a.rs[i].eval = func(t *Thread) Slice { - return Slice{rf(t).(ArrayValue), len, len}; - }; + a.rs[i].eval = func(t *Thread) Slice { return Slice{rf(t).(ArrayValue), len, len} }; rt = a.rs[i].t; } } @@ -1592,17 +1590,13 @@ func (a *exprInfo) compileBinaryExpr(op token.Token, l, r *expr) *expr { // Useful type predicates // TODO(austin) CL 33668 mandates identical types except for comparisons. compat := func() bool { return l.t.compat(r.t, false) }; - integers := func() bool { - return l.t.isInteger() && r.t.isInteger(); - }; + integers := func() bool { return l.t.isInteger() && r.t.isInteger() }; floats := func() bool { return l.t.isFloat() && r.t.isFloat() }; strings := func() bool { // TODO(austin) Deal with named types return l.t == StringType && r.t == StringType; }; - booleans := func() bool { - return l.t.isBoolean() && r.t.isBoolean(); - }; + booleans := func() bool { return l.t.isBoolean() && r.t.isBoolean() }; // Type check var t Type; -- cgit v1.2.3