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

Clean up Haxe XML Fast/Access imports

Browse Source
This commit is contained in:
Joshua Granick
2019-01-22 15:01:09 -08:00
parent 820686f110
commit ba6cc18fee
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,9 +5,9 @@ import hxp.*;
#if (haxe_ver >= 4)
import haxe.xml.Access in Fast;
import haxe.xml.Access;
#else
import haxe.xml.Fast;
import haxe.xml.Fast as Access;
#end
@@ -367,7 +367,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
}
public function parse (elem:Fast, substitute:String->String = null):Void {
public function parse (elem:Access, substitute:String->String = null):Void {
var bucket = this;
var bucketType = "";
@@ -399,7 +399,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
}
private function parseAttributes (elem:Fast, bucket:Dynamic, substitute:String->String = null):Void {
private function parseAttributes (elem:Access, bucket:Dynamic, substitute:String->String = null):Void {
for (attrName in elem.x.attributes ()) {
@@ -416,7 +416,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
}
private function parseChildren (elem:Fast, bucket:Dynamic, depth:Int = 0, substitute:String->String = null):Void {
private function parseChildren (elem:Access, bucket:Dynamic, depth:Int = 0, substitute:String->String = null):Void {
for (child in elem.elements) {
@@ -489,7 +489,7 @@ abstract ConfigData(Dynamic) to Dynamic from Dynamic {
}
private function parseValue (elem:Fast, bucket:Dynamic, substitute:String->String = null):Void {
private function parseValue (elem:Access, bucket:Dynamic, substitute:String->String = null):Void {
if (elem.innerHTML != "") {

7
src/lime/tools/HXProject.hx
View File

@@ -2,7 +2,6 @@ package lime.tools;
import haxe.io.Eof;
import haxe.xml.Fast;
import haxe.Json;
import haxe.Serializer;
import haxe.Unserializer;
@@ -15,9 +14,9 @@ import sys.io.File;
import sys.io.Process;
#if (haxe_ver >= 4)
import haxe.xml.Access in Fast;
import haxe.xml.Access;
#else
import haxe.xml.Fast;
import haxe.xml.Fast as Access;
#end
#if (lime && lime_cffi && !macro)
@@ -840,7 +839,7 @@ class HXProject extends Script {
public function includeXML (xml:String):Void {
var projectXML = new ProjectXMLParser ();
@:privateAccess projectXML.parseXML (new Fast (Xml.parse (xml).firstElement ()), "");
@:privateAccess projectXML.parseXML (new Access (Xml.parse (xml).firstElement ()), "");
merge (projectXML);
}

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

@@ -15,9 +15,9 @@ import sys.io.File;
import sys.FileSystem;
#if (haxe_ver >= 4)
import haxe.xml.Access in Fast;
import haxe.xml.Access;
#else
import haxe.xml.Fast;
import haxe.xml.Fast as Access;
#end
@@ -219,7 +219,7 @@ class ProjectXMLParser extends HXProject {
}
private function isValidElement (element:Fast, section:String):Bool {
private function isValidElement (element:Access, section:String):Bool {
if (element.x.get ("if") != null) {
@@ -447,7 +447,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseAppElement (element:Fast, extensionPath:String):Void {
private function parseAppElement (element:Access, extensionPath:String):Void {
for (attribute in element.x.attributes ()) {
@@ -505,7 +505,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseAssetsElement (element:Fast, basePath:String = "", isTemplate:Bool = false):Void {
private function parseAssetsElement (element:Access, basePath:String = "", isTemplate:Bool = false):Void {
var path = "";
var embed:Null<Bool> = null;
@@ -905,7 +905,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseCommandElement (element:Fast, commandList:Array<CLICommand>):Void {
private function parseCommandElement (element:Access, commandList:Array<CLICommand>):Void {
var command:CLICommand = null;
@@ -952,7 +952,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseMetaElement (element:Fast):Void {
private function parseMetaElement (element:Access):Void {
for (attribute in element.x.attributes ()) {
@@ -985,7 +985,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseModuleElement (element:Fast, basePath:String = "", moduleData:ModuleData = null):Void {
private function parseModuleElement (element:Access, basePath:String = "", moduleData:ModuleData = null):Void {
var topLevel = (moduleData == null);
@@ -1105,7 +1105,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseOutputElement (element:Fast, extensionPath:String):Void {
private function parseOutputElement (element:Access, extensionPath:String):Void {
if (element.has.name) {
@@ -1128,7 +1128,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseXML (xml:Fast, section:String, extensionPath:String = ""):Void {
private function parseXML (xml:Access, section:String, extensionPath:String = ""):Void {
for (element in xml.elements) {
@@ -2162,7 +2162,7 @@ class ProjectXMLParser extends HXProject {
}
private function parseWindowElement (element:Fast):Void {
private function parseWindowElement (element:Access):Void {
var id = 0;
@@ -2277,7 +2277,7 @@ class ProjectXMLParser extends HXProject {
try {
xml = new Fast (Xml.parse (File.getContent (projectFile)).firstElement ());
xml = new Access (Xml.parse (File.getContent (projectFile)).firstElement ());
extensionPath = Path.directory (projectFile);
} catch (e:Dynamic) {