From 54567dbd471e1f2f761de911b3b8007158418307 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 11 May 2017 09:48:01 +1000 Subject: [PATCH] Rename ParseFile, RenderFile to Parse, Render. Also make various funcs' arg order consist wrt the IDMap and the input or inputs. --- cmd/puffsfmt/main.go | 8 ++++---- lang/check/check.go | 4 ++-- lang/check/check_test.go | 8 ++++---- lang/parse/parse.go | 2 +- lang/render/render.go | 2 +- lang/token/token.go | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/puffsfmt/main.go b/cmd/puffsfmt/main.go index e317da31..2cda5bb4 100644 --- a/cmd/puffsfmt/main.go +++ b/cmd/puffsfmt/main.go @@ -107,18 +107,18 @@ func do(r io.Reader, filename string) error { return err } - idMap := token.IDMap{} - tokens, comments, err := token.Tokenize(src, &idMap, filename) + idMap := &token.IDMap{} + tokens, comments, err := token.Tokenize(idMap, filename, src) if err != nil { return err } // We don't need the AST node to pretty-print, but it's worth puffsfmt // rejecting syntax errors. This is just a parse, not a full type check. - if _, err := parse.ParseFile(tokens, &idMap, filename); err != nil { + if _, err := parse.Parse(idMap, filename, tokens); err != nil { return err } buf := &bytes.Buffer{} - if err := render.RenderFile(buf, tokens, comments, &idMap); err != nil { + if err := render.Render(buf, idMap, tokens, comments); err != nil { return err } dst := buf.Bytes() diff --git a/lang/check/check.go b/lang/check/check.go index c044b83c..36f5f8fd 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -21,7 +21,7 @@ var ( ) // TypeString returns a string form of the type n. -func TypeString(n *a.Node, m *t.IDMap) string { +func TypeString(m *t.IDMap, n *a.Node) string { if n == nil { return "!nil!" } @@ -38,7 +38,7 @@ func TypeString(n *a.Node, m *t.IDMap) string { case 0: return m.ByID(n.ID1) case t.IDPtr: - return "ptr " + TypeString(n.RHS, m) + return "ptr " + TypeString(m, n.RHS) case t.IDOpenBracket: // TODO. default: diff --git a/lang/check/check_test.go b/lang/check/check_test.go index 7cf389b8..60d52438 100644 --- a/lang/check/check_test.go +++ b/lang/check/check_test.go @@ -24,14 +24,14 @@ func TestCheck(t *testing.T) { idMap := &token.IDMap{} - tokens, _, err := token.Tokenize([]byte(src), idMap, filename) + tokens, _, err := token.Tokenize(idMap, filename, []byte(src)) if err != nil { t.Fatalf("Tokenize: %v", err) } - node, err := parse.ParseFile(tokens, idMap, filename) + node, err := parse.Parse(idMap, filename, tokens) if err != nil { - t.Fatalf("ParseFile: %v", err) + t.Fatalf("Parse: %v", err) } c, err := Check(idMap, node) @@ -57,7 +57,7 @@ func TestCheck(t *testing.T) { for id, typ := range bar.LocalVars { got = append(got, [2]string{ idMap.ByID(id), - TypeString(typ, idMap), + TypeString(idMap, typ), }) } sort.Slice(got, func(i, j int) bool { diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 04a7aba7..b69fc18b 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -12,7 +12,7 @@ import ( t "github.com/google/puffs/lang/token" ) -func ParseFile(src []t.Token, m *t.IDMap, filename string) (*a.Node, error) { +func Parse(m *t.IDMap, filename string, src []t.Token) (*a.Node, error) { p := &parser{ src: src, m: m, diff --git a/lang/render/render.go b/lang/render/render.go index 00053152..5877590c 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -16,7 +16,7 @@ import ( var newLine = []byte{'\n'} -func RenderFile(w io.Writer, src []token.Token, comments []string, m *token.IDMap) (err error) { +func Render(w io.Writer, m *token.IDMap, src []token.Token, comments []string) (err error) { if len(src) == 0 { return nil } diff --git a/lang/token/token.go b/lang/token/token.go index cbea0a4f..b4755f02 100644 --- a/lang/token/token.go +++ b/lang/token/token.go @@ -99,7 +99,7 @@ func hasPrefix(a []byte, s string) bool { return true } -func Tokenize(src []byte, m *IDMap, filename string) (tokens []Token, comments []string, retErr error) { +func Tokenize(m *IDMap, filename string, src []byte) (tokens []Token, comments []string, retErr error) { line := uint32(1) loop: for i := 0; i < len(src); {