Refactor - Lenses for Ann in Oczor.Syntax.Types
#16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nponeccop
requested changes
Mar 28, 2017
src/Oczor/Compiler/Utl.hs
Outdated
|
|
||
| inferTxt :: String -> Either Error TypeExpr | ||
| inferTxt x = normalizeType <$> (Parser.parseExpr x >>= inferType) | ||
|
|
||
| inferAstTxt2 :: String -> Either Error InferExpr | ||
| inferAstTxt2 x = Parser.parseExpr x >>= (\y -> snd <$> inferAllExpr emptyContext y) | ||
|
|
There was a problem hiding this comment.
Ты совсем что-то расслабился. Откатывай эти пробельчики, они не связаны. А я засквошу. Чтоб такого не было впредь, забудь о git commit -a, юзай -p
src/Oczor/Infer/InferAst.hs
Outdated
| @@ -3,15 +3,15 @@ module Oczor.Infer.InferAst where | |||
| import ClassyPrelude | |||
| import Data.Functor.Foldable hiding (Foldable) | |||
| import Oczor.Syntax.Syntax | |||
| import Oczor.Infer.Substitutable | |||
| import Oczor.Infer.Substitutable | |||
src/Oczor/Infer/InferAst.hs
Outdated
| @@ -25,4 +25,4 @@ removeContext = cata $ \case | |||
| instance Substitutable InferExpr where | |||
| -- apply s | traceArgs ["apply inferExpr", show s] = undefined | |||
| apply s = cata $ \case (AnnF ast (tp,ctx)) -> Ann (apply s ast) (apply s tp, apply s ctx) -- TODO FF (apply ast) | |||
| -- ftv = cata $ \case (AnnF ast tp) -> ftv tp | |||
| -- ftv = cata $ \case (AnnF ast tp) -> ftv tp | |||
src/Oczor/Syntax/Ast.hs
Outdated
| @@ -10,6 +10,7 @@ module Oczor.Syntax.Ast (module Oczor.Syntax.Ast, module Oczor.Syntax.Types, Lit | |||
| import ClassyPrelude | |||
| import Data.Functor.Foldable | |||
| import Data.Functor.Foldable.TH | |||
| import Control.Lens | |||
There was a problem hiding this comment.
По алфавиту же старайся!
src/Oczor/Syntax/Ast.hs
Outdated
|
|
||
| type instance Base (Ann f a) = AnnF f a | ||
|
|
||
| instance Functor f => Recursive (Ann f a) where | ||
| project = \case Ann f a -> AnnF f a | ||
| project = \case Ann f a -> AnnF f a |
src/Oczor/Syntax/Ast.hs
Outdated
|
|
||
| instance Functor f => Corecursive (Ann f a) where | ||
| embed = \case AnnF f a -> Ann f a | ||
| embed = \case AnnF f a -> Ann f a |
There was a problem hiding this comment.
Где тут пробельчики?)
There was a problem hiding this comment.
в начале строки. git reset -p HEAD~1 подскажет где :) (подставь 2, 3 по надобности)
src/Oczor/Syntax/Ast.hs
Outdated
|
|
||
| instance Show a => Show (Ann ExprF a) where | ||
| show (Ann x y) = "(" ++ show x ++ " ANN " ++ show y ++ ")" | ||
| show (Ann x y) = "(" <> show x <> " ANN " <> show y <> ")" |
src/Oczor/Syntax/Ast.hs
Outdated
|
|
||
| pattern UnAnn x <- Ann x y | ||
|
|
||
| pattern ExprListMD x <- MD y (ExprList x) | ||
| pattern LabelAccessCall label e = Call (LabelAccess label) e | ||
|
|
nponeccop
approved these changes
Mar 28, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.