748c608 · elk · git.iko.soy

git.iko.soy/elk

Get standard libraries compiling (now that String is in Basics and Signal is in Signal)

commit748c608df236b6d24a4f307fa8928da14437713a authorEvan Czaplicki <info@elm-lang.org> dateMon 29 Jul 2013, 19:26 (13 years ago) parentec24738

11 files changed+16−7

compare with master

unifiedsplit

libraries/Graphics/Collage.elm+2−2 libraries/Graphics/Element.elm+1−1 libraries/Graphics/Input.elm+2−1 libraries/Json.elm+3−3 libraries/Keyboard.elm+1 libraries/Mouse.elm+1 libraries/Random.elm+1 libraries/Text.elm+1 libraries/Touch.elm+1 libraries/WebSocket.elm+2 libraries/Window.elm+1

libraries/Graphics/Collage.elm+2−2

@@ -23,7 +23,7 @@ type Form = {

2323data FillStyle

2424 = Solid Color

2525 | Texture String

26− | Gradient Gradient

26+ | Grad Gradient

2727

2828-- The shape of the ends of a line.

2929data LineCap = Flat | Round | Padded

@@ -94,7 +94,7 @@ textured src shape = fill (Texture src) shape

9494

9595-- Fill a shape with a [gradient](/docs/Color.elm#linear).

9696gradient : Gradient -> Shape -> Form

97−gradient grad shape = fill (Gradient grad) shape

97+gradient grad shape = fill (Grad grad) shape

9898

9999-- Outline a shape with a given line style.

100100outlined : LineStyle -> Shape -> Form

libraries/Graphics/Element.elm+1−1

@@ -16,7 +16,7 @@ import open Basics

1616import Native.Utils as Native

1717import open JavaScript

1818import List as List

19−import Color (Color)

19+import open Color

2020import Maybe (Maybe, Just, Nothing)

2121

2222type Properties = {

libraries/Graphics/Input.elm+2−1

@@ -1,7 +1,8 @@

22module Graphics.Input where

4−import Signal (lift,dropRepeats)

4+import Basics (String)

5+import Signal (Signal,lift,dropRepeats)

56import Native.Graphics.Input as Native

67import List

78import Graphics.Element (Element, Three, Pos, ElementPrim, Properties)

libraries/Json.elm+3−3

@@ -3,8 +3,8 @@

44module Json where

6−import Dict (Dict)

7−import Dict as Dict

6+import open Basics

7+import Dict

88import Maybe (Maybe)

99import JavaScript as JS

1010import Native.Json as Native

@@ -19,7 +19,7 @@ data JsonValue

1919 | Boolean Bool

2020 | Null

2121 | Array [JsonValue]

22− | Object (Dict String JsonValue)

22+ | Object (Dict.Dict String JsonValue)

2323

2424

2525-- String Converters

libraries/Keyboard.elm+1

@@ -1,5 +1,6 @@

11module Keyboard where

3+import Signal (Signal)

34import Native.Keyboard as Native

56-- Type alias to make it clearer what integers are supposed to represent

libraries/Mouse.elm+1

@@ -1,6 +1,7 @@

22module Mouse where

4+import Signal (Signal)

45import Native.Mouse as Native

67-- The current mouse position.

libraries/Random.elm+1

@@ -1,6 +1,7 @@

22module Random where

4+import Signal (Signal)

45import Native.Random as Native

67-- Given a range from low to high and a signal of values, this produces

libraries/Text.elm+1

@@ -1,6 +1,7 @@

22module Text where

4+import open Basics

45import Color (Color)

56import Graphics.Element (Element, Three, Pos, ElementPrim, Properties)

67import Maybe (Maybe)

libraries/Touch.elm+1

@@ -2,6 +2,7 @@

22-- include gestures that would be useful for both games and web-pages.

33module Touch where

5+import Signal (Signal)

56import Native.Touch as Native

67import Time (Time)

libraries/WebSocket.elm+2

@@ -2,6 +2,8 @@

22-- standard requests like GET, POST, etc.

33module WebSocket where

5+import Signal (Signal)

6+import Basics (String)

57import Native.WebSocket as Native

79-- Create a web-socket. The first argument is the URL of the desired

libraries/Window.elm+1

@@ -1,6 +1,7 @@

22module Window where

4+import Signal (Signal)

45import Native.Window as Native

67-- The current dimensions of the window (i.e. the area viewable to the