core: add support for expressions as match clause targets

thesephist · Apr 24, 2021 · 45a8319 · 45a8319
1 parent 6e26a93
commit 45a8319
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/SPEC.md b/SPEC.md
@@ -46,7 +46,7 @@ BinaryExpr: (Atom | BinaryExpr) BinaryOp (Atom | BinaryExpr)
 
 
 MatchExpr: (Atom | BinaryExpr) '::' '{' MatchClause* '}'
-MatchClause: Atom '->' Expression
+MatchClause: Expression '->' Expression
 
 
 UnaryOp: (

diff --git a/cmd/ink.go b/cmd/ink.go
@@ -11,7 +11,7 @@ import (
 	"github.com/thesephist/ink/pkg/ink"
 )
 
-const cliVersion = "0.1.7"
+const cliVersion = "0.1.9"
 
 const helpMessage = `
 Ink is a minimal, powerful, functional programming language.

diff --git a/pkg/ink/parser.go b/pkg/ink/parser.go
@@ -458,7 +458,7 @@ func parseExpression(tokens []Tok) (Node, int, error) {
 		// consuming dangling separator
 		return atom, idx, nil
 
-	case KeyValueSeparator, RightParen:
+	case RightParen, KeyValueSeparator, CaseArrow:
 		// these belong to the parent atom that contains this expression,
 		// so return without consuming token (idx - 1)
 		return atom, idx - 1, nil
@@ -758,7 +758,7 @@ func parseMatchBody(tokens []Tok) ([]MatchClauseNode, int, error) {
 }
 
 func parseMatchClause(tokens []Tok) (MatchClauseNode, int, error) {
-	atom, idx, err := parseAtom(tokens)
+	atom, idx, err := parseExpression(tokens)
 	if err != nil {
 		return MatchClauseNode{}, 0, err
 	}