194b259 · elk · git.iko.soy

Elm.cabal+2−1

compare with master

unifiedsplit

@@ -128,12 +128,13 @@ Executable elm

128

129Executable elm-doc

130 Main-is: Docs.hs

131− Hs-Source-Dirs: compiler, compiler/Model

131+ Hs-Source-Dirs: compiler, compiler/Model, compiler/Transform

132 other-modules: Ast,

133 Context,

134 Parse.Library,

135 Parse.Modules,

136 Parse.Types,

137+ Rename,

137 Types.Types

138 Types.Types

138

139

139 Build-depends: base >=4.2 && <5,

140 Build-depends: base >=4.2 && <5,

Setup.hs+4−4

@@ -59,14 +59,14 @@ buildRuntime lbi = do

59 createDirectoryIfMissing False rtsDir -- dist should already exist

60 writeFile rts "Elm = {}; Elm.Native = {}; Elm.Native.Graphics = {};\n\

61 \Elm.Graphics = {}; ElmRuntime = {}; ElmRuntime.Render = {}\n"

62− mapM_ appendJS =<< getFiles ".js" "../libraries"

62+ mapM_ appendJS =<< getFiles ".js" "libraries"

63− mapM_ (appendElm lbi) =<< getFiles ".elm" "../libraries"

63+ mapM_ (appendElm lbi) =<< getFiles ".elm" "libraries"

64− mapM_ appendJS =<< getFiles ".js" "../runtime"

64+ mapM_ appendJS =<< getFiles ".js" "runtime"

65 putStrLn "\n+------------------------------------------+\

66 \\n| Success building runtime and libraries! |\

67 \\n+------------------------------------------+\n"

68

69buildTypes lbi = do

70− files <- getFiles ".elm" "../libraries"

70+ files <- getFiles ".elm" "libraries"

71 system ((show $ elm_doc lbi) ++ " " ++ unwords files ++ " > " ++ types)

72 putStrLn "Custom build step completed: elm-doc"

libraries/Graphics/Collage.elm+9−7

@@ -21,7 +21,9 @@ data BasicForm

21 | FElement Element

22 | FGroup [Form]

23

24+ident = Matrix.identity

25+

24−fill style shape = Form [] (FShape (Right style) shape)

26+fill style shape = Form ident (FShape (Right style) shape)

25

27

26filled : Color -> Shape -> Form

28filled : Color -> Shape -> Form

27filled color shape = fill (Solid color) shape

29filled color shape = fill (Solid color) shape

@@ -33,18 +35,18 @@ gradient : Gradient -> Shape -> Form

33gradient grad shape = fill (Gradient grad) shape

35gradient grad shape = fill (Gradient grad) shape

34

36

35outline : LineStyle -> Shape -> Form

37outline : LineStyle -> Shape -> Form

36−outline style shape = Form [] (FShape (Left style) shape)

38+outline style shape = Form ident (FShape (Left style) shape)

37

39

38−outline : LineStyle -> Path -> Form

40+trace : LineStyle -> Path -> Form

39−trace style path = Form [] (FPath style path)

41+trace style path = Form ident (FPath style path)

40

42

41sprite : Int -> Int -> (Int,Int) -> String -> Form

43sprite : 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)

43

45

44toForm : Element -> Form

46toForm : Element -> Form

45−toForm e = Form [] (FElement e)

47+toForm e = Form ident (FElement e)

46

48

47−group fs = Form [] (FGroup fs)

49+group fs = Form ident (FGroup fs)

48

50

49rotate t f = { form = f.form, transform = Matrix.rotate t f.transform }

51rotate t f = { form = f.form, transform = Matrix.rotate t f.transform }

50scale s f = { form = f.form, transform = Matrix.scale s s f.transform }

52scale s f = { form = f.form, transform = Matrix.scale s s f.transform }