dcbe2fc · elk · git.iko.soy

git.iko.soy/elk

Change the format of module instantiation

Currently, it's only possible to create modules at the leafs of the namespace structure. This CL lifts that restriction. Get rid of "use strict" in many cases.

commitdcbe2fc2459d1cc70910869d38aa68b4009a12dd authorEvan Czaplicki <info@elm-lang.org> dateMon 30 Sep 2013, 00:44 (13 years ago) parentd6c8ecd

28 files changed+139−162

compare with master

unifiedsplit

compiler/Generate/JavaScript.hs+6−4

@@ -48,7 +48,7 @@ varDecl x expr =

4848 VarDecl () (var x) (Just expr)

4949

5050include alias moduleName =

51− varDecl alias (obj moduleName <| ref "elm")

51+ varDecl alias (obj (moduleName ++ ".make") <| ref "elm")

5252

5353internalImports name =

5454 VarDeclStmt ()

@@ -278,8 +278,9 @@ clause span variable (Clause value vars mtch) =

278278

279279

280280jsModule :: MetadataModule () () -> String

281−jsModule modul = show . prettyPrint $ setup (Just "Elm") (names modul) ++

282− [ assign ("Elm" : names modul) (function ["elm"] programStmts) ]

281+jsModule modul =

282+ show . prettyPrint $ setup (Just "Elm") (names modul ++ ["make"]) ++

283+ [ assign ("Elm" : names modul ++ ["make"]) (function ["elm"] programStmts) ]

283284 where

284285 thisModule = dotSep ("elm" : names modul)

285286 programStmts =

@@ -306,9 +307,10 @@ jsModule modul = show . prettyPrint $ setup (Just "Elm") (names modul) ++

306307 _ -> ExprStmt () $

307308 AssignExpr () OpAssign (LDot () (dotSep (init path)) (last path)) expr

308309

309− jsImport (modul,_) = setup Nothing path ++ [ assign path (dotSep ("Elm" : path) <| ref "elm") ]

310+ jsImport (modul,_) = setup Nothing path ++ [ include ]

310311 where

311312 path = split modul

313+ include = assign path $ dotSep ("Elm" : path ++ ["make"]) <| ref "elm"

312314

313315 setup namespace path = map create paths

314316 where

libraries/Native/Basics.js+4−4

@@ -1,11 +1,11 @@

