Imported Upstream version 2011.04.13upstream/2011.04.13

1 files changed, 43 insertions, 48 deletions

diff --git a/src/pkg/exp/eval/bridge.go b/src/pkg/exp/eval/bridge.go
index 12835c4c0..d1efa2eb6 100644
--- a/src/pkg/exp/eval/bridge.go
+++ b/src/pkg/exp/eval/bridge.go
@@ -34,54 +34,49 @@ func TypeFromNative(t reflect.Type) Type {
 	}
 
 	var et Type
-	switch t := t.(type) {
-	case *reflect.BoolType:
+	switch t.Kind() {
+	case reflect.Bool:
 		et = BoolType
-	case *reflect.FloatType:
-		switch t.Kind() {
-		case reflect.Float32:
-			et = Float32Type
-		case reflect.Float64:
-			et = Float64Type
-		}
-	case *reflect.IntType:
-		switch t.Kind() {
-		case reflect.Int16:
-			et = Int16Type
-		case reflect.Int32:
-			et = Int32Type
-		case reflect.Int64:
-			et = Int64Type
-		case reflect.Int8:
-			et = Int8Type
-		case reflect.Int:
-			et = IntType
-		}
-	case *reflect.UintType:
-		switch t.Kind() {
-		case reflect.Uint16:
-			et = Uint16Type
-		case reflect.Uint32:
-			et = Uint32Type
-		case reflect.Uint64:
-			et = Uint64Type
-		case reflect.Uint8:
-			et = Uint8Type
-		case reflect.Uint:
-			et = UintType
-		case reflect.Uintptr:
-			et = UintptrType
-		}
-	case *reflect.StringType:
+
+	case reflect.Float32:
+		et = Float32Type
+	case reflect.Float64:
+		et = Float64Type
+
+	case reflect.Int16:
+		et = Int16Type
+	case reflect.Int32:
+		et = Int32Type
+	case reflect.Int64:
+		et = Int64Type
+	case reflect.Int8:
+		et = Int8Type
+	case reflect.Int:
+		et = IntType
+
+	case reflect.Uint16:
+		et = Uint16Type
+	case reflect.Uint32:
+		et = Uint32Type
+	case reflect.Uint64:
+		et = Uint64Type
+	case reflect.Uint8:
+		et = Uint8Type
+	case reflect.Uint:
+		et = UintType
+	case reflect.Uintptr:
+		et = UintptrType
+
+	case reflect.String:
 		et = StringType
-	case *reflect.ArrayType:
+	case reflect.Array:
 		et = NewArrayType(int64(t.Len()), TypeFromNative(t.Elem()))
-	case *reflect.ChanType:
+	case reflect.Chan:
 		log.Panicf("%T not implemented", t)
-	case *reflect.FuncType:
+	case reflect.Func:
 		nin := t.NumIn()
 		// Variadic functions have DotDotDotType at the end
-		variadic := t.DotDotDot()
+		variadic := t.IsVariadic()
 		if variadic {
 			nin--
 		}
@@ -94,15 +89,15 @@ func TypeFromNative(t reflect.Type) Type {
 			out[i] = TypeFromNative(t.Out(i))
 		}
 		et = NewFuncType(in, variadic, out)
-	case *reflect.InterfaceType:
+	case reflect.Interface:
 		log.Panicf("%T not implemented", t)
-	case *reflect.MapType:
+	case reflect.Map:
 		log.Panicf("%T not implemented", t)
-	case *reflect.PtrType:
+	case reflect.Ptr:
 		et = NewPtrType(TypeFromNative(t.Elem()))
-	case *reflect.SliceType:
+	case reflect.Slice:
 		et = NewSliceType(TypeFromNative(t.Elem()))
-	case *reflect.StructType:
+	case reflect.Struct:
 		n := t.NumField()
 		fields := make([]StructField, n)
 		for i := 0; i < n; i++ {
@@ -113,7 +108,7 @@ func TypeFromNative(t reflect.Type) Type {
 			fields[i].Anonymous = sf.Anonymous
 		}
 		et = NewStructType(fields)
-	case *reflect.UnsafePointerType:
+	case reflect.UnsafePointer:
 		log.Panicf("%T not implemented", t)
 	default:
 		log.Panicf("unexpected reflect.Type: %T", t)