c3080d9 · elk · git.iko.soy

git.iko.soy/elk

Merge pull request #1082 from elm-lang/dev

Point "built in" things in generated code to the right places

commitc3080d91298729c6fbb605570e714ee76cf3fac4 authorEvan Czaplicki <info@elm-lang.org> dateMon 5 Oct 2015, 21:14 (11 years ago) parentb466c42 9b7c55b

24 files changed+46−29

compare with master

unifiedsplit

src/Generate/JavaScript.hs+5−7

@@ -97,13 +97,11 @@ assign path expr =

9797

9898imports :: [ModuleName.Raw] -> [Statement ()]

9999imports rawImports =

100− case rawImports of

101− [] ->

102− []

103−

104− _ ->

105− [ VarDeclStmt () (map jsImport rawImports)

106− ]

100+ let

101+ utils =

102+ varDecl "_U" (call (obj ["Elm", "Native", "Utils", "make"]) [ref localRuntime])

103+ in

104+ [ VarDeclStmt () (utils : map jsImport rawImports) ]

107105

108106

109107jsImport :: ModuleName.Raw -> VarDecl ()

src/Generate/JavaScript/BuiltIn.hs+9−10

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

11module Generate.JavaScript.BuiltIn where

3+import Control.Arrow (first)

34import qualified Language.ECMAScript3.Syntax as JS

56import Generate.JavaScript.Helpers

@@ -8,7 +9,7 @@ import qualified Reporting.Region as R

910utils :: String -> [JS.Expression ()] -> JS.Expression ()

1011utils func args =

11− obj ["_utils", func] `call` args

12+ obj ["_U", func] `call` args

1213

1314

1415-- LITERALS

@@ -39,12 +40,10 @@ range low high =

3940

4041recordUpdate :: JS.Expression () -> [(String, JS.Expression ())] -> JS.Expression ()

4142recordUpdate record fields =

42− utils "update" [ record, JS.ArrayLit () (map toKeyValue fields) ]

43−

44−

45−toKeyValue :: (String, JS.Expression ()) -> JS.Expression ()

46−toKeyValue (key, value) =

47− JS.ArrayLit () [ JS.StringLit () key, value ]

43+ utils "update"

44+ [ record

45+ , JS.ObjectLit () (map (first prop) fields)

46+ ]

4847

4948

5049-- COMPARISIONS

@@ -54,9 +53,9 @@ eq left right =

5453 utils "eq" [ left, right ]

5554

5655

57−compare :: JS.Expression () -> JS.Expression () -> JS.Expression ()

58−compare left right =

59− utils "compare" [ left, right ]

56+cmp :: JS.Expression () -> JS.Expression () -> JS.Expression ()

57+cmp left right =

58+ utils "cmp" [ left, right ]

6059

6160

6261-- CRASH

src/Generate/JavaScript/Expression.hs+3−3

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

11module Generate.JavaScript.Expression (generateDef) where

3−import Control.Arrow (first, second, (***))

4−import Control.Monad.State (State, forM, foldM)

3+import Control.Arrow (second)

4+import Control.Monad.State (State, foldM)

55import qualified Data.List as List

66import qualified Data.Map as Map

77import Language.ECMAScript3.Syntax

@@ -517,4 +517,4 @@ specialOps =

517517

518518cmp :: InfixOp -> Int -> Expression () -> Expression () -> Expression ()

519519cmp op n a b =

520− InfixExpr () op (BuiltIn.compare a b) (IntLit () n)

520+ InfixExpr () op (BuiltIn.cmp a b) (IntLit () n)

src/Type/Unify.hs+3−3

@@ -51,8 +51,8 @@ typeError

5151 -> Maybe String

5252 -> Unify a

5353typeError leftType rightType note =

54− do leftSrcType <- liftIO (toSrcType leftType)

55− rightSrcType <- liftIO (toSrcType rightType)

54+ do leftSrcType <- liftIO (Type.toSrcType leftType)

55+ rightSrcType <- liftIO (Type.toSrcType rightType)

5656 liftIO $ do

5757 UF.setDescriptor leftType (Type.descriptor Error)

5858 UF.setDescriptor rightType (Type.descriptor Error)

@@ -129,7 +129,7 @@ actuallyUnify variable1 variable2 = do

129129

130130 Var.TopLevel _ | List.isPrefixOf "number" name ->

131131 flexAndUnify svar

132−

132+

133133 _ ->

134134 typeError variable1 variable2 Nothing

135135

tests/test-files/good-expected-js/AliasSubstitution.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var extractVec = function (v) { return {x: v.x,y: v.y};};

89 return _elm.Main.values = {_op: _op,extractVec: extractVec};

