diff options
| author | krasimir <krasimir@chalmers.se> | 2017-03-07 08:24:00 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2017-03-07 08:24:00 +0000 |
| commit | 5ec43f2f75e8b62bcb650f75099b83f282878901 (patch) | |
| tree | 6097355bbcc2b5e54bbb1de22cd7e9607a39accf /src/compiler/GF/Compile | |
| parent | 5a61ab5fcc432061dc653078212999956da09786 (diff) | |
GF.Grammar.Printer now has a Terse mode which prints record types with lock fields with their corresponding abstract categories
Diffstat (limited to 'src/compiler/GF/Compile')
| -rw-r--r-- | src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs | 4 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/TypeCheck/RConcrete.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs index f1c6aab80..badf8bd30 100644 --- a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs +++ b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs @@ -288,8 +288,8 @@ tcApp ge scope t = tcOverloadFailed t ttys = tcError ("Overload resolution failed" $$ - "term " <+> pp t $$ - "types" <+> vcat [pp ty | (_,ty) <- ttys]) + "of term " <+> pp t $$ + "with types" <+> vcat [ppTerm Terse 0 ty | (_,ty) <- ttys]) tcPatt ge scope PW ty0 = diff --git a/src/compiler/GF/Compile/TypeCheck/RConcrete.hs b/src/compiler/GF/Compile/TypeCheck/RConcrete.hs index 8913f7c5d..2fe08b256 100644 --- a/src/compiler/GF/Compile/TypeCheck/RConcrete.hs +++ b/src/compiler/GF/Compile/TypeCheck/RConcrete.hs @@ -425,7 +425,7 @@ checkLType gr g trm typ0 = do then checkLType gr ((bt,x,a):g) c b else do b' <- checkIn (pp "abs") $ substituteLType [(bt',z,Vr x)] b checkLType gr ((bt,x,a):g) c b' - return $ (Abs bt x c', Prod bt' x a b') + return $ (Abs bt x c', Prod bt' z a b') _ -> checkError $ "function type expected instead of" <+> ppType typ App f a -> do |