2−Elm.Native.Basics = function(elm) {

3− 'use strict';

2+Elm.Native.Basics = {};

3+Elm.Native.Basics.make = function(elm) {

44 if (elm.Native.Basics) return elm.Native.Basics;

6− var JS = Elm.Native.JavaScript(elm);

6+ var JS = Elm.Native.JavaScript.make(elm);

77 // var Maybe = Elm.Maybe(elm);

8− var Utils = Elm.Native.Utils(elm);

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

99 //var Char = Elm.Char(elm);

1010

1111 function div(a,b) { return (a/b)|0; }

libraries/Native/Char.js+25−28

@@ -1,31 +1,28 @@

1+Elm.Native.Char = {};

2+Elm.Native.Char.make = function(elm) {

3+ elm.Native = elm.Native || {};

4+ if (elm.Native.Char) return elm.Native.Char;

2−Elm.Native.Char = function(elm) {

3− 'use strict';

4−

5− elm.Native = elm.Native || {};

6− if (elm.Native.Char) return elm.Native.Char;

7−

8− function isBetween(lo,hi) { return function(chr) {

9− var c = chr.charCodeAt(0);

10− return lo <= c && c <= hi;

11− };

12− }

13− var isDigit = isBetween('0'.charCodeAt(0),'9'.charCodeAt(0));

14− var chk1 = isBetween('a'.charCodeAt(0),'f'.charCodeAt(0));

15− var chk2 = isBetween('A'.charCodeAt(0),'F'.charCodeAt(0));

16−

17− return elm.Native.Char = {

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

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

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

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

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

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

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

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

26− isDigit : isDigit,

27− isOctDigit : isBetween('0'.charCodeAt(0),'7'.charCodeAt(0)),

28− isHexDigit : function(c) { return isDigit(c) || chk1(c) || chk2(c); }

29− };

6+ function isBetween(lo,hi) { return function(chr) {

7+ var c = chr.charCodeAt(0);

8+ return lo <= c && c <= hi;

9+ };

10+ }

11+ var isDigit = isBetween('0'.charCodeAt(0),'9'.charCodeAt(0));

12+ var chk1 = isBetween('a'.charCodeAt(0),'f'.charCodeAt(0));

13+ var chk2 = isBetween('A'.charCodeAt(0),'F'.charCodeAt(0));

3014

15+ return elm.Native.Char = {

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

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

18+ toUpper : function(c) { return c.toUpperCase(); },

19+ toLower : function(c) { return c.toLowerCase(); },

20+ toLocaleUpper : function(c) { return c.toLocaleUpperCase(); },

21+ toLocaleLower : function(c) { return c.toLocaleLowerCase(); },

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

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

24+ isDigit : isDigit,

25+ isOctDigit : isBetween('0'.charCodeAt(0),'7'.charCodeAt(0)),

26+ isHexDigit : function(c) { return isDigit(c) || chk1(c) || chk2(c); }

27+ };

3128};

libraries/Native/Color.js+3−6

@@ -1,12 +1,9 @@

1−

2−

3−Elm.Native.Color = function(elm) {

4− "use strict";

5−

1+Elm.Native.Color = {};

2+Elm.Native.Color.make = function(elm) {

63 elm.Native = elm.Native || {};

74 if (elm.Native.Color) return elm.Native.Color;

9− var Utils = Elm.Native.Utils(elm);

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

107

118 function complement(rgb) {

129 var hsv = toHSV(rgb);

libraries/Native/Date.js+4−6

@@ -1,12 +1,10 @@

1−

2−Elm.Native.Date = function(elm) {

3− 'use strict';

4−

1+Elm.Native.Date = {};

2+Elm.Native.Date.make = function(elm) {

53 elm.Native = elm.Native || {};

64 if (elm.Native.Date) return elm.Native.Date;

8− var JS = Elm.JavaScript(elm);

9− var Maybe = Elm.Maybe(elm);

6+ var JS = Elm.JavaScript.make(elm);

7+ var Maybe = Elm.Maybe.make(elm);

108

119 function dateNow() { return new window.Date; }

1210 function readDate(str) {

libraries/Native/Error.js+3−4

@@ -1,10 +1,9 @@

1−

2−Elm.Native.Error = function(elm) {

3− 'use strict';

1+Elm.Native.Error = {};

2+Elm.Native.Error.make = function(elm) {

43 elm.Native = elm.Native || {};

54 if (elm.Native.Error) return elm.Native.Error;

7− var fromString = Elm.Native.JavaScript(elm).fromString;

6+ var fromString = Elm.Native.JavaScript.make(elm).fromString;

98 function indent(lines) {

109 var msg = '';

libraries/Native/Graphics/Collage.js+3−4

@@ -1,12 +1,11 @@

1−

2−Elm.Native.Graphics.Collage = function(elm) {

3− "use strict";

1+Elm.Native.Graphics.Collage = {};

2+Elm.Native.Graphics.Collage.make = function(elm) {

54 elm.Native = elm.Native || {};

65 elm.Native.Graphics = elm.Native.Graphics || {};

76 if (elm.Native.Graphics.Collage) return elm.Native.Graphics.Collage;

9− var newElement = Elm.Graphics.Element(elm).newElement;

8+ var newElement = Elm.Graphics.Element.make(elm).newElement;

109 var C = ElmRuntime.use(ElmRuntime.Render.Collage);

1110

1211 function collage(w,h,forms) {

libraries/Native/Graphics/Input.js+6−7

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

1−

2−Elm.Native.Graphics.Input = function(elm) {

3− "use strict";

1+Elm.Native.Graphics.Input = {};

2+Elm.Native.Graphics.Input.make = function(elm) {

54 elm.Native = elm.Native || {};

65 elm.Native.Graphics = elm.Native.Graphics || {};

@@ -9,10 +8,10 @@ Elm.Native.Graphics.Input = function(elm) {

98 var Render = ElmRuntime.use(ElmRuntime.Render.Element);

109 var newNode = ElmRuntime.use(ElmRuntime.Render.Utils).newElement;

1110

12− var Signal = Elm.Signal(elm);

13− var newElement = Elm.Graphics.Element(elm).newElement;

14− var JS = Elm.Native.JavaScript(elm);

15− var Utils = Elm.Native.Utils(elm);

11+ var Signal = Elm.Signal.make(elm);

12+ var newElement = Elm.Graphics.Element.make(elm).newElement;

13+ var JS = Elm.Native.JavaScript.make(elm);

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

1615 var Tuple2 = Utils.Tuple2;

1716

1817 function dropDown(values) {

libraries/Native/JavaScript.js+3−5

@@ -1,11 +1,9 @@

1−

2−Elm.Native.JavaScript = function(elm) {

3− 'use strict';

4−

1+Elm.Native.JavaScript = {};

2+Elm.Native.JavaScript.make = function(elm) {

53 elm.Native = elm.Native || {};

64 if (elm.Native.JavaScript) return elm.Native.JavaScript;

8− var List = Elm.Native.List(elm);

6+ var List = Elm.Native.List.make(elm);

97 var Render = ElmRuntime.use(ElmRuntime.Render.Element);

108

119 function fromJS(v) {

libraries/Native/Json.js+7−8

@@ -1,12 +1,11 @@

1+Elm.Native.Json = {};

2+Elm.Native.Json.make = function(elm) {

2−Elm.Native.Json = function(elm) {

3− 'use strict';

4−

5− var Maybe = Elm.Maybe(elm);

6− var Dict = Elm.Dict(elm);

7− var List = Elm.List(elm);

8− var JS = Elm.JavaScript(elm);

9− var Utils = Elm.Native.Utils(elm);

4+ var Maybe = Elm.Maybe.make(elm);

5+ var Dict = Elm.Dict.make(elm);

6+ var List = Elm.List.make(elm);

7+ var JS = Elm.JavaScript.make(elm);

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

109

1110 function fromValue(v) {

1211 switch (v.ctor) {

libraries/Native/List.js+3−4

@@ -1,12 +1,11 @@

1−Elm.Native.List = function(elm) {

2− "use strict";

3−

1+Elm.Native.List = {};

2+Elm.Native.List.make = function(elm) {

43 elm.Native = elm.Native || {};

54 if (elm.Native.List) return elm.Native.List;

65 if ('values' in Elm.Native.List)

76 return elm.Native.List = Elm.Native.List.values;

9− var Utils = Elm.Native.Utils(elm);

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

109

1110 // TODO: Improve Nil handling

1211 // We can change places like: if (xs.ctor === '[]') ... to if (xs === Nil) ...

libraries/Native/Prelude.js+5−6

@@ -1,11 +1,10 @@

1−

2−Elm.Native.Prelude = function(elm) {

3− 'use strict';

1+Elm.Native.Prelude = {};

2+Elm.Native.Prelude.make = function(elm) {

43 if (elm.Native.Prelude) return elm.Native.Prelude;

6− var JS = Elm.Native.JavaScript(elm);

7− var Maybe = Elm.Maybe(elm);

8− var Char = Elm.Char(elm);

5+ var JS = Elm.Native.JavaScript.make(elm);

6+ var Maybe = Elm.Maybe.make(elm);

7+ var Char = Elm.Char.make(elm);

109 function readInt(str) {

1110 var s = JS.fromString(str);

libraries/Native/Show.js+9−11

@@ -1,17 +1,15 @@

1−

2−Elm.Native.Show = function(elm) {

3− 'use strict';

4−

1+Elm.Native.Show = {};

2+Elm.Native.Show.make = function(elm) {

53 elm.Native = elm.Native || {};

64 if (elm.Native.Show) return elm.Native.Show;

8− var NList = Elm.Native.List(elm);

9− var List = Elm.List(elm);

10− var Maybe = Elm.Maybe(elm);

11− var JS = Elm.JavaScript(elm);

12− var Dict = Elm.Dict(elm);

13− var Json = Elm.Json(elm);

14− var Tuple2 = Elm.Native.Utils(elm).Tuple2;

6+ var NList = Elm.Native.List.make(elm);

7+ var List = Elm.List.make(elm);

8+ var Maybe = Elm.Maybe.make(elm);

9+ var JS = Elm.JavaScript.make(elm);

10+ var Dict = Elm.Dict.make(elm);

11+ var Json = Elm.Json.make(elm);

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

1513

1614 var toString = function(v) {

1715 var type = typeof v;

libraries/Native/Signal/Http.js+5−5

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

1+Elm.Native.Http = {};

2+Elm.Native.Http.make = function(elm) {

2−Elm.Native.Http = function(elm) {

3− 'use strict';

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

55 if (elm.Native.Http) return elm.Native.Http;

8− var JS = Elm.JavaScript(elm);

9− var List = Elm.List(elm);

10− var Signal = Elm.Signal(elm);

8+ var JS = Elm.JavaScript.make(elm);

9+ var List = Elm.List.make(elm);

10+ var Signal = Elm.Signal.make(elm);

1111

1212

1313 function registerReq(queue,responses) { return function(req) {

libraries/Native/Signal/Keyboard.js+5−5

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

1+Elm.Native.Keyboard = {};

2+Elm.Native.Keyboard.make = function(elm) {

2−Elm.Native.Keyboard = function(elm) {

3− 'use strict';

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

55 if (elm.Native.Keyboard) return elm.Native.Keyboard;

@@ -12,9 +12,9 @@ Elm.Native.Keyboard = function(elm) {

1212 }

1313 }

1414

15− var Signal = Elm.Signal(elm);

16− var NList = Elm.Native.List(elm);

17− var Utils = Elm.Native.Utils(elm);

15+ var Signal = Elm.Signal.make(elm);

16+ var NList = Elm.Native.List.make(elm);

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

1818

1919 var downEvents = Signal.constant(0);

2020 var upEvents = Signal.constant(0);

libraries/Native/Signal/Mouse.js+4−4

@@ -1,11 +1,11 @@

1+Elm.Native.Mouse = {};

2+Elm.Native.Mouse.make = function(elm) {

2−Elm.Native.Mouse = function(elm) {

3− 'use strict';

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

55 if (elm.Native.Mouse) return elm.Native.Mouse;

7− var Signal = Elm.Signal(elm);

8− var Utils = Elm.Native.Utils(elm);

7+ var Signal = Elm.Signal.make(elm);

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

1010 var position = Signal.constant(Utils.Tuple2(0,0));

1111 position.defaultNumberOfKids = 2;

libraries/Native/Signal/Random.js+3−3

@@ -1,10 +1,10 @@

1+Elm.Native.Random = {};

2+Elm.Native.Random.make = function(elm) {

2−Elm.Native.Random = function(elm) {

3− 'use strict';

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

55 if (elm.Native.Random) return elm.Native.Random;

7− var Signal = Elm.Signal(elm);

7+ var Signal = Elm.Signal.make(elm);

99 function range(min, max, signal) {

1010 function f(x) { return Math.floor(Math.random() * (max-min+1)) + min; }

libraries/Native/Signal/Signal.js+4−4

@@ -1,12 +1,12 @@

2−Elm.Native.Signal = function(elm) {

3− 'use strict';

2+Elm.Native.Signal = {};

3+Elm.Native.Signal.make = function(elm) {

55 elm.Native = elm.Native || {};

66 if (elm.Native.Signal) return elm.Native.Signal;

8− var Utils = Elm.Native.Utils(elm);

9− var foldl1 = Elm.List(elm).foldl1;

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

9+ var foldl1 = Elm.List.make(elm).foldl1;

1010

1111 function send(node, timestep, changed) {

1212 var kids = node.kids;

libraries/Native/Signal/Time.js+6−7

@@ -1,11 +1,10 @@

1+Elm.Native.Time = {};

2+Elm.Native.Time.make = function(elm) {

2−Elm.Native.Time = function(elm) {

3− 'use strict';

4−

5− var Signal = Elm.Signal(elm);

6− var NS = Elm.Native.Signal(elm);

7− var Maybe = Elm.Maybe(elm);

8− var Utils = Elm.Native.Utils(elm);

4+ var Signal = Elm.Signal.make(elm);

5+ var NS = Elm.Native.Signal.make(elm);

6+ var Maybe = Elm.Maybe.make(elm);

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

109 function fpsWhen(desiredFPS, isOn) {

1110 var msPerFrame = 1000 / desiredFPS;

libraries/Native/Signal/Touch.js+5−6

@@ -1,13 +1,12 @@

1−

2−Elm.Native.Touch = function(elm) {

3− 'use strict';

1+Elm.Native.Touch = {};

2+Elm.Native.Touch.make = function(elm) {

54 elm.Native = elm.Native || {};

65 if (elm.Native.Touch) return elm.Native.Touch;

8− var Signal = Elm.Signal(elm);

9− var JS = Elm.JavaScript(elm);

10− var _ = Elm.Native.Utils(elm);

7+ var Signal = Elm.Signal.make(elm);

8+ var JS = Elm.JavaScript.make(elm);

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

1110

1211 function Dict() {

1312 this.keys = [];

libraries/Native/Signal/WebSocket.js+5−6

@@ -1,13 +1,12 @@

1−

2−Elm.Native.WebSocket = function(elm) {

3− 'use strict';

1+Elm.Native.WebSocket = {};

2+Elm.Native.WebSocket.make = function(elm) {

54 elm.Native = elm.Native || {};

65 if (elm.Native.WebSocket) return elm.Native.WebSocket;

8− var Signal = Elm.Signal(elm);

9− var JS = Elm.JavaScript(elm);

10− var List = Elm.Native.List(elm);

7+ var Signal = Elm.Signal.make(elm);

8+ var JS = Elm.JavaScript.make(elm);

9+ var List = Elm.Native.List.make(elm);

1110

1211 function open(url, outgoing) {

1312 var incoming = Signal.constant(List.Nil);

libraries/Native/Signal/Window.js+4−5

@@ -1,12 +1,11 @@

1−

2−Elm.Native.Window = function(elm) {

3− 'use strict';

1+Elm.Native.Window = {};

2+Elm.Native.Window.make = function(elm) {

54 elm.Native = elm.Native || {};

65 if (elm.Native.Window) return elm.Native.Window;

8− var Signal = Elm.Signal(elm);

9− var Tuple2 = Elm.Native.Utils(elm).Tuple2;

7+ var Signal = Elm.Signal.make(elm);

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

109

1110 function getWidth() { return elm.node.clientWidth; }

1211 function getHeight() {

libraries/Native/Text.js+7−9

@@ -1,15 +1,13 @@

1−

2−Elm.Native.Text = function(elm) {

3− 'use strict';

4−

1+Elm.Native.Text = {};

2+Elm.Native.Text.make = function(elm) {

53 elm.Native = elm.Native || {};

64 if (elm.Native.Text) return elm.Native.Text;

8− var JS = Elm.JavaScript(elm);

9− var htmlHeight = Elm.Native.Utils(elm).htmlHeight;

10− var Color = Elm.Native.Color(elm);

11− var Element = Elm.Graphics.Element(elm);

12− var show = Elm.Native.Show(elm).show;

6+ var JS = Elm.JavaScript.make(elm);

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

8+ var Color = Elm.Native.Color.make(elm);

9+ var Element = Elm.Graphics.Element.make(elm);

10+ var show = Elm.Native.Show.make(elm).show;

1311

1412 function makeSpaces(s) {

1513 if (s.length == 0) { return s; }

libraries/Native/Transform2D.js+2−2

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

2−Elm.Native.Transform2D = function(elm) {

3− "use strict";

2+Elm.Native.Transform2D = {};

3+Elm.Native.Transform2D.make = function(elm) {

55 elm.Native = elm.Native || {};

66 if (elm.Native.Transform2D) return elm.Native.Transform2D;

libraries/Native/Utils.js+2−1

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

2−Elm.Native.Utils = function(elm) {

2+Elm.Native.Utils = {};

3+Elm.Native.Utils.make = function(elm) {

34 'use strict';

56 elm.Native = elm.Native || {};

runtime/Init.js+3−3

@@ -99,10 +99,10 @@ function init(display, container, module, moduleToReplace) {

9999 var Module = {};

100100 var reportAnyErrors = function() {};

101101 try {

102− Module = module(elm);

102+ Module = module.make(elm);

103103 } catch(e) {

104104 var directions = "<br/>    Open the developer console for more details."

105− Module.main = Elm.Text(elm).text('<code>' + e.message + directions + '</code>');

105+ Module.main = Elm.Text.make(elm).text('<code>' + e.message + directions + '</code>');

106106 reportAnyErrors = function() { throw e; }

107107 }

108108 inputs = ElmRuntime.filterDeadInputs(inputs);

@@ -150,7 +150,7 @@ function initGraphics(elm, Module) {

150150 var signalGraph = Module.main;

151151

152152 // make sure the signal graph is actually a signal & extract the visual model

153− var Signal = Elm.Signal(elm);

153+ var Signal = Elm.Signal.make(elm);

154154 if (!('recv' in signalGraph)) {

155155 signalGraph = Signal.constant(signalGraph);

156156 }

runtime/Render/Collage.js+1−2

@@ -1,9 +1,8 @@

22ElmRuntime.Render.Collage = function() {

3−'use strict';

54var Render = ElmRuntime.use(ElmRuntime.Render.Element);

6−var Transform = Elm.Transform2D({});

5+var Transform = Elm.Transform2D.make({});

76var Utils = ElmRuntime.use(ElmRuntime.Render.Utils);

87var newElement = Utils.newElement,

98 extract = Utils.extract, fromList = Utils.fromList,

runtime/Render/Utils.js+2−3

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

22ElmRuntime.Render.Utils = function() {

3−'use strict';

54function newElement(elementType) {

65 var e = document.createElement(elementType);

@@ -34,7 +33,7 @@ function removeTransform(style) {

3433 style.OTransform = 'none';

3534}

3635

37−var List = Elm.Native.List({});

36+var List = Elm.Native.List.make({});

3837

3938return {addTo:addTo,

4039 newElement:newElement,

@@ -42,7 +41,7 @@ return {addTo:addTo,

4241 fromList: List.toArray,

4342 fromString: function(s) { return List.toArray(s).join(''); },

4443 toString: List.fromArray,

45− eq: Elm.Native.Utils({}).eq,

44+ eq: Elm.Native.Utils.make({}).eq,

4645 addTransform: addTransform,

4746 removeTransform: removeTransform

4847 };