git.iko.soy/elk
on master help sign in
Get everything compiling again.
commit194b25958bc7f8e093de64397a5221bc4c106f2b authorevancz <info@elm-lang.org> dateSat 16 Mar 2013, 13:00 (14 years ago) parent99ae5c6
3 files changed+15−12
compare with master
unifiedsplit
Elm.cabal+2−1 Setup.hs+4−4 libraries/Graphics/Collage.elm+9−7
Elm.cabal+2−1
@@ -128,12 +128,13 @@ Executable elm
128128
129129Executable elm-doc
130130 Main-is: Docs.hs
131− Hs-Source-Dirs: compiler, compiler/Model
131+ Hs-Source-Dirs: compiler, compiler/Model, compiler/Transform
132132 other-modules: Ast,
133133 Context,
134134 Parse.Library,
135135 Parse.Modules,
136136 Parse.Types,
137+ Rename,
137138 Types.Types
138139
139140 Build-depends: base >=4.2 && <5,
Setup.hs+4−4
@@ -59,14 +59,14 @@ buildRuntime lbi = do
5959 createDirectoryIfMissing False rtsDir -- dist should already exist
6060 writeFile rts "Elm = {}; Elm.Native = {}; Elm.Native.Graphics = {};\n\
6161 \Elm.Graphics = {}; ElmRuntime = {}; ElmRuntime.Render = {}\n"
62− mapM_ appendJS =<< getFiles ".js" "../libraries"
63− mapM_ (appendElm lbi) =<< getFiles ".elm" "../libraries"
64− mapM_ appendJS =<< getFiles ".js" "../runtime"
62+ mapM_ appendJS =<< getFiles ".js" "libraries"
63+ mapM_ (appendElm lbi) =<< getFiles ".elm" "libraries"
64+ mapM_ appendJS =<< getFiles ".js" "runtime"
6565 putStrLn "\n+------------------------------------------+\
6666 \\n| Success building runtime and libraries! |\
6767 \\n+------------------------------------------+\n"
6868
6969buildTypes lbi = do
70− files <- getFiles ".elm" "../libraries"
70+ files <- getFiles ".elm" "libraries"
7171 system ((show $ elm_doc lbi) ++ " " ++ unwords files ++ " > " ++ types)
7272 putStrLn "Custom build step completed: elm-doc"
libraries/Graphics/Collage.elm+9−7
@@ -21,7 +21,9 @@ data BasicForm
2121 | FElement Element
2222 | FGroup [Form]
2323
24−fill style shape = Form [] (FShape (Right style) shape)
24+ident = Matrix.identity
25+
26+fill style shape = Form ident (FShape (Right style) shape)
2527
2628filled : Color -> Shape -> Form
2729filled color shape = fill (Solid color) shape
@@ -33,18 +35,18 @@ gradient : Gradient -> Shape -> Form
3335gradient grad shape = fill (Gradient grad) shape
3436
3537outline : LineStyle -> Shape -> Form
36−outline style shape = Form [] (FShape (Left style) shape)
38+outline style shape = Form ident (FShape (Left style) shape)
3739
38−outline : LineStyle -> Path -> Form
39−trace style path = Form [] (FPath style path)
40+trace : LineStyle -> Path -> Form
41+trace style path = Form ident (FPath style path)
4042
4143sprite : Int -> Int -> (Int,Int) -> String -> Form
42−sprite w h pos src = Form [] (FImage w h pos src)
44+sprite w h pos src = Form ident (FImage w h pos src)
4345
4446toForm : Element -> Form
45−toForm e = Form [] (FElement e)
47+toForm e = Form ident (FElement e)
4648
47−group fs = Form [] (FGroup fs)
49+group fs = Form ident (FGroup fs)
4850
4951rotate t f = { form = f.form, transform = Matrix.rotate t f.transform }
5052scale s f = { form = f.form, transform = Matrix.scale s s f.transform }