debian-packages/taggedalgebraic
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix compile error when naming a TaggedUnion field "move".

Browse source
This commit is contained in:
Sönke Ludwig 2020-04-06 13:45:16 +02:00
parent a3078c34fc
commit 7b34bdadde
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/taggedalgebraic/taggedunion.d
View file

@ -87,7 +87,7 @@ align(commonAlignment!(UnionKindTypes!(UnionFieldEnum!U))) struct TaggedUnion
static if (isUnitType!(FieldTypes[ti]))
set!(cast(Kind)ti)();
else
set!(cast(Kind)ti)(move(value));
set!(cast(Kind)ti)(.move(value));
}
void opAssign(FieldTypes[ti] value)
@ -95,7 +95,7 @@ align(commonAlignment!(UnionKindTypes!(UnionFieldEnum!U))) struct TaggedUnion
static if (isUnitType!(FieldTypes[ti]))
set!(cast(Kind)ti)();
else
set!(cast(Kind)ti)(move(value));
set!(cast(Kind)ti)(.move(value));
}
}
@ -211,7 +211,7 @@ align(commonAlignment!(UnionKindTypes!(UnionFieldEnum!U))) struct TaggedUnion
mixin("alias "~name~"Value = value!(Kind."~name~");");
mixin("static TaggedUnion "~name~"(FieldTypes["~i.stringof~"] value)"
~ "{ TaggedUnion tu; tu.set!(Kind."~name~")(move(value)); return tu; }");
~ "{ TaggedUnion tu; tu.set!(Kind."~name~")(.move(value)); return tu; }");
// TODO: define assignment operator for unique types
} else {
@ -517,6 +517,11 @@ unittest { // null members should be assignable
assert(val.kind == val.Kind.Null);
}
unittest { // make sure field names don't conflict with function names
union U { int to; int move; int swap; }
TaggedUnion!U val;
val.setMove(1);
}
enum isUnitType(T) = is(T == Void) || is(T == void) || is(T == typeof(null));