Merge branch 'master' into dev
This commit is contained in:
commit
54a2f25584
6 changed files with 9 additions and 9 deletions
|
@ -1,5 +1,5 @@
|
||||||
Name: Elm
|
Name: Elm
|
||||||
Version: 0.10.1
|
Version: 0.11
|
||||||
Synopsis: The Elm language module.
|
Synopsis: The Elm language module.
|
||||||
Description: Elm aims to make client-side web-development more pleasant.
|
Description: Elm aims to make client-side web-development more pleasant.
|
||||||
It is a statically/strongly typed, functional reactive
|
It is a statically/strongly typed, functional reactive
|
||||||
|
|
|
@ -7,7 +7,7 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/)
|
||||||
**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
|
**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then
|
||||||
jump to the [My First Project](#my-first-project) section.
|
jump to the [My First Project](#my-first-project) section.
|
||||||
<br/>
|
<br/>
|
||||||
**OS X 10.9** — follow
|
**OS X 10.9 or XCode 5** — follow
|
||||||
[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)
|
[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9)
|
||||||
before continuing with the platform agnostic directions below.
|
before continuing with the platform agnostic directions below.
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{-# OPTIONS_GHC -Wall #-}
|
{-# OPTIONS_GHC -Wall #-}
|
||||||
module SourceSyntax.Expression where
|
|
||||||
{-| The Abstract Syntax Tree (AST) for expressions comes in a couple formats.
|
{-| The Abstract Syntax Tree (AST) for expressions comes in a couple formats.
|
||||||
The first is the fully general version and is labeled with a prime (Expr').
|
The first is the fully general version and is labeled with a prime (Expr').
|
||||||
The others are specialized versions of the AST that represent specific phases
|
The others are specialized versions of the AST that represent specific phases
|
||||||
of the compilation process. I expect there to be more phases as we begin to
|
of the compilation process. I expect there to be more phases as we begin to
|
||||||
enrich the AST with more information.
|
enrich the AST with more information.
|
||||||
-}
|
-}
|
||||||
|
module SourceSyntax.Expression where
|
||||||
|
|
||||||
import SourceSyntax.PrettyPrint
|
import SourceSyntax.PrettyPrint
|
||||||
import Text.PrettyPrint as P
|
import Text.PrettyPrint as P
|
||||||
|
|
|
@ -320,7 +320,7 @@ It is defined as:
|
||||||
always a b = a
|
always a b = a
|
||||||
|
|
||||||
It totally ignores the second argument, so `always 42` is a function that always
|
It totally ignores the second argument, so `always 42` is a function that always
|
||||||
returns in 42. When you are dealing with higher-order functions, this comes in
|
returns 42. When you are dealing with higher-order functions, this comes in
|
||||||
handy more often than you might expect. For example, creating a zeroed out list
|
handy more often than you might expect. For example, creating a zeroed out list
|
||||||
of length ten would be:
|
of length ten would be:
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{ "version": "0.10.1"
|
{ "version": "0.11"
|
||||||
, "summary": "Elm's standard libraries"
|
, "summary": "Elm's standard libraries"
|
||||||
, "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."
|
, "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."
|
||||||
, "license": "BSD3"
|
, "license": "BSD3"
|
||||||
, "repository": "http://github.com/evancz/Elm.git"
|
, "repository": "http://github.com/evancz/Elm.git"
|
||||||
, "elm-version": "0.10.1"
|
, "elm-version": "0.11"
|
||||||
, "dependencies": {}
|
, "dependencies": {}
|
||||||
, "exposed-modules":
|
, "exposed-modules":
|
||||||
[ "Basics"
|
[ "Basics"
|
||||||
|
|
|
@ -34,7 +34,7 @@ ElmRuntime.filterDeadInputs = function(inputs) {
|
||||||
|
|
||||||
// define the draw function
|
// define the draw function
|
||||||
var vendors = ['ms', 'moz', 'webkit', 'o'];
|
var vendors = ['ms', 'moz', 'webkit', 'o'];
|
||||||
var win = window || {};
|
var win = typeof window !== 'undefined' ? window : {};
|
||||||
for (var i = 0; i < vendors.length && !win.requestAnimationFrame; ++i) {
|
for (var i = 0; i < vendors.length && !win.requestAnimationFrame; ++i) {
|
||||||
win.requestAnimationFrame = win[vendors[i]+'RequestAnimationFrame'];
|
win.requestAnimationFrame = win[vendors[i]+'RequestAnimationFrame'];
|
||||||
win.cancelAnimationFrame = win[vendors[i]+'CancelAnimationFrame'] ||
|
win.cancelAnimationFrame = win[vendors[i]+'CancelAnimationFrame'] ||
|
||||||
|
|
Loading…
Reference in a new issue