refactor: Rename UserName to QualName #56
Conversation
brat/Brat/Checker/Helpers.hs
Outdated
| @@ -131,7 +131,7 @@ pullPorts toPort showFn (p:ports) types = do | |||
| else pure (x, xs) | |||
| | otherwise = second (x:) <$> pull1Port p xs | |||
|
|
|||
| combineDisjointEnvs :: M.Map UserName v -> M.Map UserName v -> Checking (M.Map UserName v) | |||
| combineDisjointEnvs :: M.Map QualName v -> M.Map QualName v -> Checking (M.Map QualName v) | |||
There was a problem hiding this comment.
driveby: we should really use throwLeft for this
| @@ -139,29 +139,29 @@ throwLeft :: Either ErrorMsg a -> Checking a | |||
| throwLeft (Right x) = pure x | |||
| throwLeft (Left msg) = err msg | |||
|
|
|||
| vlup :: UserName -> Checking [(Src, BinderType Brat)] | |||
| vlup :: QualName -> Checking [(Src, BinderType Brat)] | |||
There was a problem hiding this comment.
Oooh, that's odd. We can have qualified names of variables?
There was a problem hiding this comment.
I think when we have functions imported from other modules they should be qualified, like kernel.CX
There was a problem hiding this comment.
Ah right yes thank you. Ok - so vlup is really the misnamed one - it does not necessarily look up variables; it just looks up names. Really should be nlup or qnlup or just lup (or blup to distinguish from klup? Hey, that one's actually pronouncable in one syllable... 😁 😀 )
| @@ -172,7 +172,7 @@ tlup (m, c) = req (TLup (m, c)) >>= \case | |||
| Brat -> Kernel | |||
| Kernel -> Brat | |||
|
|
|||
| lookupAndUse :: UserName -> KEnv | |||
| lookupAndUse :: QualName -> KEnv | |||
There was a problem hiding this comment.
Similarly, if it's something that might be used then will it really be a QualName?
There was a problem hiding this comment.
variables are parsed as qualified names, so they can include prefixes
There was a problem hiding this comment.
Even kernel names? Can declare a variable of type qubit whose name has a prefix?
There was a problem hiding this comment.
Ah I see, we could be more strict about kernel variables, you're right
brat/Brat/Parser.hs
Outdated
| @@ -84,12 +84,12 @@ simpleName = token0 $ \case | |||
| Ident str -> Just str | |||
| _ -> Nothing | |||
|
|
|||
| qualifiedName :: Parser UserName | |||
| qualifiedName :: Parser QualName | |||
There was a problem hiding this comment.
Better would be to inline this into userName (as that's the only use), and then rename that to qualifiedName or qualName
| show (PrefixName ps file) = intercalate "." (ps ++ [file]) | ||
|
|
||
| plain :: String -> UserName | ||
| plain :: String -> QualName |
There was a problem hiding this comment.
I vote for renaming this. Maybe unqual or something with "name" in it - singleName, unqualName ??
No description provided.