on master help sign in
Merge branch 'release-candidate' into dev
commitd87cfc65ddd23197e2888a88e6b1e05610999680 authorEvan Czaplicki <info@elm-lang.org> dateSun 8 Sep 2013, 12:29 (13 years ago) parenta7bb2b75f7fcaa
2 files changed+13−1
changelog.txt+3 compiler/Transform/Canonicalize.hs+10−1
changelog.txt+3
@@ -2,8 +2,11 @@
22Release 0.9.1
33=============
44
5+ * Allow custom precedence and associativity for user-defined infix ops
6+ * Realias types before printing
57 * Switch to Tango color scheme, adding a bunch of nice colors
68 * add the greyscale function for easily producing greys
9+ * Check the type of main
710 * Fix miscellaneous bugs in type checker
811 * Switch name of Matrix2D to Transform2D
912
compiler/Transform/Canonicalize.hs+10−1
@@ -56,10 +56,19 @@ metadataModule ifaces modul =
5656 program' <- rename initialEnv (program modul)
5757 aliases' <- mapM (third renameType') (aliases modul)
5858 datatypes' <- mapM (third (mapM (second (mapM renameType')))) (datatypes modul)
59− return $ modul { program = program', aliases = aliases', datatypes = datatypes' }
59+ exports' <- mapM (third renameType') (foreignExports modul)
60+ imports' <- mapM (twoAndFour (rename initialEnv) renameType') (foreignImports modul)
61+ return $ modul { program = program'
62+ , aliases = aliases'
63+ , datatypes = datatypes'
64+ , foreignExports = exports'
65+ , foreignImports = imports' }
6066 where
6167 second f (a,b) = (,) a `fmap` f b
6268 third f (a,b,c) = (,,) a b `fmap` f c
69+ twoAndFour f g (a,b,c,d) = do b' <- f b
70+ d' <- g d
71+ return (a,b',c,d')
6372 renameType' =
6473 Either.either (\err -> Left [P.text err]) return . renameType (replace "type" initialEnv)
6574