dub-mirrors/mirage-config
1
0
Fork 0
mirror of https://github.com/mbierlee/mirage-config.git synced 2024-11-15 04:44:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slight refactor

Browse source
This commit is contained in:
Mike Bierlee 2022-09-24 03:18:49 +03:00
parent a4b0e7982e
commit 16b430a135
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
source/poodinis/config/dictionary.d
View file

@ -170,47 +170,63 @@ class ConfigDictionary {
auto path = new ConfigPath(configPath);
auto currentNode = rootNode;
PathSegment currentPathSegment = path.getNextSegment();
string createExceptionPath() {
return "'" ~ configPath ~ "' (at '" ~ path.getCurrentPath() ~ "')";
}
void throwPathNotExists() {
throw new ConfigReadException("Path does not exist: " ~ createExceptionPath());
}
void ifNotNullPointer(void* obj, void delegate() fn) {
if (obj) {
fn();
} else {
throwPathNotExists();
}
}
void ifNotNull(Object obj, void delegate() fn) {
if (obj) {
fn();
} else {
throwPathNotExists();
}
}
while (currentPathSegment !is null) {
if (currentNode is null) {
throw new ConfigReadException(
"Path does not exist: " ~ createExceptionPath());
throwPathNotExists();
}
auto valueNode = cast(ValueNode) currentNode;
if (valueNode) {
throw new ConfigReadException(
"Path does not exist: " ~ createExceptionPath());
throwPathNotExists();
}
auto arrayPath = cast(ArrayPathSegment) currentPathSegment;
if (arrayPath) {
auto arrayNode = cast(ArrayNode) currentNode;
if (arrayNode) {
ifNotNull(arrayNode, {
if (arrayNode.children.length < arrayPath.index) {
throw new ConfigReadException(
"Array index out of bounds: " ~ createExceptionPath());
}
currentNode = arrayNode.children[arrayPath.index];
}
});
}
auto propertyPath = cast(PropertyPathSegment) currentPathSegment;
if (propertyPath) {
auto objectNode = cast(ObjectNode) currentNode;
if (objectNode) {
ifNotNull(objectNode, {
auto propertyNode = propertyPath.propertyName in objectNode.children;
if (propertyNode) {
ifNotNullPointer(propertyNode, {
currentNode = *propertyNode;
} else {
throw new ConfigReadException(
"Path does not exist: " ~ createExceptionPath());
}
}
});
});
}
currentPathSegment = path.getNextSegment();
@ -357,4 +373,12 @@ version (unittest) {
assertThrown!ConfigReadException(dictionary.get("hostname"));
}
@("Exception is thrown when given path does not exist because config is an array")
unittest {
auto dictionary = new ConfigDictionary();
dictionary.rootNode = new ArrayNode();
assertThrown!ConfigReadException(dictionary.get("hostname"));
}
}