From 5f5791e56d6af0d51e8bb5b87a1ff2a77e552b33 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 2 Dec 2017 12:25:50 +1100 Subject: [PATCH] Remove redundant builtin.TrimQuotes function --- cmd/wuffs-c/internal/cgen/expr.go | 2 +- cmd/wuffs/gen.go | 3 +-- lang/builtin/builtin.go | 7 ------- lang/check/check.go | 4 ++-- lang/check/type.go | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index a42f00fe..18b6b771 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -442,7 +442,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare case t.KeyError, t.KeyStatus, t.KeySuspension: status := g.statusMap[n.ID1()] if status.name == "" { - msg := builtin.TrimQuotes(n.ID1().Str(g.tm)) + msg, _ := t.Unescape(n.ID1().Str(g.tm)) z := builtin.StatusMap[msg] if z.Message == "" { return fmt.Errorf("no status code for %q", msg) diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index ba76a34d..214b1cb7 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -25,7 +25,6 @@ import ( "path/filepath" "strings" - "github.com/google/wuffs/lang/builtin" "github.com/google/wuffs/lang/generate" a "github.com/google/wuffs/lang/ast" @@ -180,7 +179,7 @@ func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error { continue } useDirname := h.tm.ByID(n.Use().Path()) - useDirname = builtin.TrimQuotes(useDirname) + useDirname, _ = t.Unescape(useDirname) if err := h.gen(useDirname, false); err != nil { return err } diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index c2b60b5d..49bf9535 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -60,10 +60,3 @@ func init() { // TODO: a collection of forbidden variable names like and, or, not, as, ref, // deref, false, true, in, out, this, u8, u16, etc? - -func TrimQuotes(s string) string { - if len(s) >= 2 && s[0] == '"' && s[len(s)-1] == '"' { - return s[1 : len(s)-1] - } - return s -} diff --git a/lang/check/check.go b/lang/check/check.go index d3c19671..ba17bd7b 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -22,7 +22,6 @@ import ( "math/big" "github.com/google/wuffs/lang/base38" - "github.com/google/wuffs/lang/builtin" a "github.com/google/wuffs/lang/ast" t "github.com/google/wuffs/lang/token" @@ -246,8 +245,9 @@ func (c *Checker) checkStatus(node *a.Node) error { n := node.Status() id := n.Message() if other, ok := c.statuses[id]; ok { + s, _ := t.Unescape(id.Str(c.tm)) return &Error{ - Err: fmt.Errorf("check: duplicate status %q", builtin.TrimQuotes(id.Str(c.tm))), + Err: fmt.Errorf("check: duplicate status %q", s), Filename: n.Filename(), Line: n.Line(), OtherFilename: other.Status.Filename(), diff --git a/lang/check/type.go b/lang/check/type.go index 80422ac9..b8671130 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -633,7 +633,7 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { if s, ok := q.c.statuses[n.ID1()]; ok { declaredKeyword = s.Status.Keyword() } else { - msg := builtin.TrimQuotes(n.ID1().Str(q.tm)) + msg, _ := t.Unescape(n.ID1().Str(q.tm)) z, ok := builtin.StatusMap[msg] if !ok { return fmt.Errorf("check: no error or status with message %q", msg)