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

- minor cleanups

Browse Source 
- better debugging support
- gofmt -l src misc | wc -l is 0

R=rsc
http://go/go-review/1024042
This commit is contained in:
Robert Griesemer 2009-11-09 22:30:07 -08:00
parent 3bb0032cd6
commit 3d668c1b5d
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pkg/go/printer/nodes.go
View File

@ -110,7 +110,7 @@ func (p *printer) lineComment(d *ast.CommentGroup) {
// Sets multiLine to true if the identifier list spans multiple lines. // Sets multiLine to true if the identifier list spans multiple lines.
func (p *printer) identList(list []*ast.Ident, multiLine *bool) { func (p *printer) identList(list []*ast.Ident, multiLine *bool) {
// convert into an expression list // convert into an expression list so we can re-use exprList formatting
xlist := make([]ast.Expr, len(list)); xlist := make([]ast.Expr, len(list));
for i, x := range list { for i, x := range list {
xlist[i] = x xlist[i] = x
@ -121,7 +121,7 @@ func (p *printer) identList(list []*ast.Ident, multiLine *bool) {
// Sets multiLine to true if the string list spans multiple lines. // Sets multiLine to true if the string list spans multiple lines.
func (p *printer) stringList(list []*ast.BasicLit, multiLine *bool) { func (p *printer) stringList(list []*ast.BasicLit, multiLine *bool) {
// convert into an expression list // convert into an expression list so we can re-use exprList formatting
xlist := make([]ast.Expr, len(list)); xlist := make([]ast.Expr, len(list));
for i, x := range list { for i, x := range list {
xlist[i] = x xlist[i] = x
@ -481,13 +481,6 @@ func walkBinary(e *ast.BinaryExpr) (has5, has6 bool, maxProblem int) {
func cutoff(e *ast.BinaryExpr, depth int) int { func cutoff(e *ast.BinaryExpr, depth int) int {
if depth < 1 {
// handle gracefully unless in debug mode
if debug {
panicln("negative depth:", depth)
}
depth = 1;
}
has5, has6, maxProblem := walkBinary(e); has5, has6, maxProblem := walkBinary(e);
if maxProblem > 0 { if maxProblem > 0 {
return maxProblem + 1 return maxProblem + 1
@ -555,10 +548,8 @@ func (p *printer) binaryExpr(x *ast.BinaryExpr, prec1, cutoff, depth int, multiL
// parenthesis needed // parenthesis needed
// Note: The parser inserts an ast.ParenExpr node; thus this case // Note: The parser inserts an ast.ParenExpr node; thus this case
// can only occur if the AST is created in a different way. // can only occur if the AST is created in a different way.
// parentheses undo one level of depth
depth--;
p.print(token.LPAREN); p.print(token.LPAREN);
p.expr0(x, depth, multiLine); p.expr0(x, depth-1, multiLine); // parentheses undo one level of depth
p.print(token.RPAREN); p.print(token.RPAREN);
return; return;
} }
@ -612,7 +603,11 @@ func (p *printer) expr1(expr ast.Expr, prec1, depth int, ctxt exprContext, multi
p.print(x) p.print(x)
case *ast.BinaryExpr: case *ast.BinaryExpr:
p.binaryExpr(x, prec1, cutoff(x, depth), depth, multiLine) if depth < 1 {
p.internalError("depth < 1:", depth);
depth = 1;
}
p.binaryExpr(x, prec1, cutoff(x, depth), depth, multiLine);
case *ast.KeyValueExpr: case *ast.KeyValueExpr:
p.expr(x.Key, multiLine); p.expr(x.Key, multiLine);
@ -650,10 +645,8 @@ func (p *printer) expr1(expr ast.Expr, prec1, depth int, ctxt exprContext, multi
p.funcBody(x.Body, distance(x.Type.Pos(), p.pos), true, multiLine); p.funcBody(x.Body, distance(x.Type.Pos(), p.pos), true, multiLine);
case *ast.ParenExpr: case *ast.ParenExpr:
// parentheses undo one level of depth
depth--;
p.print(token.LPAREN); p.print(token.LPAREN);
p.expr0(x.X, depth, multiLine); p.expr0(x.X, depth-1, multiLine); // parentheses undo one level of depth
p.print(x.Rparen, token.RPAREN); p.print(x.Rparen, token.RPAREN);
case *ast.SelectorExpr: case *ast.SelectorExpr:

14
src/pkg/go/printer/printer.go
View File

@ -101,6 +101,15 @@ func (p *printer) init(output io.Writer, cfg *Config) {
} }
func (p *printer) internalError(msg ...) {
if debug {
fmt.Print(p.pos.String() + ": ");
fmt.Println(msg);
panic();
}
}
// write0 writes raw (uninterpreted) data to p.output and handles errors. // write0 writes raw (uninterpreted) data to p.output and handles errors.
// write0 does not indent after newlines, and does not HTML-escape or update p.pos. // write0 does not indent after newlines, and does not HTML-escape or update p.pos.
// //
@ -635,10 +644,7 @@ func (p *printer) writeWhitespace(n int) {
case unindent: case unindent:
p.indent--; p.indent--;
if p.indent < 0 { if p.indent < 0 {
// handle gracefully unless in debug mode p.internalError("negative indentation:", p.indent);
if debug {
panicln("negative indentation:", p.indent)
}
p.indent = 0; p.indent = 0;
} }
case newline, formfeed: case newline, formfeed: