summaryrefslogtreecommitdiff
path: root/source/Syntax/Concrete
diff options
context:
space:
mode:
authoradelon <22380201+adelon@users.noreply.github.com>2026-02-18 15:43:37 +0100
committeradelon <22380201+adelon@users.noreply.github.com>2026-02-18 15:43:37 +0100
commit8ed526413337192f7b5a283e959c7305d7e2eb55 (patch)
tree486770950ef5a0500a69dfae90f12e9eea3da139 /source/Syntax/Concrete
parent3cfe46c9912c2a1835a5080b5e8abab8448fdc10 (diff)
Allow more keywords
Diffstat (limited to 'source/Syntax/Concrete')
-rw-r--r--source/Syntax/Concrete/Keywords.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/Syntax/Concrete/Keywords.hs b/source/Syntax/Concrete/Keywords.hs
index f03e976..a7ac169 100644
--- a/source/Syntax/Concrete/Keywords.hs
+++ b/source/Syntax/Concrete/Keywords.hs
@@ -163,8 +163,10 @@ _satisfying :: Prod r Text (Located Token) Location
_satisfying = _suchThat <|> word "satisfying" ? "satisfying"
_setOf :: Prod r Text (Located Token) Location
_setOf = word "set" <* word "of" ? "set of"
+_now :: Prod r Text (Located Token) Location
+_now = (word "then" <|> word "next" <|> word "now" <|> word "first" <|> word "finally" <|> word "subsequently" <|> word "ultimately")
_show :: Prod r Text (Located Token) Location
-_show = optional (word "first" <|> word "finally" <|> word "next" <|> word "now") *> optional (word "we") *> word "show" <* optional (word "that")
+_show = optional _now *> optional (word "we") *> word "show" <* optional (word "that")
_since :: Prod r Text (Located Token) Location
_since = word "since" <|> word "because" ? "since"
_some :: Prod r Text (Located Token) Location
@@ -176,7 +178,7 @@ _sufficesThat = word "it" <* word "suffices" <* word "to" <* word "show" <* word
_suppose :: Prod r Text (Located Token) Location
_suppose = (word "suppose" <|> word "assume") <* optional (word "that") ? "assume"
_take :: Prod r Text (Located Token) Location
-_take = word "take" <|> word "consider" ? "take"
+_take = optional _now *> (word "take" <|> word "consider") ? "take"
_that :: Prod r Text (Located Token) Location
_that = word "that" ? "that"
_the :: Prod r Text (Located Token) Location
@@ -184,7 +186,7 @@ _the = word "the" ? "the"
_then :: Prod r Text (Located Token) Location
_then = word "then" ? "then"
_thus :: Prod r Text (Located Token) Location
-_thus = word "thus" <|> word "then" <|> word "hence" <|> word "now" <|> word "finally" <|> word "therefore" ? "thus"
+_thus = word "thus" <|> word "hence" <|> _now <|> word "therefore" ? "thus"
_trivial :: Prod r Text (Located Token) Location
_trivial = word "straightforward" <|> word "trivial" ? "trivial"
_unique :: Prod r Text (Located Token) Location