Bubel/bubel-ecs
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Refactored fullName template

Browse source 
New fullName implementation gives same result as fullyQualifiedName for normal types and templated ones, and still works in BetterC
This commit is contained in:
Mergul 2023-04-27 23:08:27 +02:00
parent 50fa2ce19c
commit 6a600d22c8
3 changed files with 59 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

37
source/bubel/ecs/traits.d
View file

@ -63,34 +63,19 @@ static long getIndexOfTypeInEntitiesData(EntitiesData, Type)()
return index; return index;
} }
static string attachParentName(alias T, string str)() template fullName(alias T : X!A, alias X, A...)
{ {
alias parent = __traits(parent, T); alias parent = __traits(parent, X);
enum parent_str = parent.stringof; enum fullName = fullName!parent ~ '.' ~ __traits(identifier, X) ~ "!(" ~ fullName!A ~ ")";
static if(parent_str[0..7] == "module ")
{
static if(__traits(compiles, __traits(parent, parent)))
{
return attachParentName!(parent, parent_str[7 .. $] ~ '.' ~ str);
}
else return parent_str[7 .. $] ~ '.' ~ str;
}
else static if(parent_str[0..8] == "package ")
{
static if(__traits(compiles, __traits(parent, parent)))
{
return attachParentName!(parent, parent_str[8 .. $] ~ '.' ~ str);
}
else return parent_str[8 .. $] ~ '.' ~ str;
}
else static if(__traits(compiles, __traits(parent, parent)))
{
return attachParentName!(parent, parent_str ~ '.' ~ str);
}
else return parent_str ~ '.' ~ str;
} }
static string fullName(T)() template fullName(alias T)
{ {
return attachParentName!(T, T.stringof); static if(__traits(compiles, __traits(parent, T)))
{
alias parent = __traits(parent, T);
enum fullName = fullName!parent ~ '.' ~ __traits(identifier, T);
}
else static if(__traits(compiles, __traits(identifier, T)))enum fullName = __traits(identifier, T);
else enum fullName = T.stringof;
} }

16
tests/basic.d
View file

@ -160,6 +160,22 @@ void afterEveryTest()
gEntityManager.destroy(); gEntityManager.destroy();
} }
@("RegisteredNames")
unittest
{
import bubel.ecs.traits;
gEntityManager.beginRegister();
gEntityManager.registerSystem!EmptySystem(0);
gEntityManager.registerSystem!EntityCounterSystem(0);
gEntityManager.endRegister();
System* empty_system = gEntityManager.getSystem(becsID!EmptySystem);
System* counter_system = gEntityManager.getSystem(becsID!EntityCounterSystem);
assert(empty_system.name == "tests.basic.EmptySystem", fullName!EmptySystem);
assert(counter_system.name == "tests.basic.EntityCounterSystem", fullName!EntityCounterSystem);
}
@("EntityMeta") @("EntityMeta")
unittest unittest
{ {

33
tests/bugs.d
View file

@ -172,4 +172,35 @@ unittest
gEntityManager.commit(); gEntityManager.commit();
gEntityManager.destroy(); gEntityManager.destroy();
} }
@("3-template-system-compilation-file")
unittest
{
struct TemplateSystem(T)
{
struct EntitiesData
{
uint length;
}
uint a;
uint b;
}
struct TempalteComponent(T)
{
T parameter;
}
gEntityManager.initialize(0);
gEntityManager.beginRegister();
gEntityManager.registerComponent!CInt;
gEntityManager.registerComponent!(TempalteComponent!uint);
gEntityManager.registerSystem!(TemplateSystem!CInt)(0);
gEntityManager.endRegister();
}