kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate code in ConfigData.

Browse Source
This commit is contained in:
Joseph Cloutier
2023-12-21 01:14:57 -05:00
parent ca3012b877
commit 15e6dc5050
1 changed files with 14 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/lime/tools/ConfigData.hx
View File

@@ -34,39 +34,12 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic
public function exists(id:String):Bool public function exists(id:String):Bool
{ {
var tree = id.split("."); return get(id) != null;
if (tree.length <= 1)
{
return Reflect.hasField(this, id);
}
var current = this;
for (leaf in tree)
{
if (Reflect.hasField(current, leaf))
{
current = Reflect.field(current, leaf);
}
else
{
return false;
}
}
return true;
} }
public function get(id:String):ConfigData public function get(id:String):ConfigData
{ {
var tree = id.split("."); var tree = id.split(".");
if (tree.length <= 1)
{
return Reflect.field(this, id);
}
var current = this; var current = this;
for (leaf in tree) for (leaf in tree)
@@ -87,38 +60,26 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic
var tree = id.split("."); var tree = id.split(".");
var array:Array<Dynamic> = null; var array:Array<Dynamic> = null;
if (tree.length <= 1) var current = this;
{ var field = tree.pop();
array = Reflect.field(this, id + ARRAY);
if (array == null && Reflect.hasField(this, id)) for (leaf in tree)
{
current = Reflect.field(current, leaf);
if (current == null)
{ {
array = [Reflect.field(this, id)]; break;
} }
} }
else
if (current != null)
{ {
var current = this; array = Reflect.field(current, field + ARRAY);
var field = tree.pop();
for (leaf in tree) if (array == null && Reflect.hasField(current, field))
{ {
current = Reflect.field(current, leaf); array = [Reflect.field(current, field)];
if (current == null)
{
break;
}
}
if (current != null)
{
array = Reflect.field(current, field + ARRAY);
if (array == null && Reflect.hasField(current, field))
{
array = [Reflect.field(current, field)];
}
} }
} }
@@ -415,24 +376,6 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic
public function push(id:String, value:Dynamic):Void public function push(id:String, value:Dynamic):Void
{ {
var tree = id.split("."); var tree = id.split(".");
if (tree.length <= 1)
{
if (Reflect.hasField(this, id))
{
if (!Reflect.hasField(this, id + ARRAY))
{
Reflect.setField(this, id + ARRAY, Reflect.hasField(this, id) ? [ObjectTools.deepCopy(Reflect.field(this, id))] : []);
}
var array:Array<Dynamic> = Reflect.field(this, id + ARRAY);
array.push(value);
}
Reflect.setField(this, id, value);
return;
}
var current = this; var current = this;
var field = tree.pop(); var field = tree.pop();
@@ -471,13 +414,6 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic
public function set(id:String, value:Dynamic):Void public function set(id:String, value:Dynamic):Void
{ {
var tree = id.split("."); var tree = id.split(".");
if (tree.length <= 1)
{
Reflect.setField(this, id, value);
return;
}
var current = this; var current = this;
var field = tree.pop(); var field = tree.pop();