From fc6f93615ea007a4b4556ff7f67573cd70d24c7c Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 21 Nov 2008 09:35:49 -0800 Subject: - implemented arbitrary padding char for tabwriter - implemented right-to-left alignment (numerical results) - better comments and error handling - added more tests - updated dependent files R=r DELTA=232 (175 added, 11 deleted, 46 changed) OCL=19761 CL=19780 --- usr/gri/pretty/printer.go | 6 +++++- usr/gri/pretty/untab.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'usr/gri/pretty') diff --git a/usr/gri/pretty/printer.go b/usr/gri/pretty/printer.go index cefabb66f..6bb755b4b 100644 --- a/usr/gri/pretty/printer.go +++ b/usr/gri/pretty/printer.go @@ -604,7 +604,11 @@ func (P *Printer) Declaration(d *AST.Decl, parenthesized bool) { func (P *Printer) Program(p *AST.Program) { // TODO should initialize all fields? - P.writer = TabWriter.New(OS.Stdout, int(tabwidth.IVal()), 1, usetabs.BVal()); + padchar := byte(' '); + if usetabs.BVal() { + padchar = '\t'; + } + P.writer = TabWriter.New(OS.Stdout, int(tabwidth.IVal()), 1, padchar, true); P.clist = p.comments; P.cindex = 0; diff --git a/usr/gri/pretty/untab.go b/usr/gri/pretty/untab.go index cd5981b53..af4814c1d 100644 --- a/usr/gri/pretty/untab.go +++ b/usr/gri/pretty/untab.go @@ -36,7 +36,11 @@ func Untab(name string, src *os.FD, dst *tabwriter.Writer) { func main() { flag.Parse(); - dst := tabwriter.New(os.Stdout, int(tabwidth.IVal()), 1, usetabs.BVal()); + padchar := byte(' '); + if usetabs.BVal() { + padchar = '\t'; + } + dst := tabwriter.New(os.Stdout, int(tabwidth.IVal()), 1, padchar, true); if flag.NArg() > 0 { for i := 0; i < flag.NArg(); i++ { name := flag.Arg(i); -- cgit v1.2.3