Merge pull request #485 from xushiwei/q

TyAny

Author: xushiwei

ast.go

@@ -234,12 +234,8 @@ func toMapType(pkg *Package, t *types.Map) ast.Expr {
 	return &ast.MapType{Key: toType(pkg, t.Key()), Value: toType(pkg, t.Elem())}
 }
 
-var (
-	universeAny = types.Universe.Lookup("any")
-)
-
 func toInterface(pkg *Package, t *types.Interface) ast.Expr {
-	if t == universeAny.Type() {
+	if t == TyAny {
 		return ast.NewIdent("any")
 	} else if interfaceIsImplicit(t) && t.NumEmbeddeds() == 1 {
 		return toType(pkg, t.EmbeddedType(0))
@@ -355,7 +351,7 @@ func toExpr(pkg *Package, val interface{}, src ast.Node) *internal.Elem {
 }
 
 var (
-	iotaObj = types.Universe.Lookup("iota")
+	iotaObj types.Object
 )
 
 func toBasicKind(tok token.Token) types.BasicKind {

internal/go/format/format.go

@@ -51,7 +51,6 @@ const parserMode = parser.ParseComments
 //
 // The function may return early (before the entire result is written)
 // and return a formatting error, for instance due to an incorrect AST.
-//
 func Node(dst io.Writer, fset *token.FileSet, node interface{}) error {
 	// Determine if we have a complete source file (file != nil).
 	var file *ast.File
@@ -100,7 +99,6 @@ func Node(dst io.Writer, fset *token.FileSet, node interface{}) error {
 // is applied to the result (such that it has the same leading and trailing
 // space as src), and the result is indented by the same amount as the first
 // line of src containing code. Imports are not sorted for partial source files.
-//
 func Source(src []byte) ([]byte, error) {
 	fset := token.NewFileSet()
 	file, sourceAdj, indentAdj, err := parse(fset, "", src, true)

package_test.go

@@ -1,14 +1,16 @@
 /*
- Copyright 2021 The GoPlus Authors (goplus.org)
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-     http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Copyright 2021 The GoPlus Authors (goplus.org)
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 package gogen_test

type_ext.go

@@ -1,14 +1,16 @@
 /*
- Copyright 2024 The GoPlus Authors (goplus.org)
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-     http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Copyright 2024 The GoPlus Authors (goplus.org)
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 package gogen
@@ -165,14 +167,25 @@ func Lookup(scope *types.Scope, name string) (obj types.Object) {
 // ----------------------------------------------------------------------------
 
 var (
-	TyByte = types.Universe.Lookup("byte").Type().(*types.Basic)
-	TyRune = types.Universe.Lookup("rune").Type().(*types.Basic)
+	TyByte *types.Basic
+	TyRune *types.Basic
+
+	TyError          types.Type
+	TyAny            types.Type
+	TyEmptyInterface types.Type
 )
 
-var (
+func init() {
+	universe := types.Universe
+	iotaObj = universe.Lookup("iota")
+	TyByte = universe.Lookup("byte").Type().(*types.Basic)
+	TyRune = universe.Lookup("rune").Type().(*types.Basic)
+	TyError = universe.Lookup("error").Type()
+	TyAny = universe.Lookup("any").Type()
 	TyEmptyInterface = types.NewInterfaceType(nil, nil)
-	TyError          = types.Universe.Lookup("error").Type()
-)
+}
+
+// ----------------------------------------------------------------------------
 
 // refType: &T
 type refType struct {