git.iko.soy/elk
on master help sign in
Finish switching over to '_Tuple' format for tuples.
1fcb01fEvan Czaplicki
libraries/Native/Show.js+2−2
compare with master
unifiedsplit
@@ -37,7 +37,7 @@ Elm.Native.Show = function(elm) {
37 if (output.length === 0) return "{}";
37 if (output.length === 0) return "{}";
38 return "{ " + output.join(", ") + " }";
38 return "{ " + output.join(", ") + " }";
39 } else if (typeof v === "object" && 'ctor' in v) {
39 } else if (typeof v === "object" && 'ctor' in v) {
40− if (v.ctor.substring(0,5) === "Tuple") {
40+ if (v.ctor.substring(0,6) === "_Tuple") {
41 var output = [];
41 var output = [];
42 for (var k in v) {
42 for (var k in v) {
43 if (k === 'ctor') continue;
43 if (k === 'ctor') continue;
@@ -63,7 +63,7 @@ Elm.Native.Show = function(elm) {
63 var cons = F3(function(k,v,acc){return NList.Cons(Tuple2(k,v),acc)});
63 var cons = F3(function(k,v,acc){return NList.Cons(Tuple2(k,v),acc)});
64 var list = A3(Dict.foldr, cons, NList.Nil, v);
64 var list = A3(Dict.foldr, cons, NList.Nil, v);
65 var name = "Dict";
65 var name = "Dict";
66− if (list.ctor === "::" && list._0._1.ctor === "Tuple0") {
66+ if (list.ctor === "::" && list._0._1.ctor === "_Tuple0") {
67 name = "Set";
67 name = "Set";
68 list = A2(List.map, function(x){return x._0}, list);
68 list = A2(List.map, function(x){return x._0}, list);
69 }
69 }
libraries/Native/Utils.js+4−4
@@ -36,8 +36,8 @@ Elm.Native.Utils = function(elm) {
36 }
36 }
37 }
37 }
38
38
39− if (x.ctor.slice(0,5) === 'Tuple') {
39+ if (x.ctor.slice(0,6) === '_Tuple') {
40− var n = x.ctor.slice(5) - 0;
40+ var n = x.ctor.slice(6) - 0;
41 var err = 'cannot compare tuples with more than 6 elements.';
41 var err = 'cannot compare tuples with more than 6 elements.';
42 if (n === 0) return EQ;
42 if (n === 0) return EQ;
43 if (n >= 1) { ord = cmp(x._0, y._0); if (ord !== EQ) return ord;
43 if (n >= 1) { ord = cmp(x._0, y._0); if (ord !== EQ) return ord;
@@ -55,8 +55,8 @@ Elm.Native.Utils = function(elm) {
55 }
55 }
56
56
57
57
58− var Tuple0 = { ctor: "Tuple0" };
58+ var Tuple0 = { ctor: "_Tuple0" };
59− function Tuple2(x,y) { return { ctor:"Tuple2", _0:x, _1:y } }
59+ function Tuple2(x,y) { return { ctor:"_Tuple2", _0:x, _1:y } }
60
60
61 var count = 0;
61 var count = 0;
62 function guid(_) { return count++ }
62 function guid(_) { return count++ }
runtime/Render/Element.js+1−1
@@ -21,7 +21,7 @@ function setProps(props, e) {
21 a.appendChild(e);
21 a.appendChild(e);
22 return a;
22 return a;
23 }
23 }
24− if (props.hover.ctor !== 'Tuple0') {
24+ if (props.hover.ctor !== '_Tuple0') {
25 var overCount = 0;
25 var overCount = 0;
26 e.addEventListener('mouseover', function() {
26 e.addEventListener('mouseover', function() {
27 if (overCount++ > 0) return;
27 if (overCount++ > 0) return;