use haxe5 fromNull for guid ints.

Author: ncannasse

cdb/Module.hx

@@ -484,7 +484,7 @@ class Module {
 						kind : FFun({
 							args : [],
 							ret : null,
-							expr : macro return this.isNull() ? null : $i{modName}.$tableName.getUID(this),
+							expr : macro return #if haxe5 this == null #else this.isNull() #end ? null : $i{modName}.$tableName.getUID(this),
 						})
 					});
 					fields.push({
@@ -505,15 +505,15 @@ class Module {
 						kind : FFun({
 							args : [{ name : "kind", type : TPath({ name : tkind, pack : [] }) }],
 							ret : TPath({ name : tname+"Guid", pack : [] }),
-							expr : macro return kind == null ? cdb.Types.GuidInt.getNull() : cast $i{modName}.$tableName.get(kind).$guidField.toInt(),
+							expr : macro return kind == null ? #if haxe5 null #else cdb.Types.GuidInt.getNull() #end : cast $i{modName}.$tableName.get(kind).$guidField.toInt(),
 						})
 					});
 				}
 				types.push({
 					pos : pos,
 					name : tname+"Guid",
 					pack : curMod,
-					meta : [{ name : ":forward", params : [], pos : pos }],
+					meta : [{ name : ":forward", params : [], pos : pos },{ name : ":fromNull", params : [], pos : pos }],
 					kind : TDAbstract(tguid,null,[tguid],[tguid]),
 					fields : fields,
 				});

cdb/Types.hx

@@ -467,7 +467,7 @@ abstract Guid<T>(String) {
 
 	public function toInt() : GuidInt<T> {
 		if( this == null )
-			return GuidInt.getNull();
+			return #if haxe5 null #else GuidInt.getNull() #end;
 		var k = 0;
 		var tot = haxe.Int64.ofInt(0);
 		for( i in 0...13 ) {
@@ -480,7 +480,7 @@ abstract Guid<T>(String) {
 	}
 
 	public static function ofInt<T>( v : GuidInt<T> ) {
-		if( v.isNull() )
+		if( #if haxe5 v == null #else v.isNull() #end )
 			return new Guid<T>(null);
 		var str = "";
 		var v : haxe.Int64 = v;
@@ -498,24 +498,19 @@ abstract Guid<T>(String) {
 
 typedef GuidIntImpl = #if (hl && hl_ver >= version("1.16.0")) hl.GUID #else haxe.Int64 #end;
 
+@:fromNull
 abstract GuidInt<T>(GuidIntImpl) from GuidIntImpl to GuidIntImpl {
 
 	public inline function toGuid() {
 		return Guid.ofInt(this);
 	}
 
+	#if !haxe5
 	public inline function isNull() {
 		return haxe.Int64.isZero(this);
 	}
-
-	/*
-	Disable until https://github.com/HaxeFoundation/haxe/issues/12422 is resolved
-	public inline function setNull() {
-		this = getNull();
-	}
-	*/
-
 	public static inline function getNull<T>() : GuidInt<T> return haxe.Int64.ofInt(0);
+	#end
 }
 
 class Index<T> {