From a2487dec1e487f440b322f18df10c2a57e5ca66e Mon Sep 17 00:00:00 2001 From: Paul Cadman Date: Thu, 26 Sep 2024 10:50:19 +0100 Subject: [PATCH] Parse stdlibPlaceholder in Nockma parser The strings "nil", "functionsPlaceholder", and "stdlibPlaceholder" all parse to Nockma nil. --- src/Juvix/Compiler/Nockma/Translation/FromSource/Base.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Juvix/Compiler/Nockma/Translation/FromSource/Base.hs b/src/Juvix/Compiler/Nockma/Translation/FromSource/Base.hs index 00166fa73e..4789007866 100644 --- a/src/Juvix/Compiler/Nockma/Translation/FromSource/Base.hs +++ b/src/Juvix/Compiler/Nockma/Translation/FromSource/Base.hs @@ -135,14 +135,11 @@ atomWithLoc p n = do return (set atomLoc (Just loc) n) atomNil :: Parser (Atom Natural) -atomNil = symbol Str.nil $> nockNil +atomNil = choice (map symbol [Str.nil, Str.functionsPlaceholder, Str.stdlibPlaceholder]) $> nockNil atomVoid :: Parser (Atom Natural) atomVoid = symbol Str.void $> nockVoid -atomFunctionsPlaceholder :: Parser (Atom Natural) -atomFunctionsPlaceholder = symbol Str.functionsPlaceholder $> nockNil - atomStringLiteral :: Parser (Atom Natural) atomStringLiteral = do WithLoc loc s <- withLoc stringLiteral @@ -163,7 +160,6 @@ patom = do <|> atomBool <|> atomNil <|> atomVoid - <|> atomFunctionsPlaceholder <|> try atomStringLiteral iden :: Parser Text