32e1729 · elk · git.iko.soy

src/Generate/JavaScript.hs+1−1

compare with master

unifiedsplit

@@ -40,7 +40,7 @@ generate module_ =

40 [ assign make (function [localRuntime] body)

41 ]

42 in

43− PP.displayS (PP.renderPretty 0.4 160 (ES.prettyPrint javascript)) ""

43+ PP.displayS (PP.renderPretty 1 160 (ES.prettyPrint javascript)) ""

44

45

46

src/Reporting/Report.hs+12−5

@@ -47,8 +47,8 @@ toJson extraFields (Report title subregion pre post) =

47 let

48 fields =

49 [ "tag" .= title

50− , "overview" .= displayS (renderPretty 1 80 pre) ""

50+ , "overview" .= nonAnsiRender pre

51− , "details" .= displayS (renderPretty 1 80 post) ""

51+ , "details" .= nonAnsiRender post

52 ]

53 in

54 (subregion, fields ++ extraFields)

@@ -93,9 +93,16 @@ toHandle handle location region rprt source =

93

94toString :: String -> R.Region -> Report -> String -> String

95toString location region rprt source =

96− displayS

96+ nonAnsiRender (toDoc location region rprt source)

97+

98+

99+

100+-- DOC TO STRING WITH NO ANSI CODES

101+

102+

103+nonAnsiRender :: Doc -> String

104+nonAnsiRender doc =

97− (stripAnsi (renderPretty 1 80 (toDoc location region rprt source)))

105+ displayS (stripAnsi (renderPretty 1 80 doc)) ""

98− ""

99

106

100

107

101stripAnsi :: SimpleDoc -> SimpleDoc

108stripAnsi :: SimpleDoc -> SimpleDoc

tests/test-files/good-expected-js/Cases/CharCase.elm.js+1−8

@@ -5,13 +5,6 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var foo = function (x) {

9− var _p0 = x;

10− if (_p0.valueOf() === "A") {

11− return "hello";

12− } else {

13− return "letter A was not seen";

8+ var foo = function (x) { var _p0 = x;if (_p0.valueOf() === "A") { return "hello";} else { return "letter A was not seen";}};

14− }

15− };

16 return _elm.Main.values = {_op: _op,foo: foo};

9 return _elm.Main.values = {_op: _op,foo: foo};

17};

10};

tests/test-files/good-expected-js/Cases/ListZip.elm.js+3−10

@@ -5,9 +5,7 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var Cons = F2(function (a,b) {

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

8+ var Cons = F2(function (a,b) { return {ctor: "Cons",_0: a,_1: b};});

10− });

11 var Nil = {ctor: "Nil"};

9 var Nil = {ctor: "Nil"};

12 var zip = F2(function (list1,list2) {

10 var zip = F2(function (list1,list2) {

13 var _p0 = {ctor: "_Tuple2",_0: list1,_1: list2};

11 var _p0 = {ctor: "_Tuple2",_0: list1,_1: list2};

@@ -17,14 +15,9 @@ Elm.Main.make = function (_elm) {

17 if (_p0._1.ctor === "Nil") {

15 if (_p0._1.ctor === "Nil") {

18 return Nil;

16 return Nil;

19 } else {

17 } else {

20− return A2(Cons,

21− {ctor: "_Tuple2",_0: _p0._0._0,_1: _p0._1._0},

18+ return A2(Cons,{ctor: "_Tuple2",_0: _p0._0._0,_1: _p0._1._0},A2(zip,_p0._0._1,_p0._1._1));

22− A2(zip,_p0._0._1,_p0._1._1));

23 }

19 }

24 }

20 }

25 });

21 });

26− return _elm.Main.values = {_op: _op

22+ return _elm.Main.values = {_op: _op,Nil: Nil,Cons: Cons,zip: zip};

27− ,Nil: Nil

28− ,Cons: Cons

29− ,zip: zip};

30};

23};

tests/test-files/good-expected-js/CodeGenBugs/CommentInterpretedAsInfix.elm.js+1−3

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

8 var always = F2(function (x,s) { return x;});

9 _op["|>"] = F2(function (a,f) { return f(a);});

10 var value = A2(_op["|>"],"Hi",always("Hello"));

11− return _elm.Main.values = {_op: _op

11+ return _elm.Main.values = {_op: _op,always: always,value: value};

12− ,always: always

13− ,value: value};

14};

12};

tests/test-files/good-expected-js/CodeGenBugs/Shadowing.elm.js+3−15

