Merge pull request #401 from xushiwei/q

don't define GopPackage for main package

ast.go

@@ -789,7 +789,7 @@ func matchTypeCast(pkg *Package, typ types.Type, fn *internal.Elem, args []*inte
 				o := t.Obj()
 				if at := o.Pkg(); at != nil {
 					tname := o.Name()
-					if checkUntypedOverflows(pkg, at.Scope(), tname, args[0]) {
+					if checkUntypedOverflows(at.Scope(), tname, args[0]) {
 						src, pos := pkg.cb.loadExpr(args[0].Src)
 						err = pkg.cb.newCodeError(pos, fmt.Sprintf("cannot convert %v (untyped int constant %v) to type %v", src, args[0].CVal, tname))
 						return
@@ -815,7 +815,7 @@ func matchTypeCast(pkg *Package, typ types.Type, fn *internal.Elem, args []*inte
 			name := tname + "_Cast"
 			if cast := scope.Lookup(name); cast != nil {
 				if len(args) == 1 && args[0].CVal != nil {
-					if checkUntypedOverflows(pkg, scope, tname, args[0]) {
+					if checkUntypedOverflows(scope, tname, args[0]) {
 						src, pos := pkg.cb.loadExpr(args[0].Src)
 						err = pkg.cb.newCodeError(pos, fmt.Sprintf("cannot convert %v (untyped int constant %v) to type %v", src, args[0].CVal, tname))
 						return
@@ -1358,7 +1358,7 @@ func checkUntypedType(scope *types.Scope, tname string) bool {
 	return false
 }
 
-func checkUntypedOverflows(pkg *Package, scope *types.Scope, tname string, arg *internal.Elem) bool {
+func checkUntypedOverflows(scope *types.Scope, tname string, arg *internal.Elem) bool {
 	cmax, ok1 := scope.Lookup(tname + "_Max").(*types.Const)
 	cmin, ok2 := scope.Lookup(tname + "_Min").(*types.Const)
 	if ok1 || ok2 {

c.go

@@ -201,7 +201,7 @@ func (p *UnionFields) Len() int {
 }
 
 func (p *UnionFields) getField(
-	cb *CodeBuilder, tfld *types.Named, name string, src ast.Node, ref bool) MemberKind {
+	cb *CodeBuilder, tfld *types.Named, name string, _ ast.Node, ref bool) MemberKind {
 	for _, v := range p.flds {
 		if v.Name == name {
 			obj := cb.stk.Pop()

codebuild.go

@@ -1659,7 +1659,7 @@ retry:
 			return kind
 		}
 	case *types.Basic, *types.Slice, *types.Map, *types.Chan:
-		return p.btiMethod(p.getBuiltinTI(o), name, aliasName, flag, arg, srcExpr)
+		return p.btiMethod(p.getBuiltinTI(o), name, aliasName, flag, srcExpr)
 	}
 	return MemberInvalid
 }
@@ -1752,7 +1752,7 @@ func (p *CodeBuilder) method(
 		return MemberMethod
 	}
 	if t, ok := o.(*types.Named); ok {
-		kind = p.btiMethod(p.getBuiltinTI(t), name, aliasName, flag, arg, src)
+		kind = p.btiMethod(p.getBuiltinTI(t), name, aliasName, flag, src)
 	}
 	return
 }
@@ -1768,7 +1768,7 @@ func isTypeConvert(otyp, typ types.Type) (string, bool) {
 }
 
 func (p *CodeBuilder) btiMethod(
-	o *builtinTI, name, aliasName string, flag MemberFlag, arg *Element, src ast.Node) MemberKind {
+	o *builtinTI, name, aliasName string, flag MemberFlag, src ast.Node) MemberKind {
 	if o != nil {
 		for i, n := 0, o.NumMethods(); i < n; i++ {
 			method := o.Method(i)

gop_test.go

@@ -54,10 +54,10 @@ func newGopMainPackage() *gox.Package {
 // ----------------------------------------------------------------------------
 
 func TestGopoConst(t *testing.T) {
-	pkg := newMainPackage()
+	pkg := newPackage("foo")
 	pkg.CB().NewConstStart(nil, "Gopo_x").
 		Val("Hello").EndInit(1)
-	domTest(t, pkg, `package main
+	domTest(t, pkg, `package foo
 
 const GopPackage = true
 const Gopo_x = "Hello"

import.go

@@ -356,7 +356,7 @@ type expDeps struct {
 }
 
 func checkGopPkg(pkg *Package) (val ast.Expr, ok bool) {
-	if pkg.Types.Scope().Lookup(gopPackage) != nil {
+	if pkg.Types.Name() == "main" || pkg.Types.Scope().Lookup(gopPackage) != nil {
 		return
 	}
 	ed := expDeps{pkg.Types, make(map[*types.Package]none), make(map[types.Type]none)}

package_test.go

@@ -50,13 +50,16 @@ func ctxRef(pkg *gox.Package, name string) gox.Ref {
 
 type eventRecorder struct{}
 
-func (p eventRecorder) Member(id ast.Node, obj types.Object) {
-}
-func (p eventRecorder) Call(fn ast.Node, obj types.Object) {
-}
+func (p eventRecorder) Member(id ast.Node, obj types.Object) {}
+func (p eventRecorder) Call(fn ast.Node, obj types.Object)   {}
 
 func newMainPackage(
 	implicitCast ...func(pkg *gox.Package, V, T types.Type, pv *gox.Element) bool) *gox.Package {
+	return newPackage("main", implicitCast...)
+}
+
+func newPackage(
+	name string, implicitCast ...func(pkg *gox.Package, V, T types.Type, pv *gox.Element) bool) *gox.Package {
 	conf := &gox.Config{
 		Fset:            gblFset,
 		Importer:        gblImp,
@@ -71,7 +74,7 @@ func newMainPackage(
 		conf.HandleErr = handleErr
 		handleErr = nil
 	}
-	return gox.NewPackage("", "main", conf)
+	return gox.NewPackage("", name, conf)
 }
 
 func domTest(t *testing.T, pkg *gox.Package, expected string) {
@@ -1612,8 +1615,6 @@ func TestDefOverloadFunc(t *testing.T) {
 		End()
 	domTest(t, pkg, `package main
 
-const GopPackage = true
-
 func bar__0() {
 }
 `)
@@ -1625,8 +1626,6 @@ func TestDefTemplateMethod(t *testing.T) {
 		End()
 	domTest(t, pkg, `package main
 
-const GopPackage = true
-
 func Gopt_bar() {
 }
 `)

template.go

@@ -375,7 +375,7 @@ func assignable(pkg *Package, v types.Type, t *types.Named, pv *internal.Elem) b
 				}
 			}
 			if pv.CVal != nil {
-				if checkUntypedOverflows(pkg, scope, tname, pv) {
+				if checkUntypedOverflows(scope, tname, pv) {
 					return false
 				}
 			}

typeparams.go

@@ -257,7 +257,7 @@ func infer(pkg *Package, posn positioner, tparams []*types.TypeParam, targs []ty
 	return
 }
 
-func getParamsTypes(pkg *Package, tuple *types.Tuple, variadic bool) string {
+func getParamsTypes(tuple *types.Tuple, variadic bool) string {
 	n := tuple.Len()
 	if n == 0 {
 		return ""
@@ -279,7 +279,7 @@ func checkInferArgs(pkg *Package, fn *internal.Elem, sig *types.Signature, args
 		if nargs < nreq-1 {
 			caller := types.ExprString(fn.Val)
 			return nil, fmt.Errorf(
-				"not enough arguments in call to %s\n\thave (%v)\n\twant (%v)", caller, getTypes(args), getParamsTypes(pkg, sig.Params(), true))
+				"not enough arguments in call to %s\n\thave (%v)\n\twant (%v)", caller, getTypes(args), getParamsTypes(sig.Params(), true))
 		}
 		if flags&InstrFlagEllipsis != 0 {
 			return args, nil
@@ -307,7 +307,7 @@ func checkInferArgs(pkg *Package, fn *internal.Elem, sig *types.Signature, args
 		}
 		caller := types.ExprString(fn.Val)
 		return nil, fmt.Errorf(
-			"%s arguments in call to %s\n\thave (%v)\n\twant (%v)", fewOrMany, caller, getTypes(args), getParamsTypes(pkg, sig.Params(), false))
+			"%s arguments in call to %s\n\thave (%v)\n\twant (%v)", fewOrMany, caller, getTypes(args), getParamsTypes(sig.Params(), false))
 	}
 	return args, nil
 }