Remove redundant builtin.TrimQuotes function

This commit is contained in:
Nigel Tao committed 2017-12-02 12:25:50 +11:00
1 parent 404b149a9a
commit 5f5791e56d
5 files changed
+5 -13

No files matched your search

+2 -2
View File
@@ -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(),
+1 -1
View File
@@ -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)