@@ -6,22 +6,10 @@ Elm.Main.make = function (_elm) {

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

7 var _op = {};

8 var toName = function (a) {

9− var name = function () {

9+ var name = function () { var _p0 = a;if (_p0.ctor === "First") { return "True";} else { return _p0._0;}}();

10− var _p0 = a;

11− if (_p0.ctor === "First") {

12− return "True";

13− } else {

14− return _p0._0;

15− }

16− }();

17 return name;

10 return name;

18 };

11 };

19− var Second = F2(function (a,b) {

20− return {ctor: "Second",_0: a,_1: b};

12+ var Second = F2(function (a,b) { return {ctor: "Second",_0: a,_1: b};});

21− });

22 var First = {ctor: "First"};

13 var First = {ctor: "First"};

23− return _elm.Main.values = {_op: _op

14+ return _elm.Main.values = {_op: _op,First: First,Second: Second,toName: toName};

24− ,First: First

25− ,Second: Second

26− ,toName: toName};

27};

15};

tests/test-files/good-expected-js/CodeGenBugs/Shadowing2.elm.js+1−4

@@ -16,8 +16,5 @@ Elm.Main.make = function (_elm) {

16 return 0;

17 }

18 };

19− return _elm.Main.values = {_op: _op

19+ return _elm.Main.values = {_op: _op,Just: Just,Nothing: Nothing,withDefault0: withDefault0};

20− ,Just: Just

21− ,Nothing: Nothing

22− ,withDefault0: withDefault0};

23};

20};

tests/test-files/good-expected-js/CodeGenBugs/TailRecursion_UnsafeLabel.elm.js+2−7

@@ -19,12 +19,7 @@ Elm.Main.make = function (_elm) {

19 }

20 }

21 });

22− var Cons = F2(function (a,b) {

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

22+ var Cons = F2(function (a,b) { return {ctor: "Cons",_0: a,_1: b};});

24− });

25 var Nil = {ctor: "Nil"};

23 var Nil = {ctor: "Nil"};

26− return _elm.Main.values = {_op: _op

24+ return _elm.Main.values = {_op: _op,Nil: Nil,Cons: Cons,foldl$: foldl$};

27− ,Nil: Nil

28− ,Cons: Cons

29− ,foldl$: foldl$};

30};

25};

tests/test-files/good-expected-js/Crash/CrashCase.elm.js+2−5

@@ -3,17 +3,14 @@ Elm.Main.make = function (_elm) {

3 "use strict";

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

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

6− var _U = Elm.Native.Utils.make(_elm),

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

7− $Debug = Elm.Debug.make(_elm);

8 var _op = {};

7 var _op = {};

9 var test = function (x) {

8 var test = function (x) {

10 var _p0 = x;

9 var _p0 = x;

11 if (_p0 === 1) {

10 if (_p0 === 1) {

12 return 2;

11 return 2;

13 } else {

12 } else {

14− return _U.crashCase("Main",

15− {start: {line: 5,column: 5},end: {line: 9,column: 43}},

13+ return _U.crashCase("Main",{start: {line: 5,column: 5},end: {line: 9,column: 43}},_p0)("unexpected value");

16− _p0)("unexpected value");

17 }

14 }

18 };

15 };

19 return _elm.Main.values = {_op: _op,test: test};

16 return _elm.Main.values = {_op: _op,test: test};

tests/test-files/good-expected-js/Crash/CrashIf.elm.js+2−7

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

3 "use strict";

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

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

6− var _U = Elm.Native.Utils.make(_elm),

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

7− $Debug = Elm.Debug.make(_elm);

8 var _op = {};

7 var _op = {};

9− var test = function (x) {

10− return x ? 2 : _U.crash("Main",

11− {start: {line: 8,column: 9}

12− ,end: {line: 8,column: 20}})("unexpected value");

8+ var test = function (x) { return x ? 2 : _U.crash("Main",{start: {line: 8,column: 9},end: {line: 8,column: 20}})("unexpected value");};

13− };

14 return _elm.Main.values = {_op: _op,test: test};

9 return _elm.Main.values = {_op: _op,test: test};

15};

10};

tests/test-files/good-expected-js/Declarations/Ports.elm.js+6−19

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

7 var _op = {};

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

9 function (v) {

10− return Elm.Native.List.make(_elm).toArray(v).map(function (v) {

10+ return Elm.Native.List.make(_elm).toArray(v).map(function (v) { return {name: v.name,age: v.age};});

11− return {name: v.name,age: v.age};

12− });

13 },

11 },

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

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

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

13+ var time = Elm.Native.Port.make(_elm).outbound("time",function (v) { return v;},3.14);

16− function (v) {

17− return v;

18− },

19− 3.14);

20− var fortyTwo = Elm.Native.Port.make(_elm).outbound("fortyTwo",

14+ var fortyTwo = Elm.Native.Port.make(_elm).outbound("fortyTwo",function (v) { return v;},42);

21− function (v) {

22− return v;

23− },

24− 42);

