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.

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

Delete old namespace references #3076

Merged
merged 6 commits into from Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions parser-typechecker/src/Unison/FileParser.hs
Expand Up @@ -184,11 +184,6 @@ checkForDuplicateTermsAndConstructors uf = do
-- Or it is a binding like:
-- foo : Nat -> Nat
-- foo x = x + 42
-- Or it is a namespace like:
-- namespace Woot where
-- x = 42
-- y = 17
-- which parses as [(Woot.x, 42), (Woot.y, 17)]

data Stanza v term
= WatchBinding UF.WatchKind Ann ((Ann, v), term)
Expand Down
4 changes: 1 addition & 3 deletions parser-typechecker/src/Unison/PrintError.hs
Expand Up @@ -1410,11 +1410,9 @@ prettyParseError s = \case
Code
" + 1",
"\n - An `ability` declaration, like "
<> style Code "ability Foo where ...",
<> style Code "unique|structural ability Foo where ...",
aryairani marked this conversation as resolved.
Show resolved Hide resolved
"\n - A `type` declaration, like "
<> style Code "structural type Optional a = None | Some a",
"\n - A `namespace` declaration, like "
<> style Code "namespace Seq where ...",
"\n"
]
where
Expand Down
3 changes: 1 addition & 2 deletions unison-src/transcripts/error-messages.output.md
Expand Up @@ -242,9 +242,8 @@ a ! b = 1
a : Nat
a = 42
- A watch expression, like > a + 1
- An `ability` declaration, like ability Foo where ...
- An `ability` declaration, like unique|structural ability Foo where ...
aryairani marked this conversation as resolved.
Show resolved Hide resolved
- A `type` declaration, like structural type Optional a = None | Some a
- A `namespace` declaration, like namespace Seq where ...


```
3 changes: 1 addition & 2 deletions unison-src/transcripts/errors/unison-hide-all.output.md
Expand Up @@ -26,8 +26,7 @@ The transcript failed due to an error in the stanza above. The error is:
g : Nat
g = 42
- A watch expression, like > g + 1
- An `ability` declaration, like ability Foo where ...
- An `ability` declaration, like unique|structural ability Foo where ...
aryairani marked this conversation as resolved.
Show resolved Hide resolved
- A `type` declaration, like structural type Optional a = None | Some a
- A `namespace` declaration, like namespace Seq where ...


3 changes: 1 addition & 2 deletions unison-src/transcripts/errors/unison-hide.output.md
Expand Up @@ -26,8 +26,7 @@ The transcript failed due to an error in the stanza above. The error is:
g : Nat
g = 42
- A watch expression, like > g + 1
- An `ability` declaration, like ability Foo where ...
- An `ability` declaration, like unique|structural ability Foo where ...
aryairani marked this conversation as resolved.
Show resolved Hide resolved
- A `type` declaration, like structural type Optional a = None | Some a
- A `namespace` declaration, like namespace Seq where ...