Procházet zdrojové kódy

handle haxe.xml.Access warnings

ncannasse před 7 roky
rodič
revize
3a8665f500
4 změnil soubory, kde provedl 32 přidání a 11 odebrání
  1. 8 2
      hxd/fmt/fbx/BaseLibrary.hx
  2. 7 2
      hxd/res/BitmapFont.hx
  3. 11 6
      hxd/res/DynamicText.hx
  4. 6 1
      hxd/res/TiledMap.hx

+ 8 - 2
hxd/fmt/fbx/BaseLibrary.hx

@@ -3,6 +3,12 @@ import haxe.io.Bytes;
 using hxd.fmt.fbx.Data;
 using hxd.fmt.fbx.Data;
 import h3d.col.Point;
 import h3d.col.Point;
 
 
+#if (haxe_ver < 4)
+import haxe.xml.Fast in Access;
+#else
+import haxe.xml.Access;
+#end
+
 class TmpObject {
 class TmpObject {
 	public var index : Int;
 	public var index : Int;
 	public var model : FbxNode;
 	public var model : FbxNode;
@@ -180,12 +186,12 @@ class BaseLibrary {
 						switch( pname ) {
 						switch( pname ) {
 						case "UV" if( pval != "" ):
 						case "UV" if( pval != "" ):
 							var xml = try Xml.parse(pval) catch( e : Dynamic ) throw "Invalid UV data in " + m.getName();
 							var xml = try Xml.parse(pval) catch( e : Dynamic ) throw "Invalid UV data in " + m.getName();
-							var frames = [for( f in new haxe.xml.Fast(xml.firstElement()).elements ) { var f = f.innerData.split(" ");  { t : Std.parseFloat(f[0]) * 9622116.25, u : Std.parseFloat(f[1]), v : Std.parseFloat(f[2]) }} ];
+							var frames = [for( f in new Access(xml.firstElement()).elements ) { var f = f.innerData.split(" ");  { t : Std.parseFloat(f[0]) * 9622116.25, u : Std.parseFloat(f[1]), v : Std.parseFloat(f[2]) }} ];
 							if( uvAnims == null ) uvAnims = new Map();
 							if( uvAnims == null ) uvAnims = new Map();
 							uvAnims.set(m.getName(), frames);
 							uvAnims.set(m.getName(), frames);
 						case "Events":
 						case "Events":
 							var xml = try Xml.parse(pval) catch( e : Dynamic ) throw "Invalid Events data in " + m.getName();
 							var xml = try Xml.parse(pval) catch( e : Dynamic ) throw "Invalid Events data in " + m.getName();
-							animationEvents = [for( f in new haxe.xml.Fast(xml.firstElement()).elements ) { var f = f.innerData.split(" ");  { frame : Std.parseInt(f.shift()), data : StringTools.trim(f.join(" ")) }} ];
+							animationEvents = [for( f in new Access(xml.firstElement()).elements ) { var f = f.innerData.split(" ");  { frame : Std.parseInt(f.shift()), data : StringTools.trim(f.join(" ")) }} ];
 						default:
 						default:
 						}
 						}
 					}
 					}

+ 7 - 2
hxd/res/BitmapFont.hx

@@ -1,4 +1,9 @@
 package hxd.res;
 package hxd.res;
+#if (haxe_ver < 4)
+import haxe.xml.Fast in Access;
+#else
+import haxe.xml.Access;
+#end
 
 
 class BitmapFont extends Resource {
 class BitmapFont extends Resource {
 
 
@@ -22,7 +27,7 @@ class BitmapFont extends Resource {
 			var xml = Xml.parse(entry.getBytes().toString());
 			var xml = Xml.parse(entry.getBytes().toString());
 			// support only the FontBuilder/Divo format
 			// support only the FontBuilder/Divo format
 			// export with FontBuilder https://github.com/andryblack/fontbuilder/downloads
 			// export with FontBuilder https://github.com/andryblack/fontbuilder/downloads
-			var xml = new haxe.xml.Fast(xml.firstElement());
+			var xml = new Access(xml.firstElement());
 			size = Std.parseInt(xml.att.size);
 			size = Std.parseInt(xml.att.size);
 			lineHeight = Std.parseInt(xml.att.height);
 			lineHeight = Std.parseInt(xml.att.height);
 			name = xml.att.family;
 			name = xml.att.family;
@@ -44,7 +49,7 @@ class BitmapFont extends Resource {
 			// support for Littera XML format (starts with <font>)
 			// support for Littera XML format (starts with <font>)
 			// http://kvazars.com/littera/
 			// http://kvazars.com/littera/
 			var xml = Xml.parse(entry.getBytes().toString());
 			var xml = Xml.parse(entry.getBytes().toString());
-			var xml = new haxe.xml.Fast(xml.firstElement());
+			var xml = new Access(xml.firstElement());
 			size = Std.parseInt(xml.node.info.att.size);
 			size = Std.parseInt(xml.node.info.att.size);
 			lineHeight = Std.parseInt(xml.node.common.att.lineHeight);
 			lineHeight = Std.parseInt(xml.node.common.att.lineHeight);
 			name = xml.node.info.att.face;
 			name = xml.node.info.att.face;

+ 11 - 6
hxd/res/DynamicText.hx

@@ -3,6 +3,11 @@ package hxd.res;
 import haxe.macro.Context;
 import haxe.macro.Context;
 import haxe.macro.Expr;
 import haxe.macro.Expr;
 #end
 #end
+#if (haxe_ver < 4)
+import haxe.xml.Fast in Access;
+#else
+import haxe.xml.Access;
+#end
 
 
 abstract NoArg({}) {
 abstract NoArg({}) {
 }
 }
@@ -19,7 +24,7 @@ abstract Key<T>(String) {
 class DynamicText {
 class DynamicText {
 
 
 	public static function parse( data : String ) : Dynamic {
 	public static function parse( data : String ) : Dynamic {
-		var x = new haxe.xml.Fast(Xml.parse(data).firstElement());
+		var x = new Access(Xml.parse(data).firstElement());
 		var obj = {};
 		var obj = {};
 		for( e in x.elements )
 		for( e in x.elements )
 			Reflect.setField(obj, e.att.id, parseXmlData(e));
 			Reflect.setField(obj, e.att.id, parseXmlData(e));
@@ -27,7 +32,7 @@ class DynamicText {
 	}
 	}
 
 
 	public static function apply( obj : Dynamic, data : String, ?onMissing ) {
 	public static function apply( obj : Dynamic, data : String, ?onMissing ) {
-		var x = new haxe.xml.Fast(Xml.parse(data).firstElement());
+		var x = new Access(Xml.parse(data).firstElement());
 		applyRec([], obj, x, onMissing);
 		applyRec([], obj, x, onMissing);
 	}
 	}
 
 
@@ -65,7 +70,7 @@ class DynamicText {
 		return parseText(str);
 		return parseText(str);
 	}
 	}
 
 
-	public static function applyRec( path : Array<String>, obj : Dynamic, data : haxe.xml.Fast, onMissing ) {
+	public static function applyRec( path : Array<String>, obj : Dynamic, data : Access, onMissing ) {
 		var fields = new Map();
 		var fields = new Map();
 		for( f in Reflect.fields(obj) ) fields.set(f, true);
 		for( f in Reflect.fields(obj) ) fields.set(f, true);
 		if( data != null )
 		if( data != null )
@@ -118,7 +123,7 @@ class DynamicText {
 		}
 		}
 	}
 	}
 
 
-	static function parseXmlData( x : haxe.xml.Fast ) : Dynamic {
+	static function parseXmlData( x : Access ) : Dynamic {
 		switch( x.name ) {
 		switch( x.name ) {
 		case "g":
 		case "g":
 			var first = x.elements.hasNext() ? x.elements.next() : null;
 			var first = x.elements.hasNext() ? x.elements.next() : null;
@@ -178,7 +183,7 @@ class DynamicText {
 		return Context.makePosition({ min : index, max : index + str.length, file : pos.file });
 		return Context.makePosition({ min : index, max : index + str.length, file : pos.file });
 	}
 	}
 
 
-	static function typeFromXml( x : haxe.xml.Fast, pos : { file : String, content : String, pos : Position } ) {
+	static function typeFromXml( x : Access, pos : { file : String, content : String, pos : Position } ) {
 		switch( x.name ) {
 		switch( x.name ) {
 		case "g":
 		case "g":
 			var first = x.elements.next();
 			var first = x.elements.next();
@@ -257,7 +262,7 @@ class DynamicText {
 		var fields = Context.getBuildFields();
 		var fields = Context.getBuildFields();
 		var pos = Context.currentPos();
 		var pos = Context.currentPos();
 		var fpos = { file : fullPath, content : content.toLowerCase(), pos : pos };
 		var fpos = { file : fullPath, content : content.toLowerCase(), pos : pos };
-		for( x in new haxe.xml.Fast(x.firstElement()).elements ) {
+		for( x in new Access(x.firstElement()).elements ) {
 			var id = x.att.id;
 			var id = x.att.id;
 			var t = typeFromXml(x, fpos);
 			var t = typeFromXml(x, fpos);
 			fields.push( {
 			fields.push( {

+ 6 - 1
hxd/res/TiledMap.hx

@@ -1,4 +1,9 @@
 package hxd.res;
 package hxd.res;
+#if (haxe_ver < 4)
+import haxe.xml.Fast in Access;
+#else
+import haxe.xml.Access;
+#end
 
 
 typedef TiledMapLayer = {
 typedef TiledMapLayer = {
 	var data : Array<Int>;
 	var data : Array<Int>;
@@ -18,7 +23,7 @@ class TiledMap extends Resource {
 	public function toMap() : TiledMapData {
 	public function toMap() : TiledMapData {
 		var data = entry.getBytes().toString();
 		var data = entry.getBytes().toString();
 		var base = new haxe.crypto.BaseCode(haxe.io.Bytes.ofString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"));
 		var base = new haxe.crypto.BaseCode(haxe.io.Bytes.ofString("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"));
-		var x = new haxe.xml.Fast(Xml.parse(data).firstElement());
+		var x = new Access(Xml.parse(data).firstElement());
 		var layers = [];
 		var layers = [];
 		for( l in x.nodes.layer ) {
 		for( l in x.nodes.layer ) {
 			var data = StringTools.trim(l.node.data.innerData);
 			var data = StringTools.trim(l.node.data.innerData);