25 var record = Elm.Native.Port.make(_elm).inbound("record",

15 var record = Elm.Native.Port.make(_elm).inbound("record",

26 "{ x : Float, y : Float }",

16 "{ x : Float, y : Float }",

27 function (v) {

17 function (v) {

@@ -41,22 +31,19 @@ Elm.Main.make = function (_elm) {

41 "( Float, Bool )",

31 "( Float, Bool )",

42 function (v) {

32 function (v) {

43 return typeof v === "object" && v instanceof Array ? {ctor: "_Tuple2"

33 return typeof v === "object" && v instanceof Array ? {ctor: "_Tuple2"

44− ,_0: typeof v[0] === "number" ? v[0] : _U.badPort("a number",

34+ ,_0: typeof v[0] === "number" ? v[0] : _U.badPort("a number",v[0])

45− v[0])

46 ,_1: typeof v[1] === "boolean" ? v[1] : _U.badPort("a boolean (true or false)",

35 ,_1: typeof v[1] === "boolean" ? v[1] : _U.badPort("a boolean (true or false)",

47 v[1])} : _U.badPort("an array",v);

36 v[1])} : _U.badPort("an array",v);

48 });

37 });

49 var number = Elm.Native.Port.make(_elm).inbound("number",

38 var number = Elm.Native.Port.make(_elm).inbound("number",

50 "Int",

39 "Int",

51 function (v) {

40 function (v) {

52− return typeof v === "number" && isFinite(v) && Math.floor(v) === v ? v : _U.badPort("an integer",

41+ return typeof v === "number" && isFinite(v) && Math.floor(v) === v ? v : _U.badPort("an integer",v);

53− v);

54 });

42 });

55 var userID = Elm.Native.Port.make(_elm).inbound("userID",

43 var userID = Elm.Native.Port.make(_elm).inbound("userID",

56 "String",

44 "String",

57 function (v) {

45 function (v) {

58− return typeof v === "string" || typeof v === "object" && v instanceof String ? v : _U.badPort("a string",

46+ return typeof v === "string" || typeof v === "object" && v instanceof String ? v : _U.badPort("a string",v);

59− v);

60 });

47 });

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

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

62};

49};

tests/test-files/good-expected-js/Records/NonHomogeneousRecords.elm.js+2−8

@@ -5,13 +5,7 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var bindFields = function (thing) {

8+ var bindFields = function (thing) { var y = thing.y;var x = thing.x;return thing;};

9− var y = thing.y;

10− var x = thing.x;

11− return thing;

12− };

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

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

14− return _elm.Main.values = {_op: _op

10+ return _elm.Main.values = {_op: _op,Thing: Thing,bindFields: bindFields};

15− ,Thing: Thing

16− ,bindFields: bindFields};

17};

11};

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

@@ -5,9 +5,6 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var apply = function (f) {

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

8+ var apply = function (f) { var g = function (x) { return f(x);};return g;};

10− return g;

11− };

12 return _elm.Main.values = {_op: _op,apply: apply};

9 return _elm.Main.values = {_op: _op,apply: apply};

13};

10};

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

@@ -5,9 +5,6 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var apply = function (f) {

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

8+ var apply = function (f) { var g = function (x) { return f(x);};return g;};

10− return g;

11− };

12 return _elm.Main.values = {_op: _op,apply: apply};

9 return _elm.Main.values = {_op: _op,apply: apply};

13};

10};

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

@@ -5,9 +5,6 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var myId = function () {

9− var id = function (x) { return x;};

8+ var myId = function () { var id = function (x) { return x;};return id;}();

10− return id;

11− }();

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

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

13};

10};

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

@@ -5,9 +5,6 @@ Elm.Main.make = function (_elm) {

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

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

7 var _op = {};

8− var myId = function () {

9− var id = function (x) { return x;};

8+ var myId = function () { var id = function (x) { return x;};return id;}();

10− return id;

11− }();

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

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

13};

10};

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

@@ -8,13 +8,6 @@ Elm.Main.make = function (_elm) {

8 var commentStart = "{-";

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

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

11− var variablesWithPrimes = function (x) {

11+ var variablesWithPrimes = function (x) { var x$ = x;return x$;};

12− var x$ = x;

13− return x$;

14− };

15− return _elm.Main.values = {_op: _op

16− ,variablesWithPrimes: variablesWithPrimes

12+ return _elm.Main.values = {_op: _op,variablesWithPrimes: variablesWithPrimes,doubleQuote: doubleQuote,singleQuote: singleQuote,commentStart: commentStart};

17− ,doubleQuote: doubleQuote

18− ,singleQuote: singleQuote

19− ,commentStart: commentStart};

20};

13};