- adjusted my submitted code to work with latest compiler changes

R=r
OCL=14734
CL=14734

diff --git a/usr/gri/gosrc/import.go b/usr/gri/gosrc/import.go
index 8aff3330630ae58932ebb471a8d94ed50fb9f02a..b947c514df61f92b149147f7fcd1fcccef9ea248 100755 (executable)
--- a/usr/gri/gosrc/import.go
+++ b/usr/gri/gosrc/import.go
@@ -41,7 +41,7 @@ func (I *Importer) ReadByte() byte {
 
 func (I *Importer) ReadInt() int {
        x := 0;
-       s := 0;  // TODO eventually Go will require this to be a uint!
+       s := uint(0);
        b := I.ReadByte();
        for b < 128 {
                x |= int(b) << s;

diff --git a/usr/gri/gosrc/parser.go b/usr/gri/gosrc/parser.go
index 789573190b69da0cf1db95ad0d517253b68459af..023a0d85d09d738af014acf53f14fba5e4c33a6c 100644 (file)
--- a/usr/gri/gosrc/parser.go
+++ b/usr/gri/gosrc/parser.go
@@ -533,7 +533,7 @@ func (P *Parser) ParseAnonymousSignature() *Globals.Type {
        if P.tok == Scanner.PERIOD {
                p0 = sig.entries.len_;
                if P.semantic_checks && p0 != 1 {
-                       P.Error(recv_pos, "must have exactly one receiver")
+                       P.Error(recv_pos, "must have exactly one receiver");
                        panic("UNIMPLEMENTED (ParseAnonymousSignature)");
                        // TODO do something useful here
                }
@@ -574,7 +574,7 @@ func (P *Parser) ParseNamedSignature() (pos int, ident string, typ *Globals.Type
                p0 = sig.entries.len_;
                if P.semantic_checks && p0 != 1 {
                        print("p0 = ", p0, "\n");
-                       P.Error(recv_pos, "must have exactly one receiver")
+                       P.Error(recv_pos, "must have exactly one receiver");
                        panic("UNIMPLEMENTED (ParseNamedSignature)");
                        // TODO do something useful here
                }