From 828334dd95ce8e4bf3662bd5c89d7c417f0741d0 Mon Sep 17 00:00:00 2001
From: Robert Griesemer <gri@golang.org>
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/expr1.go | 64 ++++++++++++-----------------------------------
 1 file changed, 16 insertions(+), 48 deletions(-)

(limited to 'src/pkg/exp/eval/expr1.go')

diff --git a/src/pkg/exp/eval/expr1.go b/src/pkg/exp/eval/expr1.go
index 547ca380a..c77c99934 100644
--- a/src/pkg/exp/eval/expr1.go
+++ b/src/pkg/exp/eval/expr1.go
@@ -12,15 +12,11 @@ import (
  * "As" functions.  These retrieve evaluator functions from an
  * expr, panicking if the requested evaluator has the wrong type.
  */
-func (a *expr) asBool() (func(*Thread) bool) {
-	return a.eval.(func(*Thread) bool);
-}
+func (a *expr) asBool() (func(*Thread) bool)	{ return a.eval.(func(*Thread) bool) }
 func (a *expr) asUint() (func(*Thread) uint64) {
 	return a.eval.(func(*Thread) uint64);
 }
-func (a *expr) asInt() (func(*Thread) int64) {
-	return a.eval.(func(*Thread) int64);
-}
+func (a *expr) asInt() (func(*Thread) int64)	{ return a.eval.(func(*Thread) int64) }
 func (a *expr) asIdealInt() (func() *bignum.Integer) {
 	return a.eval.(func() *bignum.Integer);
 }
@@ -39,18 +35,12 @@ func (a *expr) asArray() (func(*Thread) ArrayValue) {
 func (a *expr) asStruct() (func(*Thread) StructValue) {
 	return a.eval.(func(*Thread) StructValue);
 }
-func (a *expr) asPtr() (func(*Thread) Value) {
-	return a.eval.(func(*Thread) Value);
-}
-func (a *expr) asFunc() (func(*Thread) Func) {
-	return a.eval.(func(*Thread) Func);
-}
+func (a *expr) asPtr() (func(*Thread) Value)	{ return a.eval.(func(*Thread) Value) }
+func (a *expr) asFunc() (func(*Thread) Func)	{ return a.eval.(func(*Thread) Func) }
 func (a *expr) asSlice() (func(*Thread) Slice) {
 	return a.eval.(func(*Thread) Slice);
 }
-func (a *expr) asMap() (func(*Thread) Map) {
-	return a.eval.(func(*Thread) Map);
-}
+func (a *expr) asMap() (func(*Thread) Map)	{ return a.eval.(func(*Thread) Map) }
 func (a *expr) asMulti() (func(*Thread) []Value) {
 	return a.eval.(func(*Thread) []Value);
 }
@@ -132,49 +122,27 @@ func (a *expr) genIdentOp(level, index int) {
 	a.evalAddr = func(t *Thread) Value { return t.f.Get(level, index) };
 	switch a.t.lit().(type) {
 	case *boolType:
-		a.eval = func(t *Thread) bool {
-			return t.f.Get(level, index).(BoolValue).Get(t);
-		};
+		a.eval = func(t *Thread) bool { return t.f.Get(level, index).(BoolValue).Get(t) };
 	case *uintType:
-		a.eval = func(t *Thread) uint64 {
-			return t.f.Get(level, index).(UintValue).Get(t);
-		};
+		a.eval = func(t *Thread) uint64 { return t.f.Get(level, index).(UintValue).Get(t) };
 	case *intType:
-		a.eval = func(t *Thread) int64 {
-			return t.f.Get(level, index).(IntValue).Get(t);
-		};
+		a.eval = func(t *Thread) int64 { return t.f.Get(level, index).(IntValue).Get(t) };
 	case *floatType:
-		a.eval = func(t *Thread) float64 {
-			return t.f.Get(level, index).(FloatValue).Get(t);
-		};
+		a.eval = func(t *Thread) float64 { return t.f.Get(level, index).(FloatValue).Get(t) };
 	case *stringType:
-		a.eval = func(t *Thread) string {
-			return t.f.Get(level, index).(StringValue).Get(t);
-		};
+		a.eval = func(t *Thread) string { return t.f.Get(level, index).(StringValue).Get(t) };
 	case *ArrayType:
-		a.eval = func(t *Thread) ArrayValue {
-			return t.f.Get(level, index).(ArrayValue).Get(t);
-		};
+		a.eval = func(t *Thread) ArrayValue { return t.f.Get(level, index).(ArrayValue).Get(t) };
 	case *StructType:
-		a.eval = func(t *Thread) StructValue {
-			return t.f.Get(level, index).(StructValue).Get(t);
-		};
+		a.eval = func(t *Thread) StructValue { return t.f.Get(level, index).(StructValue).Get(t) };
 	case *PtrType:
-		a.eval = func(t *Thread) Value {
-			return t.f.Get(level, index).(PtrValue).Get(t);
-		};
+		a.eval = func(t *Thread) Value { return t.f.Get(level, index).(PtrValue).Get(t) };
 	case *FuncType:
-		a.eval = func(t *Thread) Func {
-			return t.f.Get(level, index).(FuncValue).Get(t);
-		};
+		a.eval = func(t *Thread) Func { return t.f.Get(level, index).(FuncValue).Get(t) };
 	case *SliceType:
-		a.eval = func(t *Thread) Slice {
-			return t.f.Get(level, index).(SliceValue).Get(t);
-		};
+		a.eval = func(t *Thread) Slice { return t.f.Get(level, index).(SliceValue).Get(t) };
 	case *MapType:
-		a.eval = func(t *Thread) Map {
-			return t.f.Get(level, index).(MapValue).Get(t);
-		};
+		a.eval = func(t *Thread) Map { return t.f.Get(level, index).(MapValue).Get(t) };
 	default:
 		log.Crashf("unexpected identifier type %v at %v", a.t, a.pos);
 	}
-- 
cgit v1.2.3