5bf237d · elk · git.iko.soy

git.iko.soy/elk

* Fix renaming issue with `a1`, `a2`, etc. as described in [issue 75](https://github.com/evancz/Elm/issues/75)

* Switch to using $ instead of _ when depriming variables. * Bump version number

commit5bf237d90352e2e85af21abd21151ff55dfbc4f3 authorevancz <info@elm-lang.org> dateSat 5 Jan 2013, 16:27 (14 years ago) parent5e4aa74

7 files changed+11−11

compare with master

unifiedsplit

core-js/Automaton.js+1−1 core-js/Prelude.js+1−1 core-js/cat.bat+1−1 core-js/runtime/Signal.js+1−1 elm/Elm.cabal+2−2 elm/src/Parse/Patterns.hs+4−4 elm/src/Rename.hs+1−1

core-js/Automaton.js+1−1

@@ -210,7 +210,7 @@ Elm.Automaton=function(){

210210 combine:combine_3,

211211 pure:pure_4,

212212 init:init_5,

213− init_:init__6,

213+ init$:init__6,

214214 count:count_7,

215215 draggable:draggable_13};}();

216216Elm.main=function(){

core-js/Prelude.js+1−1

@@ -161,7 +161,7 @@ Elm.Prelude = function() {

161161 lift8 : Elm.Signal.lift8,

162162 foldp : Elm.Signal.foldp,

163163 foldp1 : Elm.Signal.foldp1,

164− foldp_ : Elm.Signal.foldp_,

164+ foldp$ : Elm.Signal.foldp$,

165165 constant : Elm.Signal.constant,

166166 merge : Elm.Signal.merge,

167167 count : Elm.Signal.count,

core-js/cat.bat+1−1

@@ -2,4 +2,4 @@ copy /B Guid.js+foreign\JavaScript.js+foreign\JSON.js+Value.js+List.js+Maybe.js+

33cd ..\elm

5−copy /B ..\elm-mini.js elm-runtime-0.7.js

5+copy /B ..\elm-mini.js elm-runtime-0.7.0.1.js

core-js/runtime/Signal.js+1−1

@@ -249,7 +249,7 @@ Elm.Signal = function() {

249249 return new lift(f, [e1,e2,e3,e4,e5,e6,e7,e8]);};};};};};};};};},

250250 foldp : function(f) { return function(b) { return function(e) {

251251 return new fold(f,b,false,e); }; }; },

252− foldp_ : function(f) { return function(b) { return function(e) {

252+ foldp$ : function(f) { return function(b) { return function(e) {

253253 return new fold(f,b,true,e); }; }; },

254254 foldp1 : function(f) { return function(e) {

255255 return new fold(f,function(x){return x;},true,e); }; },

elm/Elm.cabal+2−2

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

22Name: Elm

3−Version: 0.7

3+Version: 0.7.0.1

44Synopsis: The Elm language module.

55Description: Elm aims to make client-side web-development more pleasant.

66 It is a statically/strongly typed, functional reactive

@@ -22,7 +22,7 @@ Category: Compiler, Language

2222Build-type: Simple

2323

2424Extra-source-files: changelog.txt

25−Data-files: elm-runtime-0.7.js

25+Data-files: elm-runtime-0.7.0.1.js

2626Cabal-version: >=1.8

2727

2828source-repository head

elm/src/Parse/Patterns.hs+4−4

@@ -55,11 +55,11 @@ extract pattern body@(C t s _) =

5555 PVar x -> return $ fn x body

5656 PData name ps -> do

5757 x <- guid

58− let a = 'a' : show x

58+ let a = '_' : show x

5959 return . fn a . ctx $ Case (ctx (Var a)) [(pattern, body)]

6060 PRecord fs -> do

6161 x <- guid

62− let a = 'a' : show x

62+ let a = '_' : show x

6363 toDef f = FnDef f [] (ctx $ Access (ctx $ Var a) f)

6464 return . fn a . ctx $ Let (map toDef fs) body

6565

@@ -89,7 +89,7 @@ matchSingle pat exp@(C t s _) p =

8989 let ctx = C t s in

9090 case p of

9191 PData _ ps -> do x <- guid

92− let v = 'a' : show x

92+ let v = '_' : show x

9393 dss <- mapM (matchSingle p . ctx $ Var v) ps

9494 return (FnDef v [] exp : concat dss)

9595

@@ -97,7 +97,7 @@ matchSingle pat exp@(C t s _) p =

9797 return [ FnDef x [] (ctx $ Case exp [(pat, ctx $ Var x)]) ]

9898

9999 PRecord fs -> do

100− a <- (\x -> 'a' : show x) `liftM` guid

100+ a <- (\x -> '_' : show x) `liftM` guid

101101 let toDef f = FnDef f [] (ctx $ Access (ctx $ Var a) f)

102102 return (FnDef a [] exp : map toDef fs)

103103

elm/src/Rename.hs+1−1

@@ -109,7 +109,7 @@ instance Rename Expr where

109109

110110 _ -> return expr

111111

112−deprime = map (\c -> if c == '\'' then '_' else c)

112+deprime = map (\c -> if c == '\'' then '$' else c)

113113

114114extend :: (String -> String) -> String -> GuidCounter (String, String -> String)

115115extend env x = do