9253595 · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' into canonicalize

commit92535952b10d74909c7882991c12a9f918702c66 authorEvan Czaplicki <info@elm-lang.org> dateThu 12 Jun 2014, 20:55 (12 years ago) parente4742db 78fadfd

13 files changed+95−21

compare with master

unifiedsplit

.gitignore+2 changelog.md+7−1 compiler/Metadata/Prelude.hs+1−1 libraries/Debug.elm+29−2 libraries/Dict.elm+1−1 libraries/Native/Array.js+21−7 libraries/Native/Char.js+6−4 libraries/Native/Signal/WebSocket.js+1−1 runtime/Init.js+1−1 tests/libraries/LibraryTest.hs+4−2 tests/libraries/Test.elm+2 tests/libraries/Test/Array.elm+5−1 tests/libraries/Test/Char.elm+15

.gitignore+2

@@ -1,5 +1,7 @@

11dist

22cabal-dev

3+.cabal-sandbox/

4+cabal.sandbox.config

35*.o

46*.hi

57*.chi

changelog.md+7−1

@@ -1,7 +1,13 @@

2+## 0.12.3

4+ * Minor changes to support webgl as a separate library

5+ * Switch from HSV to HSL

6+ * Programmatic access to colors with toHsl and toRgb

28## 0.12.1

4−## Improvements:

10+#### Improvements:

511

612 * New Array library (thanks entirely to @Xashili)

713 * Json.Value can flow through ports

compiler/Metadata/Prelude.hs+1−1

@@ -42,7 +42,7 @@ safeReadDocs name =

4242 hPutStrLn stderr $ unlines $

4343 [ "Error reading types for standard library from file " ++ name

4444 , " If you are using a stable version of Elm, please report an issue at"

45− , " <http://github.com/evancz/Elm/issues> specifying version numbers for"

45+ , " <http://github.com/elm-lang/Elm/issues> specifying version numbers for"

4646 , " Elm and your OS." ]

4747 exitFailure

4848

libraries/Debug.elm+29−2

@@ -2,10 +2,11 @@ module Debug where

22{-| This library is for investigating bugs or performance problems. It should

33*not* be used in production code.

5−@docs log

5+@docs log, crash

66-}

88import Native.Debug

9+import Native.Error

910

1011{-| Log a tagged value on the developer console, and then return the value.

1112

@@ -16,4 +17,30 @@ Notice that `log` is not a pure function! It should *only* be used for

1617investigating bugs or performance problems.

1718-}

1819log : String -> a -> a

19−log = Native.Debug.log

20+log = Native.Debug.log

21+

22+{-| Crash the program with an error message. This is an uncatchable error,

23+intended for code that is soon-to-be-implemented. For example, if you are

24+working with a large ADT and have partially completed a case expression, it may

25+make sense to do this:

26+

27+ data Entity = Ship | Fish | Captain | Seagull

28+

29+ drawEntity entity =

30+ case entity of

31+ Ship -> ...

32+ Fish -> ...

33+ _ -> Debug.crash ("drawEntity not implemented for " ++ show entity ++ " yet!")

34+

35+Note that incomplete pattern matches are *very* bad practice! They are one of

36+the very few ways to crash an Elm program, and they are completely avoidable.

37+Production code should not have incomplete pattern matches!

38+

39+**Use this if** you want to do some testing while you are partway through

40+writing a function.

41+

42+**Do not use this if** you want to do some typical try-catch exception handling.

43+Use the `Maybe` or `Either` libraries instead.

44+-}

45+crash : String -> a

46+crash = Native.Error.raise

libraries/Dict.elm+1−1

@@ -249,7 +249,7 @@ reportRemBug msg c lgot rgot =

249249 lgot,

250250 " ",

251251 rgot,

252− "\nPlease report this bug to https://github.com/evancz/Elm/issues"

252+ "\nPlease report this bug to https://github.com/elm-lang/Elm/issues"

253253 ]

254254

255255-- Remove the top node from the tree, may leave behind BBlacks

libraries/Native/Array.js+21−7

@@ -255,15 +255,27 @@ Elm.Native.Array.make = function(elm) {

255255 }

256256

