Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parser labels #1535

Merged
merged 2 commits into from
Sep 16, 2022
Merged

Parser labels #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03a1e7b
add some labels to the parser
janmasrovira Sep 14, 2022
7c59157
format
janmasrovira Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/Juvix/Compiler/Concrete/Translation/FromSource.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ topModulePath = mkTopModulePath <$> dottedSymbol
--------------------------------------------------------------------------------

statement :: Members '[Reader ParserParams, InfoTableBuilder, JudocStash, NameIdGen] r => ParsecS r (Statement 'Parsed)
statement = do
statement = P.label "<top level statement>" $ do
void (optional stashJudoc)
(StatementOperator <$> operatorSyntaxDef)
<|> (StatementOpenModule <$> openModule)
Expand Down Expand Up @@ -293,16 +293,17 @@ import_ = do

expressionAtom :: Members '[Reader ParserParams, InfoTableBuilder, JudocStash, NameIdGen] r => ParsecS r (ExpressionAtom 'Parsed)
expressionAtom =
AtomLiteral <$> P.try literal
<|> (AtomIdentifier <$> name)
<|> (AtomUniverse <$> universe)
<|> (AtomLambda <$> lambda)
<|> (AtomFunction <$> function)
<|> (AtomLetBlock <$> letBlock)
<|> (AtomFunArrow <$ kwRightArrow)
<|> (AtomHole <$> hole)
<|> parens (AtomParens <$> parseExpressionAtoms)
<|> braces (AtomBraces <$> withLoc parseExpressionAtoms)
P.label "<expression>" $
AtomLiteral <$> P.try literal
<|> (AtomIdentifier <$> name)
<|> (AtomUniverse <$> universe)
<|> (AtomLambda <$> lambda)
<|> (AtomFunction <$> function)
<|> (AtomLetBlock <$> letBlock)
<|> (AtomFunArrow <$ kwRightArrow)
<|> (AtomHole <$> hole)
<|> parens (AtomParens <$> parseExpressionAtoms)
<|> braces (AtomBraces <$> withLoc parseExpressionAtoms)

parseExpressionAtoms ::
Members '[Reader ParserParams, InfoTableBuilder, JudocStash, NameIdGen] r =>
Expand Down Expand Up @@ -520,10 +521,11 @@ wildcard = Wildcard . snd <$> interval kwWildcard

patternAtom :: Members '[Reader ParserParams, InfoTableBuilder, JudocStash, NameIdGen] r => ParsecS r (PatternAtom 'Parsed)
patternAtom =
PatternAtomIden <$> name
<|> PatternAtomWildcard <$> wildcard
<|> (PatternAtomParens <$> parens parsePatternAtoms)
<|> (PatternAtomBraces <$> braces parsePatternAtoms)
P.label "<pattern>" $
PatternAtomIden <$> name
<|> PatternAtomWildcard <$> wildcard
<|> (PatternAtomParens <$> parens parsePatternAtoms)
<|> (PatternAtomBraces <$> braces parsePatternAtoms)

parsePatternAtoms :: Members '[Reader ParserParams, InfoTableBuilder, JudocStash, NameIdGen] r => ParsecS r (PatternAtoms 'Parsed)
parsePatternAtoms = do
Expand Down Expand Up @@ -552,7 +554,7 @@ pmodulePath = case sing :: SModuleIsTop t of
SModuleLocal -> symbol

moduleDef :: (SingI t, Members '[Reader ParserParams, InfoTableBuilder, JudocStash, NameIdGen] r) => ParsecS r (Module 'Parsed t)
moduleDef = do
moduleDef = P.label "<module definition>" $ do
kwModule
_moduleDoc <- getJudoc
_modulePath <- pmodulePath
Expand Down
14 changes: 9 additions & 5 deletions src/Juvix/Compiler/Concrete/Translation/FromSource/Lexer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ judocStart = P.chunk Str.judocStart >> hspace
judocEmptyLine :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
judocEmptyLine = lexeme (void (P.try (judocStart >> P.newline)))

-- | We use the ascii version in the label so it shows in the error messages.
keywordUnicode :: Members '[Reader ParserParams, InfoTableBuilder] r => Text -> Text -> ParsecS r ()
keywordUnicode ascii unic = P.label (unpack ascii) (keyword ascii <|> keyword unic)

keyword :: Members '[Reader ParserParams, InfoTableBuilder] r => Text -> ParsecS r ()
keyword kw = do
l <- keywordL' space kw
Expand Down Expand Up @@ -146,7 +150,7 @@ kwBuiltin :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwBuiltin = keyword Str.builtin

kwAssign :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwAssign = keyword Str.assignUnicode <|> keyword Str.assignAscii
kwAssign = keywordUnicode Str.assignAscii Str.assignUnicode

kwAxiom :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwAxiom = keyword Str.axiom
Expand All @@ -155,7 +159,7 @@ kwColon :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwColon = keyword Str.colon

kwColonOmega :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwColonOmega = keyword Str.colonOmegaUnicode <|> keyword Str.colonOmegaAscii
kwColonOmega = keywordUnicode Str.colonOmegaAscii Str.colonOmegaUnicode

kwColonOne :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwColonOne = keyword Str.colonOne
Expand Down Expand Up @@ -194,13 +198,13 @@ kwInfixr :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwInfixr = keyword Str.infixr_

kwLambda :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwLambda = keyword Str.lambdaUnicode <|> keyword Str.lambdaAscii
kwLambda = keywordUnicode Str.lambdaAscii Str.lambdaUnicode

kwLet :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwLet = keyword Str.let_

kwMapsTo :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwMapsTo = keyword Str.mapstoUnicode <|> keyword Str.mapstoAscii
kwMapsTo = keywordUnicode Str.mapstoAscii Str.mapstoUnicode

kwModule :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwModule = keyword Str.module_
Expand All @@ -215,7 +219,7 @@ kwPublic :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwPublic = keyword Str.public

kwRightArrow :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwRightArrow = keyword Str.toUnicode <|> keyword Str.toAscii
kwRightArrow = keywordUnicode Str.toAscii Str.toUnicode

kwSemicolon :: Members '[Reader ParserParams, InfoTableBuilder] r => ParsecS r ()
kwSemicolon = keyword Str.semicolon
Expand Down