tests/test-files/good-expected-js/CaseExpression3.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var Cons = F2(function (a,b) {

89 return {ctor: "Cons",_0: a,_1: b};

tests/test-files/good-expected-js/Lists/EmptyList.elm.js+2−1

@@ -3,7 +3,8 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

7− var emptyList = _utils.list([]);

8+ var emptyList = _U.list([]);

89 return _elm.Main.values = {_op: _op,emptyList: emptyList};

910};

tests/test-files/good-expected-js/Lists/ListRange.elm.js+2−1

@@ -3,7 +3,8 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

7− var listRange = _utils.range(2,10);

8+ var listRange = _U.range(2,10);

89 return _elm.Main.values = {_op: _op,listRange: listRange};

910};

tests/test-files/good-expected-js/Lists/NonEmptyList.elm.js+2−1

@@ -3,7 +3,8 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

7− var nonEmptyList = _utils.list([1,4,5]);

8+ var nonEmptyList = _U.list([1,4,5]);

89 return _elm.Main.values = {_op: _op,nonEmptyList: nonEmptyList};

910};

tests/test-files/good-expected-js/NoExpressions.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 return _elm.Main.values = {_op: _op};

89};

tests/test-files/good-expected-js/Otherwise.elm.js+1

@@ -3,6 +3,7 @@ Elm.Otherwise.make = function (_elm) {

33 "use strict";

44 _elm.Otherwise = _elm.Otherwise || {};

55 if (_elm.Otherwise.values) return _elm.Otherwise.values;

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

67 var _op = {};

78 var boo = false ? "Yay" : "Boo";

89 var otherwise = 3;

tests/test-files/good-expected-js/Ports.elm.js+2−1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var students = Elm.Native.Port.make(_elm).outbound("students",

89 function (v) {

@@ -10,7 +11,7 @@ Elm.Main.make = function (_elm) {

1011 return {name: v.name,age: v.age};

1112 });

1213 },

13− _utils.list([{name: "Tom",age: 42}]));

14+ _U.list([{name: "Tom",age: 42}]));

1415 var time = Elm.Native.Port.make(_elm).outbound("time",

1516 function (v) {

1617 return v;

tests/test-files/good-expected-js/PortsWithTypeAliases.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var pairs = Elm.Native.Port.make(_elm).inbound("pairs",

89 "Main.Point String String",

tests/test-files/good-expected-js/QuotesAndComments.elm.js+3−2

@@ -3,10 +3,11 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var commentStart = "{-";

8− var singleQuote = _utils.chr("\'");

9− var doubleQuote = _utils.chr("\"");

9+ var singleQuote = _U.chr("\'");

10+ var doubleQuote = _U.chr("\"");

1011 var variablesWithPrimes = function (x) {

1112 var x$ = x;

1213 return x$;

tests/test-files/good-expected-js/Soundness/Apply.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var apply = function (f) {

89 var g = function (x) { return f(x);};

tests/test-files/good-expected-js/Soundness/ApplyAnnotated.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var apply = function (f) {

89 var g = function (x) { return f(x);};

tests/test-files/good-expected-js/Soundness/Id.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var myId = function () {

89 var id = function (x) { return x;};

tests/test-files/good-expected-js/Soundness/IdAnnotated.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var myId = function () {

89 var id = function (x) { return x;};

tests/test-files/good-expected-js/Soundness/TrickyId.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var myId = function (x) { var y = x;return y;};

89 return _elm.Main.values = {_op: _op,myId: myId};

tests/test-files/good-expected-js/Soundness/TrickyIdAnnotated.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var myId = function (x) { var y = x;return y;};

89 return _elm.Main.values = {_op: _op,myId: myId};

tests/test-files/good-expected-js/Strings/Multiline.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var s = "\nhere\'s a quote: \"\n\n";

89 return _elm.Main.values = {_op: _op,s: s};

tests/test-files/good-expected-js/Strings/MultilineNormal.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var s = "\nhere\'s a quote: \"\n\n";

89 return _elm.Main.values = {_op: _op,s: s};

tests/test-files/good-expected-js/TailRecursive.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var any = F2(function (f,l) {

89 any: while (true) {

tests/test-files/good-expected-js/Unify/NonHomogeneousRecords.elm.js+1

@@ -3,6 +3,7 @@ Elm.Main.make = function (_elm) {

33 "use strict";

44 _elm.Main = _elm.Main || {};

55 if (_elm.Main.values) return _elm.Main.values;

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

67 var _op = {};

78 var f = function (t) { var y = t.y;var x = t.x;return t;};

89 var Thing = F2(function (a,b) { return {x: a,y: b};});