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

Clarify purpose of data validation variables.

Browse Source 
This value doesn't actually contain default values, but instead helps
verify that the correct fields are present and have the correct types.
It also doesn't need to show up in code completion.
This commit is contained in:
Joseph Cloutier
2022-04-27 11:51:39 -04:00
parent 3bbbb189c2
commit 50488aee53
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lime/tools/ApplicationData.hx
View File

@@ -11,7 +11,8 @@ abstract ApplicationData({
@:optional var url:String; @:optional var url:String;
}) from Dynamic }) from Dynamic
{ {
public static var defaults = { @:noCompletion
public static var expectedFields:ApplicationData = {
file: "", file: "",
init: "", init: "",
main: "", main: "",

3
src/lime/tools/MetaData.hx
View File

@@ -12,7 +12,8 @@ abstract MetaData({
@:optional var version:String; @:optional var version:String;
}) from Dynamic }) from Dynamic
{ {
public static var defaults = { @:noCompletion
public static var expectedFields:MetaData = {
buildNumber: "", buildNumber: "",
company: "", company: "",
companyId: "", companyId: "",

10
src/lime/tools/ProjectXMLParser.hx
View File

@@ -439,11 +439,11 @@ class ProjectXMLParser extends HXProject
name = "packageName"; name = "packageName";
} }
if (Reflect.hasField(ApplicationData.defaults, name)) if (Reflect.hasField(ApplicationData.expectedFields, name))
{ {
Reflect.setField(app, name, value); Reflect.setField(app, name, value);
} }
else if (Reflect.hasField(MetaData.defaults, name)) else if (Reflect.hasField(MetaData.expectedFields, name))
{ {
Reflect.setField(meta, name, value); Reflect.setField(meta, name, value);
} }
@@ -856,7 +856,7 @@ class ProjectXMLParser extends HXProject
name = "packageName"; name = "packageName";
} }
if (Reflect.hasField(MetaData.defaults, name)) if (Reflect.hasField(MetaData.expectedFields, name))
{ {
Reflect.setField(meta, name, value); Reflect.setField(meta, name, value);
} }
@@ -2006,11 +2006,11 @@ class ProjectXMLParser extends HXProject
Reflect.setField(windows[id], "colorDepth", Std.parseInt(value)); Reflect.setField(windows[id], "colorDepth", Std.parseInt(value));
default: default:
if (Reflect.hasField(WindowData.defaults, name)) if (Reflect.hasField(WindowData.expectedFields, name))
{ {
Reflect.setField(windows[id], name, value == "true"); Reflect.setField(windows[id], name, value == "true");
} }
else if (Reflect.hasField(WindowData.defaults, formatAttributeName(name))) else if (Reflect.hasField(WindowData.expectedFields, formatAttributeName(name)))
{ {
Reflect.setField(windows[id], formatAttributeName(name), value == "true"); Reflect.setField(windows[id], formatAttributeName(name), value == "true");
} }

3
src/lime/tools/WindowData.hx
View File

@@ -33,7 +33,8 @@ abstract WindowData({
@:optional var hidden:Bool; @:optional var hidden:Bool;
}) from Dynamic }) from Dynamic
{ {
public static var defaults = { @:noCompletion
public static var expectedFields:WindowData = {
width: 0, width: 0,
height: 0, height: 0,
x: 0.0, x: 0.0,

12
tools/CommandLineTools.hx
View File

@@ -1860,9 +1860,9 @@ class CommandLineTools
var fieldValue = Reflect.field(project, field); var fieldValue = Reflect.field(project, field);
var typeValue:Dynamic = switch (field) var typeValue:Dynamic = switch (field)
{ {
case "app": ApplicationData.defaults; case "app": ApplicationData.expectedFields;
case "meta": MetaData.defaults; case "meta": MetaData.expectedFields;
case "window": WindowData.defaults; case "window": WindowData.expectedFields;
default: fieldValue; default: fieldValue;
}; };
@@ -2130,9 +2130,9 @@ class CommandLineTools
var fieldReference = Reflect.field(overrides, fieldName); var fieldReference = Reflect.field(overrides, fieldName);
var typeValue:Dynamic = switch (fieldName) var typeValue:Dynamic = switch (fieldName)
{ {
case "app": ApplicationData.defaults; case "app": ApplicationData.expectedFields;
case "meta": MetaData.defaults; case "meta": MetaData.expectedFields;
case "window": WindowData.defaults; case "window": WindowData.expectedFields;
default: fieldReference; default: fieldReference;
}; };