Allow display hint hex for float/i64

vshaxe · Apr 4, 2024 · 519a3ff · 519a3ff
1 parent 23dadf0
commit 519a3ff
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 11 deletions.
diff --git a/hld/Eval.hx b/hld/Eval.hx
@@ -770,20 +770,27 @@ class Eval {
 		case VNull: "null";
 		case VInt(i):
 			switch( v.hint ) {
-			case HHex: Value.int2Str(i, 16);
-			case HBin: Value.int2Str(i, 2);
+			case HHex: Value.intStr(i, 16);
+			case HBin: Value.intStr(i, 2);
 			case HEnumFlags(t):
 				var eproto = module.resolveEnum(t);
 				if( eproto == null )
 					throw "Can't resolve enum " + t;
-				Value.int2EnumFlags(i, eproto);
-			default:
-				"" + i;
+				Value.intEnumFlags(i, eproto);
+			default: "" + i;
+			}
+		case VInt64(i):
+			switch( v.hint ) {
+			case HHex: Value.int64Hex(i);
+			default: "" + i;
+			}
+		case VFloat(i):
+			switch( v.hint ) {
+			case HHex: Value.intStr(Std.int(i), 16);
+			default: "" + i;
 			}
-		case VInt64(i): "" + i;
-		case VFloat(v): "" + v;
-		case VBool(b): b?"true":"false";
-		case VPointer(p):
+		case VBool(b): b ? "true" : "false";
+		case VPointer(_):
 			switch( v.t ) {
 			case HObj(p), HStruct(p): p.name.split(".").pop(); // short form (no package)
 			default: typeStr(v.t);

diff --git a/hld/Value.hx b/hld/Value.hx
@@ -50,7 +50,7 @@ enum Hint {
 	}
 
 	static final INTBASE = "0123456789ABCDEF";
-	public static function int2Str( value : Int, base : Int ) : String {
+	public static function intStr( value : Int, base : Int ) : String {
 		if( base < 2 || base > INTBASE.length )
 			throw "Unsupported int base";
 		var prefix = base == 2 ? "0b" : base == 16 ? "0x" : "";
@@ -65,7 +65,17 @@ enum Hint {
 		return (value < 0 ? "-" : "") + prefix + s;
 	}
 
-	public static function int2EnumFlags( value : Int, eproto : format.hl.Data.EnumPrototype ) : String {
+	public static function int64Hex( value : haxe.Int64 ) : String {
+		var s = "";
+		var abs = value >= haxe.Int64.make(0,0) ? value : -value;
+		while( abs > 0 ) {
+			s = INTBASE.charAt(abs.low & 15) + s;
+			abs = abs >> 4;
+		}
+		return (value < 0 ? "-" : "") + "0x" + s;
+	}
+
+	public static function intEnumFlags( value : Int, eproto : format.hl.Data.EnumPrototype ) : String {
 		var f = "";
 		for( i in 0...eproto.constructs.length ) {
 			if( (value >> i) % 2 == 1 )