qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 15:57:57 -07:00
Code Releases Activity

- simplified handling of primary types (types w/ names which must

Browse Source 
be canonicalized upon import)
- missed some exports

R=r
OCL=13733
CL=13733
This commit is contained in:
Robert Griesemer 2008-08-01 14:50:18 -07:00
parent 0abbb8c76b
commit c6eb85aecf
4 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr/gri/gosrc/export.go
View File

@ -120,17 +120,21 @@ func (E *Exporter) WriteScope(scope *Globals.Scope, export_all bool) {
func (E *Exporter) WriteObject(obj *Globals.Object) {
if obj == nil {
E.WriteObjectTag(Object.EOS);
E.WriteObjectTag(Object.END);
return;
}
if obj.kind == Object.TYPE && obj.typ.obj == obj {
// primary type object - handled entirely by WriteType()
E.WriteObjectTag(Object.PTYPE);
E.WriteType(obj.typ);
} else {
E.WriteObjectTag(obj.kind);
if obj.kind == Object.TYPE {
// named types are always primary types
// and handled entirely by WriteType()
if obj.typ.obj != obj {
panic "inconsistent primary type"
}
E.WriteType(obj.typ);
return;
}
E.WriteString(obj.ident);
E.WriteType(obj.typ);
E.WritePackage(obj.pnolev);
@ -139,9 +143,6 @@ func (E *Exporter) WriteObject(obj *Globals.Object) {
case Object.CONST:
E.WriteInt(0); // should be the correct value
case Object.TYPE:
// nothing to do
case Object.VAR:
E.WriteInt(0); // should be the correct address/offset
@ -151,7 +152,6 @@ func (E *Exporter) WriteObject(obj *Globals.Object) {
default:
panic "UNREACHABLE";
}
}
}

15
usr/gri/gosrc/import.go
View File

@ -136,19 +136,20 @@ func (I *Importer) ReadScope() *Globals.Scope {
func (I *Importer) ReadObject() *Globals.Object {
tag := I.ReadObjectTag();
if tag == Object.EOS {
if tag == Object.END {
return nil;
}
if tag == Object.PTYPE {
// primary type object - handled entirely by ReadType()
if tag == Object.TYPE {
// named types are always primary types
// and handled entirely by ReadType()
typ := I.ReadType();
if typ.obj.typ != typ {
panic "incorrect primary type";
panic "inconsistent primary type";
}
return typ.obj;
}
} else {
ident := I.ReadString();
obj := Globals.NewObject(0, tag, ident);
obj.typ = I.ReadType();
@ -158,9 +159,6 @@ func (I *Importer) ReadObject() *Globals.Object {
case Object.CONST:
I.ReadInt(); // should set the value field
case Object.TYPE:
// nothing to do
case Object.VAR:
I.ReadInt(); // should set the address/offset field
@ -172,7 +170,6 @@ func (I *Importer) ReadObject() *Globals.Object {
}
return obj;
}
}

8
usr/gri/gosrc/object.go
View File

@ -7,12 +7,11 @@ package Object
import Globals "globals"
export BAD, CONST, TYPE, VAR, FUNC, PACKAGE, LABEL, PTYPE, EOS
export BAD, CONST, TYPE, VAR, FUNC, PACKAGE, LABEL, END
const /* kind */ (
BAD = iota; // error handling
CONST; TYPE; VAR; FUNC; PACKAGE; LABEL;
PTYPE; // primary type (import/export only)
EOS; // end of scope (import/export only)
END; // end of scope (import/export only)
)
@ -31,8 +30,7 @@ func KindStr(kind int) string {
case FUNC: return "FUNC";
case PACKAGE: return "PACKAGE";
case LABEL: return "LABEL";
case PTYPE: return "PTYPE";
case EOS: return "EOS";
case END: return "END";
}
return "<unknown Object kind>";
}

16
usr/gri/gosrc/parser.go
View File

@ -1649,15 +1649,21 @@ func (P *Parser) ParseConstSpec(exported bool) {
typ := P.TryType();
if typ != nil {
for p := list.first; p != nil; p = p.next {
p.obj.exported = exported;
p.obj.typ = typ; // TODO should use/have set_type()!
p.obj.typ = typ;
}
}
if P.tok == Scanner.ASSIGN {
P.Next();
P.ParseExpressionList();
}
if exported {
for p := list.first; p != nil; p = p.next {
p.obj.exported = true;
}
}
P.Ecart();
}
@ -1725,6 +1731,12 @@ func (P *Parser) ParseVarSpec(exported bool) {
}
}
if exported {
for p := list.first; p != nil; p = p.next {
p.obj.exported = true;
}
}
P.Ecart();
}