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

replace if/else chain with final switch in Resolver.resolve() (#232)

Browse source
This commit is contained in:
Cameron Ross 2019-02-05 05:06:05 -03:30 committed by Basile-z
parent b63ea1aaae
commit dc5ee1a6ac
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/dyaml/resolver.d
View file

@ -130,29 +130,42 @@ final class Resolver
string resolve(const NodeID kind, const string tag, const string value, string resolve(const NodeID kind, const string tag, const string value,
const bool implicit) @safe const bool implicit) @safe
{ {
if((tag !is null) && tag != "!"){return tag;} import std.array : empty, front;
if((tag !is null) && (tag != "!"))
if(kind == NodeID.scalar)
{ {
if(!implicit){return defaultScalarTag_;} return tag;
}
final switch (kind)
{
case NodeID.scalar:
if(!implicit)
{
return defaultScalarTag_;
}
//Get the first char of the value. //Get the first char of the value.
size_t dummy; const dchar first = value.empty ? '\0' : value.front;
const dchar first = value.length == 0 ? '\0' : decode(value, dummy);
auto resolvers = (first in yamlImplicitResolvers_) is null ? auto resolvers = (first in yamlImplicitResolvers_) is null ?
[] : yamlImplicitResolvers_[first]; [] : yamlImplicitResolvers_[first];
//If regexp matches, return tag. //If regexp matches, return tag.
foreach(resolver; resolvers) if(!(match(value, resolver[1]).empty)) foreach(resolver; resolvers)
{
if(!(match(value, resolver[1]).empty))
{ {
return resolver[0]; return resolver[0];
} }
return defaultScalarTag_;
} }
else if(kind == NodeID.sequence){return defaultSequenceTag_;} return defaultScalarTag_;
else if(kind == NodeID.mapping) {return defaultMappingTag_;} case NodeID.sequence:
assert(false, "This line of code should never be reached"); return defaultSequenceTag_;
case NodeID.mapping:
return defaultMappingTag_;
case NodeID.invalid:
assert(false, "Cannot resolve an invalid node");
}
} }
@safe unittest @safe unittest
{ {