From 84f9d3a915190b27d3e22fa99eac984acbc084d0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 27 Dec 2018 11:01:55 +1100 Subject: [PATCH] Prohibit "this.etc = etc" inside pure functions --- lang/parse/parse.go | 26 +++++++++++++++++++++++--- std/adler32/common_adler32.wuffs | 2 -- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index ec27dea8..7bfd33e2 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -654,10 +654,30 @@ func (p *parser) parseAssignNode() (*a.Node, error) { return nil, fmt.Errorf(`parse: assignment LHS %q is not effect-free at %s:%d`, lhs.Str(p.tm), p.filename, p.line()) } - if lhs.Operator() == 0 && lhs.Ident().IsLiteral(p.tm) { - return nil, fmt.Errorf(`parse: assignment LHS %q is a literal at %s:%d`, - lhs.Str(p.tm), p.filename, p.line()) + + for l := lhs; l != nil; l = l.LHS().AsExpr() { + switch l.Operator() { + case 0: + 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 { + if l == lhs { + return nil, fmt.Errorf(`parse: cannot assign to "this" at %s:%d`, p.filename, p.line()) + } + if !p.funcEffect.Impure() { + return nil, fmt.Errorf(`parse: cannot assign to %q in a pure function at %s:%d`, + lhs.Str(p.tm), p.filename, p.line()) + } + } + case t.IDDot, t.IDOpenBracket: + // No-op. + default: + return nil, fmt.Errorf(`parse: invalid assignment LHS %q at %s:%d`, + lhs.Str(p.tm), p.filename, p.line()) + } } + rhs, err = p.parseExpr() if err != nil { return nil, err diff --git a/std/adler32/common_adler32.wuffs b/std/adler32/common_adler32.wuffs index 5aa66c19..4a5036ca 100644 --- a/std/adler32/common_adler32.wuffs +++ b/std/adler32/common_adler32.wuffs @@ -53,8 +53,6 @@ pub func hasher.update!(x slice base.u8) base.u32 { args.x = remaining } - // TODO: check that you can't assign to this.foo unless the method's effect - // is "!" impure or "?" impure coroutine. this.state = ((s2 & 0xFFFF) << 16) | (s1 & 0xFFFF) return this.state }