257257 function foldl(f, b, a) {

258− for (var i = 0; i < a.table.length; i++) {

259− b = A2(f, a.height == 0 ? a.table[i] : foldl(f, b, a.table[i]), b);

258+ if (a.height == 0) {

259+ for (var i = 0; i < a.table.length; i++) {

260+ b = A2(f, a.table[i], b);

261+ }

262+ } else {

263+ for (var i = 0; i < a.table.length; i++) {

264+ b = foldl(f, b, a.table[i]);

265+ }

260266 }

261267 return b;

262268 }

263269

264270 function foldr(f, b, a) {

265− for (var i = a.table.length; i--; ) {

266− b = A2(f, a.height == 0 ? a.table[i] : foldr(f, b, a.table[i]), b);

271+ if (a.height == 0) {

272+ for (var i = a.table.length; i--; ) {

273+ b = A2(f, a.table[i], b);

274+ }

275+ } else {

276+ for (var i = a.table.length; i--; ) {

277+ b = foldl(f, b, a.table[i]);

278+ }

267279 }

268280 return b;

269281 }

@@ -345,9 +357,11 @@ Elm.Native.Array.make = function(elm) {

345357 // TODO: Add support for appending trees of different sizes. Current

346358 // behavior will just rise the lower tree and then append them.

347359 function append(a,b) {

348− if (b.height > a.height) { return append(parentise(a, b.height), b); }

349− if (a.height > b.height) { return append(a, parentise(b, a.height)); }

350− if (a.height == 0) { return append(parentise(a, 1), parentise(b, 1)); }

360+ if (a.table.length == 0) return b;

361+ if (b.table.length == 0) return a;

362+ if (b.height > a.height) return append(parentise(a, b.height), b);

363+ if (a.height > b.height) return append(a, parentise(b, a.height));

364+ if (a.height == 0) return append(parentise(a, 1), parentise(b, 1));

351365

352366 var c = append_(a, b);

353367 if (c[1].table.length > 0) {

libraries/Native/Char.js+6−4

@@ -4,6 +4,8 @@ Elm.Native.Char.make = function(elm) {

44 elm.Native.Char = elm.Native.Char || {};

55 if (elm.Native.Char.values) return elm.Native.Char.values;

7+ var Utils = Elm.Native.Utils.make(elm);

79 function isBetween(lo,hi) { return function(chr) {

810 var c = chr.charCodeAt(0);

911 return lo <= c && c <= hi;

@@ -16,10 +18,10 @@ Elm.Native.Char.make = function(elm) {

1618 return elm.Native.Char.values = {

1719 fromCode : function(c) { return String.fromCharCode(c); },

1820 toCode : function(c) { return c.toUpperCase().charCodeAt(0); },

19− toUpper : function(c) { return c.toUpperCase(); },

20− toLower : function(c) { return c.toLowerCase(); },

21− toLocaleUpper : function(c) { return c.toLocaleUpperCase(); },

22− toLocaleLower : function(c) { return c.toLocaleLowerCase(); },

21+ toUpper : function(c) { return Utils.chr(c.toUpperCase()); },

22+ toLower : function(c) { return Utils.chr(c.toLowerCase()); },

23+ toLocaleUpper : function(c) { return Utils.chr(c.toLocaleUpperCase()); },

24+ toLocaleLower : function(c) { return Utils.chr(c.toLocaleLowerCase()); },

2325 isLower : isBetween('a'.charCodeAt(0),'z'.charCodeAt(0)),

2426 isUpper : isBetween('A'.charCodeAt(0),'Z'.charCodeAt(0)),

2527 isDigit : isDigit,

libraries/Native/Signal/WebSocket.js+1−1

@@ -9,7 +9,7 @@ Elm.Native.WebSocket.make = function(elm) {

99 var List = Elm.Native.List.make(elm);

1010

1111 function open(url, outgoing) {

12− var incoming = Signal.constant(List.Nil);

12+ var incoming = Signal.constant("");

1313 var ws = new WebSocket(url);

1414

1515 var pending = [];

runtime/Init.js+1−1

@@ -37,7 +37,7 @@ function init(display, container, module, ports, moduleToReplace) {

3737 throw new Error(

3838 'The notify function has been called synchronously!\n' +

3939 'This can lead to frames being dropped.\n' +

40− 'Definitely report this to <https://github.com/evancz/Elm/issues>\n');

40+ 'Definitely report this to <https://github.com/elm-lang/Elm/issues>\n');

4141 }

4242 updateInProgress = true;

4343 var timestep = Date.now();

tests/libraries/LibraryTest.hs+4−2

@@ -45,7 +45,9 @@ main = do

4545runCmd :: String -> [String] -> IO ()

4646runCmd cmd args = do

4747 putStrLn (cmd ++ " " ++ unwords args)

48− (exitCode, _stdout, stderr) <- readProcessWithExitCode cmd args ""

48+ (exitCode, stdout, stderr) <- readProcessWithExitCode cmd args ""

49+ putStr stdout

50+ putStr stderr

4951 case exitCode of

5052 ExitSuccess -> return ()

51− ExitFailure _ -> error stderr

53+ ExitFailure _ -> exitWith exitCode

tests/libraries/Test.elm+2

@@ -10,6 +10,7 @@ import IO.Runner (Request, Response)

1010import IO.Runner as Run

1111

1212import Test.Array as Array

13+import Test.Char as Char

1314import Test.Dict as Dict

1415import Test.Equality as Equality

1516import Test.List as List

@@ -20,6 +21,7 @@ import Test.Trampoline as Trampoline

2021tests : Test

2122tests = suite "Elm Standard Library Tests"

2223 [ Array.tests

24+ , Char.tests

2325 , Dict.tests

2426 , Equality.tests

2527 , List.tests

tests/libraries/Test/Array.elm+5−1

@@ -26,6 +26,8 @@ tests =

2626 , test "length - Long" <| assertEqual 10000 (Array.length (Array.repeat 10000 0))

2727 , test "push" <| assertEqual (Array.fromList [1,2,3]) (Array.push 3 (Array.fromList [1,2]))

2828 , test "append" <| assertEqual [42,42,81,81,81] (Array.toList (Array.append (Array.repeat 2 42) (Array.repeat 3 81)))

29+ , test "appendEmpty 1" <| assertEqual [1..33] (Array.toList (Array.append Array.empty (Array.fromList [1..33])))

30+ , test "appendEmpty 2" <| assertEqual [1..33] (Array.toList (Array.append (Array.fromList [1..33]) Array.empty))

2931 ]

3032 getAndSetTests = suite "Get and Set"

3133 [ test "get" <| assertEqual (Just 2) (Array.get 1 (Array.fromList [3,2,1]))

@@ -48,9 +50,11 @@ tests =

4850 [ test "map" <| assertEqual (Array.fromList [1,2,3]) (Array.map sqrt (Array.fromList [1,4,9]))

4951 , test "indexedMap 1" <| assertEqual (Array.fromList [0,5,10]) (Array.indexedMap (*) (Array.fromList [5,5,5]))

5052 , test "indexedMap 2" <| assertEqual [0..99] (Array.toList (Array.indexedMap always (Array.repeat 100 0)))

51− , test "foldl" <| assertEqual [3,2,1] (Array.foldl (::) [] (Array.fromList [1,2,3]))

53+ , test "foldl 1" <| assertEqual [3,2,1] (Array.foldl (::) [] (Array.fromList [1,2,3]))

54+ , test "foldl 2" <| assertEqual 33 (Array.foldl (+) 0 (Array.repeat 33 1))

5255 , test "foldr 1" <| assertEqual 15 (Array.foldr (+) 0 (Array.repeat 3 5))

5356 , test "foldr 2" <| assertEqual [1,2,3] (Array.foldr (::) [] (Array.fromList [1,2,3]))

57+ , test "foldr 3" <| assertEqual 53 (Array.foldr (-) 54 (Array.fromList [10,11]))

5458 , test "filter" <| assertEqual (Array.fromList [2,4,6]) (Array.filter (\x -> x `mod` 2 == 0) (Array.fromList [1..6]))

5559 ]

5660 nativeTests = suite "Conversion to JS Arrays"

tests/libraries/Test/Char.elmnew file+15

@@ -0,0 +1,15 @@

1+module Test.Char (tests) where

3+import Char

5+import ElmTest.Assertion (..)

6+import ElmTest.Test (..)

8+tests : Test

9+tests =

10+ suite "Char"

11+ [ test "toUpper" <| assertEqual 'C' <| Char.toUpper 'c'

12+ , test "toLower" <| assertEqual 'c' <| Char.toLower 'C'

13+ , test "toLocaleUpper" <| assertEqual 'C' <| Char.toLocaleUpper 'c'

14+ , test "toLocaleLower" <| assertEqual 'c' <| Char.toLocaleLower 'C'

15+ ]