From f0692e5ca28833a90b3d65772c205b6bafb153f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=CC=88zgu=CC=88r=20Akgu=CC=88n?= Date: Thu, 23 Nov 2023 13:35:56 +0000 Subject: [PATCH] rename letting_anon to letting_unnamed --- src/Conjure/Language/AST/ASTParser.hs | 2 +- src/Conjure/Language/AST/Reformer.hs | 2 +- src/Conjure/Language/AST/Syntax.hs | 6 +++--- src/Conjure/Language/Validator.hs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Conjure/Language/AST/ASTParser.hs b/src/Conjure/Language/AST/ASTParser.hs index 8a7a20737..a173b95b8 100644 --- a/src/Conjure/Language/AST/ASTParser.hs +++ b/src/Conjure/Language/AST/ASTParser.hs @@ -138,7 +138,7 @@ parseLetting = try $ do lSize <- want L_size guard (not $ all isMissing [lOf,lSize]) expr <- parseExpression - return $ LettingAnon lNew lType lOf lSize expr + return $ LettingUnnamed lNew lType lOf lSize expr finishEnum = do lNew <- want L_new lType <- want L_type diff --git a/src/Conjure/Language/AST/Reformer.hs b/src/Conjure/Language/AST/Reformer.hs index 6490c9112..bd280b122 100644 --- a/src/Conjure/Language/AST/Reformer.hs +++ b/src/Conjure/Language/AST/Reformer.hs @@ -51,7 +51,7 @@ instance HighLevelTree LettingAssignmentNode where LettingExpr d -> makeTree d LettingDomain d e -> makeTree d <> makeTree e LettingEnum d e f g -> mconcat [makeTree d, makeTree e, makeTree f, makeTree g] - LettingAnon d e f g h -> mconcat [makeTree d, makeTree e, makeTree f, makeTree g, makeTree h] + LettingUnnamed d e f g h -> mconcat [makeTree d, makeTree e, makeTree f, makeTree g, makeTree h] instance HighLevelTree FindStatementNode where makeTree (FindStatementNode a b c) = mconcat [makeTree a, makeTree b, makeTree c] diff --git a/src/Conjure/Language/AST/Syntax.hs b/src/Conjure/Language/AST/Syntax.hs index 2c39b53e1..771b0089d 100644 --- a/src/Conjure/Language/AST/Syntax.hs +++ b/src/Conjure/Language/AST/Syntax.hs @@ -165,7 +165,7 @@ data LettingAssignmentNode LToken -- lType LToken -- lEnum (ListNode NameNode) -- nameList - | LettingAnon + | LettingUnnamed LToken -- lNew LToken -- lType LToken -- lOf @@ -178,13 +178,13 @@ instance Pretty LettingAssignmentNode where LettingExpr en -> pretty en LettingDomain lt dn -> pretty lt <+> pretty dn LettingEnum lt lt' lt2 ln -> pretty lt <+> pretty lt' <+> pretty lt2 <+> pretty ln - LettingAnon lt lt' lt2 lt3 en -> pretty lt <+> pretty lt' <+> pretty lt2 <+> pretty lt3 <+> pretty en + LettingUnnamed lt lt' lt2 lt3 en -> pretty lt <+> pretty lt' <+> pretty lt2 <+> pretty lt3 <+> pretty en instance Null LettingAssignmentNode where isMissing x = case x of LettingExpr en -> isMissing en LettingDomain lt dn -> isMissing lt && isMissing dn LettingEnum l1 l2 l3 ln -> all isMissing [l1, l2, l3] && isMissing ln - LettingAnon l1 l2 l3 l4 en -> all isMissing [l1, l2, l3, l4] && isMissing en + LettingUnnamed l1 l2 l3 l4 en -> all isMissing [l1, l2, l3, l4] && isMissing en -- Branching on diff --git a/src/Conjure/Language/Validator.hs b/src/Conjure/Language/Validator.hs index ec6143bbb..b3c7d05bd 100644 --- a/src/Conjure/Language/Validator.hs +++ b/src/Conjure/Language/Validator.hs @@ -628,9 +628,9 @@ validateLettingAssignment names (LettingEnum l1 l2 l3 enames) = do | (r, name@(Name n)) <- names' ] return $ [LettingDomainDefnEnum n members | (_, n) <- names'] -validateLettingAssignment names (LettingAnon l1 l2 l3 l4 szExp) = do +validateLettingAssignment names (LettingUnnamed l1 l2 l3 l4 szExp) = do [l1, l2, l3, l4] `are` TtKeyword -- TODO keywords - putDocs KeywordD "letting_anon" [l1, l2, l3, l4] + putDocs KeywordD "letting_unnamed" [l1, l2, l3, l4] names' <- validateSequence (validateNameAs TtEnum) names size <- do setContextFrom szExp