Add support for indexed package format. "Fix" bug 0055.

Author: nsf

decl.go

@@ -1036,6 +1036,13 @@ func (d *decl) find_child_and_in_embedded(name string) *decl {
 		return nil
 	}
 
+	if d.is_alias() {
+		dd := d.type_dealias()
+		if dd != nil {
+			return dd.find_child_and_in_embedded(name)
+		}
+	}
+
 	if d.is_visited() {
 		return nil
 	}

package.go

@@ -112,9 +112,15 @@ func (m *package_file_cache) process_package_data(data []byte) {
 	if data[0] == 'B' {
 		// binary format, skip 'B\n'
 		data = data[2:]
-		var p gc_bin_parser
-		p.init(data, m)
-		pp = &p
+		if len(data) > 0 && data[0] == 'i' {
+			var p gc_ibin_parser
+			p.init(data[1:], m)
+			pp = &p
+		} else {
+			var p gc_bin_parser
+			p.init(data, m)
+			pp = &p
+		}
 	} else {
 		// textual format, find the beginning of the package clause
 		i = bytes.Index(data, []byte{'p', 'a', 'c', 'k', 'a', 'g', 'e'})

package_bin.go

@@ -113,10 +113,7 @@ func (p *gc_bin_parser) parse_export(callback func(string, ast.Decl)) {
 
 	// read version specific flags - extend as necessary
 	switch p.version {
-	// case 6:
-	// 	...
-	//	fallthrough
-	case 5, 4, 3, 2, 1:
+	case 6, 5, 4, 3, 2, 1:
 		p.debugFormat = p.rawStringln(p.rawByte()) == "debug"
 		p.trackAllTypes = p.int() != 0
 		p.posInfoFormat = p.int() != 0
@@ -172,6 +169,9 @@ func (p *gc_bin_parser) pkg() string {
 	} else {
 		path = p.string()
 	}
+	if p.version >= 6 {
+		p.int() // package height; unused by go/types
+	}
 
 	// we should never see an empty package name
 	if name == "" {
@@ -810,13 +810,13 @@ var predeclared = []ast.Expr{
 	// TODO(nsf): don't think those are used in just package type info,
 	// maybe for consts, but we are not interested in that
 	// untyped types
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedBool],
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedInt],
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedRune],
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedFloat],
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedComplex],
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedString],
-	ast.NewIdent(">_<"), // TODO: types.Typ[types.UntypedNil],
+	ast.NewIdent("&untypedBool&"),    // TODO: types.Typ[types.UntypedBool],
+	ast.NewIdent("&untypedInt&"),     // TODO: types.Typ[types.UntypedInt],
+	ast.NewIdent("&untypedRune&"),    // TODO: types.Typ[types.UntypedRune],
+	ast.NewIdent("&untypedFloat&"),   // TODO: types.Typ[types.UntypedFloat],
+	ast.NewIdent("&untypedComplex&"), // TODO: types.Typ[types.UntypedComplex],
+	ast.NewIdent("&untypedString&"),  // TODO: types.Typ[types.UntypedString],
+	ast.NewIdent("&untypedNil&"),     // TODO: types.Typ[types.UntypedNil],
 
 	// package unsafe
 	&ast.SelectorExpr{X: ast.NewIdent("unsafe"), Sel: ast.NewIdent("Pointer")},