- allow for embeded types in fields, and parameter lists w/o parameter names

- temporary work-around for 6g bug

R=r
OCL=16052
CL=16052

diff --git a/usr/gri/pretty/ast.go b/usr/gri/pretty/ast.go
index b8839852a4020573eb8fafb5d5d7d40a1e87213d..58f2d6e41d5682943d56179cdd6c734cd14ef43d 100644 (file)
--- a/usr/gri/pretty/ast.go
+++ b/usr/gri/pretty/ast.go
@@ -220,7 +220,7 @@ export type Decl interface {
 
 
 export type VarDeclList struct {
-       idents *List;
+       idents *List;  // possibly nil
        typ Type;
 }
 

diff --git a/usr/gri/pretty/parser.go b/usr/gri/pretty/parser.go
index 8bca136e0dcd4e1cae7ddeccab3811436f3e0767..67ce5445ecd07a83ad24b387efe3c3bcc5e90352 100644 (file)
--- a/usr/gri/pretty/parser.go
+++ b/usr/gri/pretty/parser.go
@@ -152,22 +152,25 @@ func (P *Parser) ParseIdentList() *AST.List {
 }
 
 
-func (P *Parser) ParseQualifiedIdent() AST.Expr {
+func (P *Parser) ParseQualifiedIdent(ident *AST.Ident) AST.Expr {
        P.Trace("QualifiedIdent");
 
-       var x AST.Expr = P.ParseIdent();
-       if P.tok == Scanner.PERIOD {
+       if ident == nil {
+               ident = P.ParseIdent();
+       }
+       var qident AST.Expr = ident;
+       for P.tok == Scanner.PERIOD {
                pos := P.pos;
                P.Next();
                y := P.ParseIdent();
 
                z := new(AST.Selector);
-               z.pos, z.x, z.field = pos, x, y.val;
-               x = z;
+               z.pos, z.x, z.field = pos, qident, y.val;
+               qident = z;
        }
        
        P.Ecart();
-       return x;
+       return qident;
 }
 
 
@@ -200,7 +203,7 @@ func (P *Parser) ParseVarType() AST.Type {
 func (P *Parser) ParseTypeName() AST.Type {
        P.Trace("TypeName");
        
-       typ := P.ParseQualifiedIdent();
+       typ := P.ParseQualifiedIdent(nil);
 
        P.Ecart();
        return typ;
@@ -256,8 +259,26 @@ func (P *Parser) ParseVarDeclList() *AST.VarDeclList {
        P.Trace("VarDeclList");
        
        vars := new(AST.VarDeclList);
-       vars.idents = P.ParseIdentList();
-       vars.typ = P.ParseVarType();
+       if P.tok == Scanner.IDENT {
+               vars.idents = P.ParseIdentList();
+               typ, ok := P.TryType();
+               if ok {
+                       vars.typ = typ;
+               } else {
+                       // we had an anonymous var, and the ident may be it's typename
+                       // or the package name of a qualified identifier representing
+                       // the typename
+                       if vars.idents.len() == 1 {
+                               vars.typ = P.ParseQualifiedIdent(vars.idents.at(0));
+                               vars.idents = nil;
+                       } else {
+                               P.Error(P.pos, "type expected");
+                               vars.typ = AST.NIL;
+                       }
+               }
+       } else {
+               vars.typ = P.ParseVarType();
+       }
        
        P.Ecart();
        return vars;
@@ -987,7 +1008,11 @@ func (P *Parser) ParseControlClause(keyword int) *AST.ControlClause {
                                }
                        }
                } else {
-                       ctrl.expr, ctrl.has_expr = ctrl.init, ctrl.has_init;
+                       //ctrl.expr, ctrl.has_expr = ctrl.init, ctrl.has_init;
+                       
+                       ctrl.expr = ctrl.init;
+                       ctrl.has_expr = ctrl.has_init;
+                       
                        ctrl.init, ctrl.has_init = AST.NIL, false;
                }
        }

diff --git a/usr/gri/pretty/printer.go b/usr/gri/pretty/printer.go
index 52572cedd9860fe3c3b9e4c6981648cf51f5187d..747655d22f94bda5cc61a32615e25db2a309abff 100644 (file)
--- a/usr/gri/pretty/printer.go
+++ b/usr/gri/pretty/printer.go
@@ -182,8 +182,10 @@ func (P *Printer) DoVarDecl(x *AST.VarDecl) {
 
 
 func (P *Printer) DoVarDeclList(x *AST.VarDeclList) {
-       P.PrintList(x.idents);
-       P.String(" ");
+       if x.idents != nil {
+               P.PrintList(x.idents);  
+               P.String(" ");
+       }
        P.Print(x.typ);
 }