gabry/hscript-improved
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EMapDecl + Map Comprehension

Browse Source
This commit is contained in:
NeeEoo
2024-04-25 04:14:41 +02:00
parent c0d4540d4b
commit b6df96a4b0
9 changed files with 432 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/Util.hx
+120 -23
View File
@@ -1,9 +1,101 @@
import hscript.Expr.Error;
import hscript.Printer;
import haxe.Constraints.IMap;
using StringTools;
class Util {
// TODO: check this for bugs
static function deepEqual(a:Dynamic, b:Dynamic):Bool {
if (a == b) {
return true;
}
if (a == null || b == null) {
return false;
}
if ((a is Array) && (b is Array)) {
var aArray:Array<Dynamic> = cast a;
var bArray:Array<Dynamic> = cast b;
if (aArray.length != bArray.length) {
return false;
}
for (i in 0...aArray.length) {
if (!deepEqual(aArray[i], bArray[i])) {
return false;
}
}
return true;
}
if(Std.isOfType(a, Enum) && Std.isOfType(b, Enum)) {
if(Type.enumEq(a, b))
return true;
}
// Check Map Equality
if (Std.isOfType(a, IMap) && Std.isOfType(b, IMap)) {
var aMap:IMap<Dynamic, Dynamic> = cast a;
var bMap:IMap<Dynamic, Dynamic> = cast b;
var aFields = [for(v in aMap.keys()) v];
var bFields = [for(v in bMap.keys()) v];
if (aFields.length != bFields.length) {
return false;
}
// Sort fields to ensure consistent comparison
aFields.sort(Reflect.compare);
bFields.sort(Reflect.compare);
for (key in aMap.keys()) {
if (!bMap.exists(key) || !deepEqual(aMap.get(key), bMap.get(key))) {
return false;
}
}
return true;
}
if (Reflect.isObject(a) && Reflect.isObject(b)) {
var aFields = Reflect.fields(a);
var bFields = Reflect.fields(b);
if (aFields.length != bFields.length) {
return false;
}
// Sort fields to ensure consistent comparison
aFields.sort(Reflect.compare);
bFields.sort(Reflect.compare);
for (i in 0...aFields.length) {
var field = aFields[i];
if (field != bFields[i] || !deepEqual(Reflect.field(a, field), Reflect.field(b, field))) {
return false;
}
}
return true;
}
if(!Type.enumEq(Type.typeof(a), Type.typeof(b))) {
if(Type.typeof(a) == TInt && Type.typeof(b) == TFloat) {
return cast(a, Int) == cast(b, Float);
}
if(Type.typeof(a) == TFloat && Type.typeof(b) == TInt) {
return cast(a, Float) == cast(b, Int);
}
}
return false;
}
public static function assert(value:Bool, message:String, ?pos:haxe.PosInfos) {
if (value) {
passedTestUnits++;
@@ -17,15 +109,16 @@ class Util {
}
public static function assertEq(value:Dynamic, expected:Dynamic, message:String, ?pos:haxe.PosInfos) {
var passed = value == expected;
if (Std.isOfType(value, Array) && Std.isOfType(expected, Array)) {
if (deepCompareArrays(value, expected))
passed = true;
}
else if (Std.isOfType(value, Enum) && Std.isOfType(expected, Enum)) {
if(Type.enumEq(value, expected))
passed = true;
}
var equals = deepEqual(value, expected);
var passed = equals;
//if (Std.isOfType(value, Array) && Std.isOfType(expected, Array)) {
// if (deepCompareArrays(value, expected))
// passed = true;
//}
//else if (Std.isOfType(value, Enum) && Std.isOfType(expected, Enum)) {
// if(Type.enumEq(value, expected))
// passed = true;
//}
if (passed) {
passedTestUnits++;
@@ -39,15 +132,17 @@ class Util {
}
public static function assertEqPrintable(value:Dynamic, expected:Dynamic, message:String, ?pos:haxe.PosInfos) {
var passed = value == expected;
if (Std.isOfType(value, Array) && Std.isOfType(expected, Array)) {
if (deepCompareArrays(value, expected))
passed = true;
}
else if (Std.isOfType(value, Enum) && Std.isOfType(expected, Enum)) {
if(Type.enumEq(value, expected))
passed = true;
}
//var passed = value == expected;
//if (Std.isOfType(value, Array) && Std.isOfType(expected, Array)) {
// if (deepCompareArrays(value, expected))
// passed = true;
//}
//else if (Std.isOfType(value, Enum) && Std.isOfType(expected, Enum)) {
// if(Type.enumEq(value, expected))
// passed = true;
//}
var equals = deepEqual(value, expected);
var passed = equals;
if (passed) {
passedTestUnits++;
@@ -61,11 +156,13 @@ class Util {
}
public static function assertNeq(value:Dynamic, expected:Dynamic, message:String, ?pos:haxe.PosInfos) {
var passed = value != expected;
if (Std.isOfType(value, Array) && Std.isOfType(expected, Array)) {
if (!deepCompareArrays(value, expected))
passed = true;
}
//var passed = value != expected;
//if (Std.isOfType(value, Array) && Std.isOfType(expected, Array)) {
// if (!deepCompareArrays(value, expected))
// passed = true;
//}
var equals = deepEqual(value, expected);
var passed = !equals;
// WARNING THIS MIGHT NOT WORK
tests/src/tests/FinalCase.hx
+29
View File
@@ -55,6 +55,35 @@ class FinalCase extends TestCase {
Util.parse('test ? 0xFF343434 : 0xFF92A2FF');
Util.parse('test ? 1 : 0.75;');
Util.runKnownBug("Function then array causes error, unless the function ends with ;", function() {
headerCode = "";
function isEven(i:Int):Bool { return i % 2 == 0; }
assertEq("function isEven(i:Int):Bool { return i % 2 == 0; }[for(i in 0...10) if(i % 2 == 0) i => isEven(i) else i => isEven(i)]", [for(i in 0...10) if(i % 2 == 0) i => isEven(i) else i => isEven(i)]);
});
assertEq("[for(i in 0...10) i]", [for(i in 0...10) i]);
assertEq("[for(i in 0...10) i => null]", [for(i in 0...10) i => null]);
assertEq("[for(i in 0...10) if(i % 2 == 0) i => 'even' else i => 'odd']", [for(i in 0...10) if(i % 2 == 0) i => 'even' else i => 'odd']);
assertEq("[for(i in 0...10) if(i % 2 == 0) 'even' else 'odd']", [for(i in 0...10) if(i % 2 == 0) 'even' else 'odd']);
assertEq("[for(i in 0...10) for(j in 0...10) i * j]", [for(i in 0...10) for(j in 0...10) i * j]);
headerCode = "function isEven(i:Int):Bool { return i % 2 == 0; };";
function isEven(i:Int):Bool { return i % 2 == 0; }
assertEq("[for(i in 0...10) if(i % 2 == 0) i => isEven(i) else i => isEven(i)]", [for(i in 0...10) if(i % 2 == 0) i => isEven(i) else i => isEven(i)]);
assertEq("[for(i in 0...10) if(i % 2 == 0) isEven(i) else isEven(i)]", [for(i in 0...10) if(i % 2 == 0) isEven(i) else isEven(i)]);
headerCode = "function area(a:Int, b:Int):Int { return a * b; };";
function area(a:Int, b:Int):Int { return a * b; }
assertEq("[for(i in 0...10) for(j in 0...10) area(i, j)]", [for(i in 0...10) for(j in 0...10) area(i, j)]);
headerCode = "";
assertEq("[0=>'hello', 1=>'world']", [0=>'hello', 1=>'world']);
assertEq("[0=>'hello', 1=>'world'][1]", [0=>'hello', 1=>'world'][1]);
// Test EOF with preprocessor
}