Simplified AST:

- one node for array and slice types
- one node for index and slice expressions
- simplified parser, astprinter, and ast.txt

R=r
DELTA=71  (0 added, 43 deleted, 28 changed)
OCL=28768
CL=28768

1 files changed, 7 insertions, 18 deletions

diff --git a/usr/gri/pretty/astprinter.go b/usr/gri/pretty/astprinter.go
index c45508868f..9c1fe74394 100644
--- a/usr/gri/pretty/astprinter.go
+++ b/usr/gri/pretty/astprinter.go
@@ -735,16 +735,10 @@ func (P *Printer) DoIndexExpr(x *ast.IndexExpr) {
 	P.Expr1(x.X, token.HighestPrec);
 	P.Token(noPos, token.LBRACK);
 	P.Expr(x.Index);
-	P.Token(noPos, token.RBRACK);
-}
-
-
-func (P *Printer) DoSliceExpr(x *ast.SliceExpr) {
-	P.Expr1(x.X, token.HighestPrec);
-	P.Token(noPos, token.LBRACK);
-	P.Expr(x.Begin);
-	P.Token(noPos, token.COLON);
-	P.Expr(x.End);
+	if x.End != nil {
+		P.Token(noPos, token.COLON);
+		P.Expr(x.End);
+	}
 	P.Token(noPos, token.RBRACK);
 }
 
@@ -772,14 +766,9 @@ func (P *Printer) DoEllipsis(x *ast.Ellipsis) {
 
 func (P *Printer) DoArrayType(x *ast.ArrayType) {
 	P.Token(x.Pos(), token.LBRACK);
-	P.Expr(x.Len);
-	P.Token(noPos, token.RBRACK);
-	P.Expr(x.Elt);
-}
-
-
-func (P *Printer) DoSliceType(x *ast.SliceType) {
-	P.Token(x.Pos(), token.LBRACK);
+	if x.Len != nil {
+		P.Expr(x.Len);
+	}
 	P.Token(noPos, token.RBRACK);
 	P.Expr(x.Elt);
 }