Browse Source

more haxe 3 property transition

Simon Krajewski 13 years ago
parent
commit
41833c5bbd
9 changed files with 78 additions and 78 deletions
  1. 6 6
      std/Xml.hx
  2. 6 6
      std/cpp/_std/Xml.hx
  3. 12 12
      std/cs/_std/Xml.hx
  4. 6 6
      std/flash/_std/Xml.hx
  5. 6 6
      std/flash8/_std/Xml.hx
  6. 12 12
      std/java/_std/Xml.hx
  7. 12 12
      std/js/_std/Xml.hx
  8. 6 6
      std/neko/_std/Xml.hx
  9. 12 12
      std/php/_std/Xml.hx

+ 6 - 6
std/Xml.hx

@@ -127,16 +127,16 @@ extern class Xml {
 	/**
 		Returns the node name of an Element.
 	**/
-	var nodeName(getNodeName,setNodeName) : String;
-	private function getNodeName() : String;
-	private function setNodeName( name : String ) : String;
+	var nodeName(get_nodeName,set_nodeName) : String;
+	private function get_nodeName() : String;
+	private function set_nodeName( name : String ) : String;
 
 	/**
 		Returns the node value. Only works if the Xml node is not an Element or a Document.
 	**/
-	var nodeValue(getNodeValue,setNodeValue) : String;
-	private function getNodeValue() : String;
-	private function setNodeValue( name : String ) : String;
+	var nodeValue(get_nodeValue,set_nodeValue) : String;
+	private function get_nodeValue() : String;
+	private function set_nodeValue( name : String ) : String;
 
 	/**
 		Get the given attribute of an Element node. Returns [null] if not found.

+ 6 - 6
std/cpp/_std/Xml.hx

@@ -164,30 +164,30 @@ enum XmlType {
 
 	public var nodeType(default,null) : XmlType;
 
-	public var nodeName(getNodeName,setNodeName) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
 
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue = v;

+ 12 - 12
std/cs/_std/Xml.hx

@@ -48,8 +48,8 @@ private enum RealXmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 
 	var _nodeName : String;
@@ -70,42 +70,42 @@ private enum RealXmlType {
 		r.nodeType = Xml.Element;
 		r._children = new Array();
 		r._attributes = new Hash();
-		r.setNodeName( name );
+		r.set_nodeName( name );
 		return r;
 	}
 
 	public static function createPCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.PCData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.CData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createComment( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Comment;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createDocType( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.DocType;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createProlog( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Prolog;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
@@ -116,25 +116,25 @@ private enum RealXmlType {
 		return r;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue = v;

+ 6 - 6
std/flash/_std/Xml.hx

@@ -40,8 +40,8 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 
 	var _node : flash.xml.XML;
@@ -121,14 +121,14 @@ enum XmlType {
 		return null;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		var ns = _node.namespace();
 		return (ns.prefix == "") ? _node.localName() : ns.prefix+":"+_node.localName();
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		var ns = n.split(":");
@@ -141,7 +141,7 @@ enum XmlType {
 		return n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		var nodeType = nodeType;
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
@@ -150,7 +150,7 @@ enum XmlType {
 		return _node.toString();
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		var nodeType = nodeType;
 		var x = null;
 		if( nodeType == Xml.Element || nodeType == Xml.Document )

+ 6 - 6
std/flash8/_std/Xml.hx

@@ -37,8 +37,8 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 	public var nodeType(default,null) : XmlType;
 
@@ -137,25 +137,25 @@ enum XmlType {
 		return convert(e);
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return __x[untyped "nodeName"] = n;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return __x[untyped "nodeValue"] = v;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return __x[untyped "nodeName"];
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return __x[untyped "nodeValue"];

+ 12 - 12
std/java/_std/Xml.hx

@@ -48,8 +48,8 @@ private enum RealXmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 
 	var _nodeName : String;
@@ -70,42 +70,42 @@ private enum RealXmlType {
 		r.nodeType = Xml.Element;
 		r._children = new Array();
 		r._attributes = new Hash();
-		r.setNodeName( name );
+		r.set_nodeName( name );
 		return r;
 	}
 
 	public static function createPCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.PCData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.CData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createComment( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Comment;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createDocType( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.DocType;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createProlog( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Prolog;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
@@ -116,25 +116,25 @@ private enum RealXmlType {
 		return r;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue = v;

+ 12 - 12
std/js/_std/Xml.hx

@@ -37,8 +37,8 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 
 	var _nodeName : String;
@@ -59,42 +59,42 @@ enum XmlType {
 		r.nodeType = Xml.Element;
 		r._children = new Array();
 		r._attributes = new Hash();
-		r.setNodeName( name );
+		r.set_nodeName( name );
 		return r;
 	}
 
 	public static function createPCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.PCData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.CData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createComment( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Comment;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createDocType( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.DocType;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createProlog( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Prolog;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
@@ -105,25 +105,25 @@ enum XmlType {
 		return r;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue = v;

+ 6 - 6
std/neko/_std/Xml.hx

@@ -37,8 +37,8 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 	public var nodeType(default,null) : XmlType;
 
@@ -174,25 +174,25 @@ enum XmlType {
 		return r;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue = v;

+ 12 - 12
std/php/_std/Xml.hx

@@ -38,8 +38,8 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(getNodeName,setNodeName) : String;
-	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeValue(get_nodeValue,set_nodeValue) : String;
 	public var parent(getParent,null) : Xml;
 
 	var _nodeName : String;
@@ -140,42 +140,42 @@ enum XmlType {
 		r.nodeType = Xml.Element;
 		r._children = new Array();
 		r._attributes = new Hash();
-		r.setNodeName( name );
+		r.set_nodeName( name );
 		return r;
 	}
 
 	public static function createPCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.PCData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createCData( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.CData;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createComment( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Comment;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createDocType( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.DocType;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
 	public static function createProlog( data : String ) : Xml {
 		var r = new Xml();
 		r.nodeType = Xml.Prolog;
-		r.setNodeValue( data );
+		r.set_nodeValue( data );
 		return r;
 	}
 
@@ -186,25 +186,25 @@ enum XmlType {
 		return r;
 	}
 
-	private function getNodeName() : String {
+	private function get_nodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName;
 	}
 
-	private function setNodeName( n : String ) : String {
+	private function set_nodeName( n : String ) : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
 		return _nodeName = n;
 	}
 
-	private function getNodeValue() : String {
+	private function get_nodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue;
 	}
 
-	private function setNodeValue( v : String ) : String {
+	private function set_nodeValue( v : String ) : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";
 		return _nodeValue = v;