git.iko.soy/elk
on master help sign in
Merge branch 'master' into dev
54a2f25Evan Czaplicki
Elm.cabal+1−1
compare with master
unifiedsplit
@@ -1,5 +1,5 @@
1Name: Elm
1Name: Elm
2−Version: 0.10.1
2+Version: 0.11
3Synopsis: The Elm language module.
3Synopsis: The Elm language module.
4Description: Elm aims to make client-side web-development more pleasant.
4Description: Elm aims to make client-side web-development more pleasant.
5 It is a statically/strongly typed, functional reactive
5 It is a statically/strongly typed, functional reactive
README.md+1−1
@@ -7,7 +7,7 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/)
7**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
7**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
8jump to the [My First Project](#my-first-project) section.
8jump to the [My First Project](#my-first-project) section.
9<br/>
9<br/>
10−**OS X 10.9** &mdash; follow
10+**OS X 10.9 or XCode 5** &mdash; follow
11[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)
11[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)
12before continuing with the platform agnostic directions below.
12before continuing with the platform agnostic directions below.
13
13
compiler/SourceSyntax/Expression.hs+2−2
@@ -1,12 +1,12 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2−module SourceSyntax.Expression where
2+
3{-| The Abstract Syntax Tree (AST) for expressions comes in a couple formats.
3{-| The Abstract Syntax Tree (AST) for expressions comes in a couple formats.
4The first is the fully general version and is labeled with a prime (Expr').
4The first is the fully general version and is labeled with a prime (Expr').
5The others are specialized versions of the AST that represent specific phases
5The others are specialized versions of the AST that represent specific phases
6of the compilation process. I expect there to be more phases as we begin to
6of the compilation process. I expect there to be more phases as we begin to
7enrich the AST with more information.
7enrich the AST with more information.
8-}
8-}
9−
9+module SourceSyntax.Expression where
10
10
11import SourceSyntax.PrettyPrint
11import SourceSyntax.PrettyPrint
12import Text.PrettyPrint as P
12import Text.PrettyPrint as P
libraries/Basics.elm+1−1
@@ -320,7 +320,7 @@ It is defined as:
320 always a b = a
320 always a b = a
321
321
322It totally ignores the second argument, so `always 42` is a function that always
322It totally ignores the second argument, so `always 42` is a function that always
323−returns in 42. When you are dealing with higher-order functions, this comes in
323+returns 42. When you are dealing with higher-order functions, this comes in
324handy more often than you might expect. For example, creating a zeroed out list
324handy more often than you might expect. For example, creating a zeroed out list
325of length ten would be:
325of length ten would be:
326
326
libraries/elm_dependencies.json+3−3
@@ -1,9 +1,9 @@
1−{ "version": "0.10.1"
1+{ "version": "0.11"
2, "summary": "Elm's standard libraries"
2, "summary": "Elm's standard libraries"
3−, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.10.1, you should be using version 0.10.1 of the standard libraries."
3+, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.11, you should be using version 0.11 of the standard libraries."
4, "license": "BSD3"
4, "license": "BSD3"
5, "repository": "http://github.com/evancz/Elm.git"
5, "repository": "http://github.com/evancz/Elm.git"
6−, "elm-version": "0.10.1"
6+, "elm-version": "0.11"
7, "dependencies": {}
7, "dependencies": {}
8, "exposed-modules":
8, "exposed-modules":
9 [ "Basics"
9 [ "Basics"
runtime/Utils.js+1−1
@@ -34,7 +34,7 @@ ElmRuntime.filterDeadInputs = function(inputs) {
34
34
35// define the draw function
35// define the draw function
36var vendors = ['ms', 'moz', 'webkit', 'o'];
36var vendors = ['ms', 'moz', 'webkit', 'o'];
37−var win = window || {};
37+var win = typeof window !== 'undefined' ? window : {};
38for (var i = 0; i < vendors.length && !win.requestAnimationFrame; ++i) {
38for (var i = 0; i < vendors.length && !win.requestAnimationFrame; ++i) {
39 win.requestAnimationFrame = win[vendors[i]+'RequestAnimationFrame'];
39 win.requestAnimationFrame = win[vendors[i]+'RequestAnimationFrame'];
40 win.cancelAnimationFrame = win[vendors[i]+'CancelAnimationFrame'] ||
40 win.cancelAnimationFrame = win[vendors[i]+'CancelAnimationFrame'] ||