From 5d0b8e6371d1e365ff9b10e0160a39f0f1d9f359 Mon Sep 17 00:00:00 2001 From: Josh Rahm Date: Thu, 3 Oct 2024 12:58:38 -0600 Subject: Make changes to AST for qualification step. --- src/Language/Fiddle/Parser.hs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Language/Fiddle/Parser.hs') diff --git a/src/Language/Fiddle/Parser.hs b/src/Language/Fiddle/Parser.hs index 8dfaaae..a1c7a0e 100644 --- a/src/Language/Fiddle/Parser.hs +++ b/src/Language/Fiddle/Parser.hs @@ -139,15 +139,15 @@ fiddleDeclP = do case t of KWOption -> OptionDecl <$> nextTextP <*> nextTextP KWPackage -> - PackageDecl + PackageDecl () <$> name <*> defer body packageBodyP - KWUsing -> UsingDecl <$> name - KWLocation -> LocationDecl <$> ident <*> (tok TokEq >> expressionP) - KWBits -> BitsDecl <$> ident <*> (tok TokColon >> bitTypeP) + KWUsing -> UsingDecl (Witness ()) <$> name + KWLocation -> LocationDecl () <$> ident <*> (tok TokEq >> expressionP) + KWBits -> BitsDecl () <$> ident <*> (tok TokColon >> bitTypeP) KWImport -> ImportDecl <$> importStatementP KWType -> - ObjTypeDecl + ObjTypeDecl () <$> ident <*> ( do tok TokColon @@ -155,7 +155,7 @@ fiddleDeclP = do defer body (objTypeBodyP bt) ) KWInstance -> - ObjectDecl + ObjectDecl () <$> ident <*> (tok KWAt *> expressionP) <*> (tok TokColon *> objTypeP) @@ -181,7 +181,7 @@ objTypeP = do baseObjP :: P (A -> ObjType Parsed F A) baseObjP = - (ReferencedObjType <$> name) + (ReferencedObjType () <$> name) <|> ( do t <- bodyTypeP AnonymousObjType (Witness ()) <$> defer body (objTypeBodyP t) @@ -281,7 +281,7 @@ registerBitsTypeRefP = do withMeta $ (RegisterBitsJustBits <$> exprInParenP) <|> (RegisterBitsAnonymousType (Witness ()) <$> anonymousBitsTypeP) - <|> (RegisterBitsReference <$> name) + <|> (RegisterBitsReference () <$> name) anonymousBitsTypeP :: Pa AnonymousBitsType anonymousBitsTypeP = withMeta $ do -- cgit