Skip to content

Commit

Permalink
Merge branch 'development' into no_void_load
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/typing/typeload.ml
  • Loading branch information
Simn committed Feb 7, 2024
2 parents 9f83815 + 2fb7155 commit b7c60f5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions src/typing/typeloadFields.ml
Original file line number Diff line number Diff line change
Expand Up @@ -602,9 +602,7 @@ let type_var_field ctx t e stat do_display p =
let e = if do_display then Display.preprocess_expr ctx.com e else e in
let e = type_expr ctx e (WithType.with_type t) in
let e = AbstractCast.cast_or_unify ctx t e p in
match t with
| TType ({ t_path = ([],"UInt") },[]) | TAbstract ({ a_path = ([],"UInt") },[]) when stat -> { e with etype = t }
| _ -> e
e

let type_var_field ctx t e stat do_display p =
let save = TypeloadFunction.save_field_state ctx in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ typedef Rec2Struct<T> = {

class TypedefAbstract {
static function main() {
var r:Rec2<Void> = (null:Rec1<Void>);
var r:Rec2<haxe.NoValue> = (null:Rec1<haxe.NoValue>);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ typedef Rec2<T> = {

class TypedefTypedef {
static function main() {
var r:Rec1<Void> = (null:Rec2<Void>);
var r:Rec1<haxe.NoValue> = (null:Rec2<haxe.NoValue>);
}
}

0 comments on commit b7c60f5

Please sign in to comment.