go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-12 17:27:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

parse: Order pprint.go top-down; expose pprint{AST,ParseTree}

Browse Source
This commit is contained in:
Qi Xiao 2016-02-05 23:13:28 +01:00
parent 36578d2203
commit af9ca8cd14
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parse/parse_test.go
View File

@ -304,13 +304,13 @@ func TestParse(t *testing.T) {
if err != nil {
t.Errorf("Parse(%q) returns bad parse tree: %v", tc.src, err)
fmt.Fprintf(os.Stderr, "Parse tree of %q:\n", tc.src)
pprintParseTree(bn, os.Stderr)
PprintParseTree(bn, os.Stderr)
}
err = checkAST(bn, tc.ast)
if err != nil {
t.Errorf("Parse(%q) returns bad AST: %v", tc.src, err)
fmt.Fprintf(os.Stderr, "AST of %q:\n", tc.src)
pprintAST(bn, os.Stderr)
PprintAST(bn, os.Stderr)
}
}
}

46
parse/pprint.go
View File

@ -13,11 +13,9 @@ const (
indentInc = 2
)
func compactQuote(text string) string {
if len(text) > maxL+maxR+3 {
text = text[0:maxL] + "..." + text[len(text)-maxR:len(text)]
}
return strconv.Quote(text)
// PprintAST pretty prints the AST part of a Node.
func PprintAST(n Node, wr io.Writer) {
pprintAST(n, wr, 0, "")
}
type field struct {
@ -28,8 +26,7 @@ type field struct {
var zeroValue reflect.Value
// pprint the AST
func pprintASTRec(n Node, wr io.Writer, indent int, leading string) {
func pprintAST(n Node, wr io.Writer, indent int, leading string) {
nodeType := reflect.TypeOf((*Node)(nil)).Elem()
var childFields, childrenFields, propertyFields []field
@ -67,7 +64,7 @@ func pprintASTRec(n Node, wr io.Writer, indent int, leading string) {
// has only one child and no properties: coalesce
if len(propertyFields) == 0 && len(n.Children()) == 1 {
pprintASTRec(n.Children()[0], wr, indent, leading+nt.Name()+"/")
pprintAST(n.Children()[0], wr, indent, leading+nt.Name()+"/")
return
}
// print heading
@ -92,7 +89,7 @@ func pprintASTRec(n Node, wr io.Writer, indent int, leading string) {
// print lone children recursively
for _, chf := range childFields {
// TODO the name is omitted
pprintASTRec(chf.value.(Node), wr, indent+indentInc, "")
pprintAST(chf.value.(Node), wr, indent+indentInc, "")
}
// print children list recursively
for _, chf := range childrenFields {
@ -103,23 +100,17 @@ func pprintASTRec(n Node, wr io.Writer, indent int, leading string) {
// fmt.Fprintf(wr, "%*s.%s:\n", indent, "", chf.name)
for i := 0; i < children.Len(); i++ {
n := children.Index(i).Interface().(Node)
pprintASTRec(n, wr, indent+indentInc, "")
pprintAST(n, wr, indent+indentInc, "")
}
}
}
// pprint the AST
func pprintAST(n Node, wr io.Writer) {
pprintASTRec(n, wr, 0, "")
// PprintParseTree pretty prints the parse tree part of a Node.
func PprintParseTree(n Node, wr io.Writer) {
pprintParseTree(n, wr, 0)
}
func summary(n Node) string {
return fmt.Sprintf("%s %s %d-%d", reflect.TypeOf(n).Elem().Name(),
compactQuote(n.SourceText()), n.Begin(), n.End())
}
// pprint the parse tree
func pprintParseTreeRec(n Node, wr io.Writer, indent int) {
func pprintParseTree(n Node, wr io.Writer, indent int) {
leading := ""
for len(n.Children()) == 1 {
leading += reflect.TypeOf(n).Elem().Name() + "/"
@ -127,11 +118,18 @@ func pprintParseTreeRec(n Node, wr io.Writer, indent int) {
}
fmt.Fprintf(wr, "%*s%s%s\n", indent, "", leading, summary(n))
for _, ch := range n.Children() {
pprintParseTreeRec(ch, wr, indent+indentInc)
pprintParseTree(ch, wr, indent+indentInc)
}
}
// pprint the parse tree
func pprintParseTree(n Node, wr io.Writer) {
pprintParseTreeRec(n, wr, 0)
func summary(n Node) string {
return fmt.Sprintf("%s %s %d-%d", reflect.TypeOf(n).Elem().Name(),
compactQuote(n.SourceText()), n.Begin(), n.End())
}
func compactQuote(text string) string {
if len(text) > maxL+maxR+3 {
text = text[0:maxL] + "..." + text[len(text)-maxR:len(text)]
}
return strconv.Quote(text)
}