From 89c136ebe4ccf713889ef5095c58ba964f4382f7 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 13 Jan 2019 11:15:17 +1100 Subject: [PATCH] Add token.ID.IsCannotAssignTo --- lang/parse/parse.go | 5 +++-- lang/token/list.go | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 5f04b722..466c9d57 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -660,9 +660,10 @@ func (p *parser) parseAssignNode() (*a.Node, error) { if id := l.Ident(); id.IsLiteral(p.tm) { return nil, fmt.Errorf(`parse: assignment LHS %q is a literal at %s:%d`, l.Str(p.tm), p.filename, p.line()) - } else if id == t.IDThis { + } else if id.IsCannotAssignTo() { if l == lhs { - return nil, fmt.Errorf(`parse: cannot assign to "this" at %s:%d`, p.filename, p.line()) + return nil, fmt.Errorf(`parse: cannot assign to %q at %s:%d`, + id.Str(p.tm), p.filename, p.line()) } if !p.funcEffect.Impure() { return nil, fmt.Errorf(`parse: cannot assign to %q in a pure function at %s:%d`, diff --git a/lang/token/list.go b/lang/token/list.go index bd26586e..9cf7ea9b 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -103,6 +103,7 @@ func (x ID) IsTightLeft() bool { return x < ID(len(isTightLeft)) && isTightLeft func (x ID) IsTightRight() bool { return x < ID(len(isTightRight)) && isTightRight[x] } func (x ID) IsAssign() bool { return minAssign <= x && x <= maxAssign } +func (x ID) IsCannotAssignTo() bool { return minCannotAssignTo <= x && x <= maxCannotAssignTo } func (x ID) IsClose() bool { return minClose <= x && x <= maxClose } func (x ID) IsKeyword() bool { return minKeyword <= x && x <= maxKeyword } func (x ID) IsNumType() bool { return minNumType <= x && x <= maxNumType } @@ -398,6 +399,8 @@ const ( const ( minBuiltInIdent = 0x100 + minCannotAssignTo = 0x100 + maxCannotAssignTo = 0x101 minNumTypeOrIdeal = 0x10F minNumType = 0x110 maxNumType = 0x117