From dd28f3c0f9572e4fc8db4aafb5a3e91763cba6c6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 16 Dec 2018 11:03:31 +1100 Subject: [PATCH] Remove the "? but not !?" effect --- lang/ast/ast.go | 2 -- lang/parse/parse.go | 28 ++++++++++++---------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 9d6c111e..4316d901 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -129,8 +129,6 @@ func (e Effect) String() string { return "" case EffectImpure: return "!" - case EffectOptional: - return "?" case EffectImpure | EffectOptional: return "!?" case EffectImpure | EffectOptional | EffectCoroutine: diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 600c4807..e7ab0f97 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -1126,21 +1126,17 @@ func (p *parser) parseOperand() (*a.Expr, error) { } func (p *parser) parseEffect() a.Effect { - switch p.peek1() { - case t.IDQuestion: - p.src = p.src[1:] - return a.EffectOptional - case t.IDExclam: - p.src = p.src[1:] - if p.peek1() != t.IDQuestion { - return a.EffectImpure - } - p.src = p.src[1:] - if p.peek1() != t.IDQuestion { - return a.EffectImpure | a.EffectOptional - } - p.src = p.src[1:] - return a.EffectImpure | a.EffectOptional | a.EffectCoroutine + if p.peek1() != t.IDExclam { + return 0 } - return 0 + p.src = p.src[1:] + if p.peek1() != t.IDQuestion { + return a.EffectImpure + } + p.src = p.src[1:] + if p.peek1() != t.IDQuestion { + return a.EffectImpure | a.EffectOptional + } + p.src = p.src[1:] + return a.EffectImpure | a.EffectOptional | a.EffectCoroutine }