qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-11 20:50:23 -07:00
Code Releases Activity

cmd/gc: tag builtin error, byte, rune to avoid exporting them.

Browse Source 
Fixes #5910.
Fixes #6260.

R=golang-dev, daniel.morsing
CC=golang-dev
https://golang.org/cl/13257044
This commit is contained in:
Rémy Oudompheng 2013-08-27 21:18:32 +02:00
parent 4fc7ff497d
commit a85cfbd433
5 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/gc/lex.c
View File

@ -2008,27 +2008,27 @@ lexinit1(void)
// error type
s = lookup("error");
s->lexical = LNAME;
errortype = t;
errortype->sym = s;
s1 = pkglookup("error", builtinpkg);
errortype = t;
errortype->sym = s1;
s1->lexical = LNAME;
s1->def = typenod(errortype);
// byte alias
s = lookup("byte");
s->lexical = LNAME;
bytetype = typ(TUINT8);
bytetype->sym = s;
s1 = pkglookup("byte", builtinpkg);
bytetype = typ(TUINT8);
bytetype->sym = s1;
s1->lexical = LNAME;
s1->def = typenod(bytetype);
// rune alias
s = lookup("rune");
s->lexical = LNAME;
runetype = typ(TINT32);
runetype->sym = s;
s1 = pkglookup("rune", builtinpkg);
runetype = typ(TINT32);
runetype->sym = s1;
s1->lexical = LNAME;
s1->def = typenod(runetype);
}

4
test/fixedbugs/bug460.dir/a.go
View File

@ -6,4 +6,8 @@ package a
type Foo struct {
int
int8
error
rune
byte
}

7
test/fixedbugs/bug460.dir/b.go
View File

@ -9,6 +9,9 @@ import "./a"
var x a.Foo
func main() {
x.int = 20 // ERROR "unexported field"
x.int = 20 // ERROR "unexported field"
x.int8 = 20 // ERROR "unexported field"
x.error = nil // ERROR "unexported field"
x.rune = 'a' // ERROR "unexported field"
x.byte = 20 // ERROR "unexported field"
}

9
test/fixedbugs/issue5910.dir/a.go
View File

@ -1,3 +1,7 @@
// Copyright 2013 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package a
type Package struct {
@ -7,11 +11,12 @@ type Package struct {
type Future struct {
result chan struct {
*Package
error
}
}
func (t *Future) Result() *Package {
func (t *Future) Result() (*Package, error) {
result := <-t.result
t.result <- result
return result.Package
return result.Package, result.error
}

4
test/fixedbugs/issue5910.dir/main.go
View File

@ -1,3 +1,7 @@
// Copyright 2013 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
import "a"