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

Fix typos #1595

Merged
merged 1 commit into from
Dec 7, 2019
Merged

Fix typos #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dhall-json/src/Dhall/JSONToDhall.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ App List Natural

>>> typeCheckSchemaExpr id =<< resolveSchemaExpr "+1"
*** Exception:
Error: Schema expression is succesfully parsed but has Dhall type:
Error: Schema expression is successfully parsed but has Dhall type:
Integer
Expected Dhall type: Type
Parsed expression: +1
Expand Down Expand Up @@ -641,7 +641,7 @@ showCompileError format showValue = let prefix = red "\nError: "
TypeError e -> show e

BadDhallType t e -> prefix
<> "Schema expression is succesfully parsed but has Dhall type:\n"
<> "Schema expression is successfully parsed but has Dhall type:\n"
<> showExpr t <> "\nExpected Dhall type: Type"
<> "\nParsed expression: "
<> showExpr e <> "\n"
Expand Down
2 changes: 1 addition & 1 deletion dhall/tests/Dhall/Test/Dhall.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ shouldShowDetailedTypeError = testCase "detailed TypeError" $ do

case inputEx of
Left ex -> assertEqual assertMsg expectedMsg (show ex)
Right _ -> fail "The extraction using a wrong type succeded"
Right _ -> fail "The extraction using a wrong type succeeded"

-- https://github.com/dhall-lang/dhall-haskell/issues/915
shouldHandleUnionLiteral :: TestTree
Expand Down
2 changes: 1 addition & 1 deletion dhall/tests/Dhall/Test/Regression.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ parsing0 = Test.Tasty.HUnit.testCase "Parsing regression #0" (do
-- Verify that parsing should not fail
--
-- In 267093f8cddf1c2f909f2d997c31fd0a7cb2440a I broke the parser when left
-- factoring the grammer by failing to handle the source tested by this
-- factoring the grammar by failing to handle the source tested by this
-- regression test. The root of the problem was that the parser was trying
-- to parse `List ./Node` as `Field List "/Node"` instead of
-- `App List (Embed (Path (File Homeless "./Node") Code))`. The latter is
Expand Down