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

  be canonicalized upon import)
- missed some exports

R=r
OCL=13733
CL=13733

usr/gri/gosrc/export.go

@@ -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.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;
+	}
 
-	} else {
-		E.WriteObjectTag(obj.kind);
 	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";
 	}
-	}
 }
 
 

usr/gri/gosrc/import.go

@@ -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;
-	}
 }
 
 

usr/gri/gosrc/object.go

@@ -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>";
 }

usr/gri/gosrc/parser.go

@@ -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();
 }