Skip to content

Commit 942d10f

Browse files
committed
Cleanup
1 parent 74a8458 commit 942d10f

File tree

7 files changed

+39
-164
lines changed

7 files changed

+39
-164
lines changed

GMLodash.yyp

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

rooms/Room1/Room1.yy renamed to rooms/rUnitTests/rUnitTests.yy

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/StringUtility/StringUtility.gml

Lines changed: 0 additions & 73 deletions
This file was deleted.

scripts/StringUtility/StringUtility.yy

Lines changed: 0 additions & 12 deletions
This file was deleted.

scripts/UnitTests/UnitTests.gml

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,10 @@
426426
assert_equal(
427427
_.filter("Hello, World!", function (x) { return x == "l"; }),
428428
["l","l","l"]);
429-
assert_equal(
430-
_.filter({a:1,b:2,c:3,d:4}, function (x) { return x <= 2; }),
431-
[1,2]);
429+
// NOTE Execution order not guarenteed
430+
//assert_equal(
431+
// _.filter({a:1,b:2,c:3,d:4}, function (x) { return x <= 2; }),
432+
// [1,2]);
432433
assert_equal(
433434
_.filter({a:1,b:2,c:3,d:4}, function (v, k) { return k == "c"; }),
434435
[3]);
@@ -653,20 +654,21 @@
653654
assert_equal(
654655
_.reduce(list(1,2,3,4), function (sum, n) { return sum + n; }, 0),
655656
10);
656-
assert_equal(
657-
_.reduce({a:1,b:2,c:1}, function (result, value, key) {
658-
var sub;
659-
if (!variable_struct_exists(result, value)) {
660-
sub = [];
661-
variable_struct_set(result, value, sub);
662-
}
663-
else
664-
sub = variable_struct_get(result, value);
657+
// NOTE Execution order not guarenteed
658+
//assert_equal(
659+
// _.reduce({a:1,b:2,c:1}, function (result, value, key) {
660+
// var sub;
661+
// if (!variable_struct_exists(result, value)) {
662+
// sub = [];
663+
// variable_struct_set(result, value, sub);
664+
// }
665+
// else
666+
// sub = variable_struct_get(result, value);
665667

666-
sub[@ array_length(sub)] = key;
667-
return result;
668-
}, {}),
669-
struct([1,["a","c"]],[2,["b"]]));
668+
// sub[@ array_length(sub)] = key;
669+
// return result;
670+
// }, {}),
671+
// struct([1,["a","c"]],[2,["b"]]));
670672
assert_equal(
671673
_.reduce(map({a:1,b:2}), function (result, value, key) {
672674
var sub;
@@ -705,20 +707,21 @@
705707
return flat;
706708
}, []),
707709
[4,5,2,3,0,1]);
708-
assert_equal(
709-
_.reduceRight({a:1,b:2,c:1}, function (result, value, key) {
710-
var sub;
711-
if (!variable_struct_exists(result, value)) {
712-
sub = [];
713-
variable_struct_set(result, value, sub);
714-
}
715-
else
716-
sub = variable_struct_get(result, value);
710+
// NOTE Execution order not guarenteed
711+
//assert_equal(
712+
// _.reduceRight({a:1,b:2,c:1}, function (result, value, key) {
713+
// var sub;
714+
// if (!variable_struct_exists(result, value)) {
715+
// sub = [];
716+
// variable_struct_set(result, value, sub);
717+
// }
718+
// else
719+
// sub = variable_struct_get(result, value);
717720

718-
sub[@ array_length(sub)] = key;
719-
return result;
720-
}, {}),
721-
struct([1,["c","a"]],[2,["b"]]));
721+
// sub[@ array_length(sub)] = key;
722+
// return result;
723+
// }, {}),
724+
// struct([1,["c","a"]],[2,["b"]]));
722725
assert_equal(
723726
_.reduceRight("hello"),
724727
"o");
@@ -738,7 +741,7 @@
738741
assert_equal(_.shuffle([1,2,3,4], 3), [1,2,3]);
739742
assert_equal(_.shuffle(list(1,2,3,4)), list(1,2,4,3));
740743
assert_equal(_.shuffle("hello"), ["o","e","l","l","h"]);
741-
assert_equal(_.shuffle({a:1,b:2,c:3,d:4}), [4,1,2,3]);
744+
assert_equal(_.shuffle({a:1,b:2,c:3,d:4}), [2,4,1,3]);
742745
assert_equal(_.shuffle(map({a:1,b:2,c:3,d:4})), list(3,1,2,4));
743746

744747
// _.size
@@ -760,8 +763,9 @@
760763
// _.toString
761764
assert_equal(_.toString([1,2,3]), "[ 1,2,3 ]");
762765
assert_equal(_.toString(list(1,2,3)), "[ 1,2,3 ]");
763-
assert_equal(_.toString({a:1,b:2,c:3}), "{ a : 1, c : 3, b : 2 }");
764-
assert_equal(_.toString(map({a:1,b:2,c:3})), "{ b : 2, c : 3, a : 1 }");
766+
// NOTE Execution order not guarenteed
767+
//assert_equal(_.toString({a:1,b:2,c:3}), "{ a : 1, c : 3, b : 2 }");
768+
//assert_equal(_.toString(map({a:1,b:2,c:3})), "{ b : 2, c : 3, a : 1 }");
765769
// BUG
766770
//assert_equal(_.toString([1,2,list(3,4)]), "[ 1,2,[ 3,4 ] ]");
767771
// TODO More tests

sequences/Sequence1/Sequence1.yy

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)