Skip to content

Clarify whitespace lex error in qualified identifier lexing #3845

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

Open
colinwahl wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Clarify whitespace lex error in qualified identifier lexing #3845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
664ae3b
ErrQualifierLexeme
Apr 7, 2020
1390079
space
Apr 12, 2020
bdf410b
Revert "space"
Apr 12, 2020
eb07003
space
Apr 12, 2020
9adc63a
remove extra space in arg
Apr 12, 2020
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
5 changes: 5 additions & 0 deletions lib/purescript-cst/src/Language/PureScript/CST/Errors.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ data ParserErrorType
| ErrQualifiedName
| ErrEmptyDo
| ErrLexeme (Maybe String) [String]
| ErrQualifierLexeme Char
Copy link
Copy Markdown
Member

@rhendric rhendric Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By analogy with ErrImportInDecl, ErrTypeInConstraint, etc., should this be ErrLexemeInQualified?

| ErrEof
| ErrCustom String
deriving (Show, Eq, Ord)
Expand Down Expand Up @@ -128,6 +129,10 @@ prettyPrintErrorMessage (ParserErrorInfo {..}) = case errType of
"Illegal whitespace character " <> displayCodePoint hd
ErrLexeme (Just a) _ ->
"Unexpected " <> a
ErrQualifierLexeme hd | isSpace hd ->
"Unexpected whitespace character " <> displayCodePoint hd <> ", expected qualifier"
Copy link
Copy Markdown
Member

@rhendric rhendric Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you mean ‘expected identifier or operator’ instead of ‘expected qualifier’? The qualifier has already been seen at this point in the parse, right?

Also, it looks like the other error messages of this nature follow an ‘Expected X, saw Y’ pattern; I'd expect these messages to match that.

ErrQualifierLexeme a ->
"Unexpected " <> [ a ] <> ", expected qualifier"
ErrLineFeedInString ->
"Unexpected line feed in string literal"
ErrAstralCodePointInChar ->
Expand Down
2 changes: 1 addition & 1 deletion lib/purescript-cst/src/Language/PureScript/CST/Lexer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ token = peek >>= maybe (pure TokEof) k0
| Char.isUpper ch2 -> next *> upper qual' ch2
| isIdentStart ch2 -> next *> lower qual' ch2
| isSymbolChar ch2 -> next *> operator qual' [ch2]
| otherwise -> throw $ ErrLexeme (Just [ch2]) []
| otherwise -> throw $ ErrQualifierLexeme ch2
Nothing ->
throw ErrEof
_ ->
Expand Down