Ver Fonte

force either get/set (or get_x/set_x) property names when -D haxe3

Nicolas Cannasse há 12 anos atrás
pai
commit
d4f48b3e34

+ 55 - 0
doc/all.hxproj

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project version="2">
+  <!-- Output SWF options -->
+  <output>
+    <movie outputType="CustomBuild" />
+    <movie input="" />
+    <movie path="" />
+    <movie fps="30" />
+    <movie width="800" />
+    <movie height="600" />
+    <movie version="9" />
+    <movie minorVersion="0" />
+    <movie platform="Flash Player" />
+    <movie background="#FFFFFF" />
+  </output>
+  <!-- Other classes to be compiled into your SWF -->
+  <classpaths>
+    <!-- example: <class path="..." /> -->
+  </classpaths>
+  <!-- Build options -->
+  <build>
+    <option directives="" />
+    <option flashStrict="False" />
+    <option mainClass="" />
+    <option enabledebug="False" />
+    <option additional="" />
+  </build>
+  <!-- haxelib libraries -->
+  <haxelib>
+    <!-- example: <library name="..." /> -->
+  </haxelib>
+  <!-- Class files to compile (other referenced classes will automatically be included) -->
+  <compileTargets>
+    <!-- example: <compile path="..." /> -->
+  </compileTargets>
+  <!-- Assets to embed into the output SWF -->
+  <library>
+    <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
+  </library>
+  <!-- Paths to exclude from the Project Explorer tree -->
+  <hiddenPaths>
+    <!-- example: <hidden path="..." /> -->
+  </hiddenPaths>
+  <!-- Executed before build -->
+  <preBuildCommand>haxe all.hxml</preBuildCommand>
+  <!-- Executed after build -->
+  <postBuildCommand alwaysRun="False" />
+  <!-- Other project options -->
+  <options>
+    <option showHiddenPaths="False" />
+    <option testMovie="Default" />
+  </options>
+  <!-- Plugin storage -->
+  <storage />
+</project>

+ 3 - 8
std/Xml.hx

@@ -123,16 +123,12 @@ extern class Xml {
 	/**
 		Returns the node name of an Element.
 	**/
-	var nodeName(get_nodeName,set_nodeName) : String;
-	private function get_nodeName() : String;
-	private function set_nodeName( name : String ) : String;
+	var nodeName(get,set) : String;
 
 	/**
 		Returns the node value. Only works if the Xml node is not an Element or a Document.
 	**/
-	var nodeValue(get_nodeValue,set_nodeValue) : String;
-	private function get_nodeValue() : String;
-	private function set_nodeValue( name : String ) : String;
+	var nodeValue(get,set) : String;
 
 	/**
 		Get the given attribute of an Element node. Returns [null] if not found.
@@ -167,8 +163,7 @@ extern class Xml {
 		Returns the parent object in the Xml hierarchy.
 		The parent can be [null], an Element or a Document.
 	**/
-	var parent(getParent,null) : Xml;
-	private function getParent() : Xml;
+	var parent(get,null) : Xml;
 
 	/**
 		Returns an iterator of all child nodes.

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

@@ -160,9 +160,9 @@ enum XmlType {
 
 	public var nodeType(default,null) : XmlType;
 
-	public var nodeName(get_nodeName,set_nodeName) : String;
+	public var nodeName(get,set) : String;
 
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
+	public var nodeValue(get,set) : String;
 
 
 	private function get_nodeName() : String {
@@ -189,8 +189,8 @@ enum XmlType {
 		return _nodeValue = v;
 	}
 
-	public var parent(getParent,null) : Xml;
-	private function getParent() : Xml {
+	public var parent(get,null) : Xml;
+	private function get_parent() : Xml {
 		return _parent;
 	}
 

+ 3 - 3
std/cpp/vm/Tls.hx

@@ -25,17 +25,17 @@ class Tls<T> {
 
 	static var sFreeSlot = 0;
 	var mTLSID : Int;
-	public var value(getValue,setValue) : T;
+	public var value(get,set) : T;
 
 	public function new() {
 		mTLSID = sFreeSlot++;
 	}
 
-	function getValue() : T {
+	function get_value() : T {
 		return untyped __global__.__hxcpp_tls_get(mTLSID);
 	}
 
-	function setValue( v : T ) {
+	function set_value( v : T ) {
 		untyped __global__.__hxcpp_tls_set(mTLSID,v);
 		return v;
 	}

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

@@ -44,9 +44,9 @@ private enum RealXmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 
 	var _nodeName : String;
 	var _nodeValue : String;
@@ -136,7 +136,7 @@ private enum RealXmlType {
 		return _nodeValue = v;
 	}
 
-	private function getParent() : Xml {
+	private function get_parent() : Xml {
 		return _parent;
 	}
 

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

@@ -36,9 +36,9 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 
 	var _node : flash.xml.XML;
 
@@ -172,7 +172,7 @@ enum XmlType {
 		return v;
 	}
 
-	private function getParent() :Xml {
+	private function get_parent() :Xml {
 		var p = _node.parent();
 		return p == null ? null : wrap( p );
 	}

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

@@ -33,9 +33,9 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 	public var nodeType(default,null) : XmlType;
 
 	private var __x : Dynamic;
@@ -157,7 +157,7 @@ enum XmlType {
 		return __x[untyped "nodeValue"];
 	}
 
-	private function getParent() : Xml {
+	private function get_parent() : Xml {
 		return convert(__x[untyped "parentNode"]);
 	}
 

+ 1 - 1
std/haxe/io/BytesInput.hx

@@ -117,7 +117,7 @@ class BytesInput extends Input {
 	}
 
 	#if flash9
-	override function setEndian(e) {
+	override function set_bigEndian(e) {
 		bigEndian = e;
 		b.endian = e ? flash.utils.Endian.BIG_ENDIAN : flash.utils.Endian.LITTLE_ENDIAN;
 		return e;

+ 1 - 1
std/haxe/io/BytesOutput.hx

@@ -59,7 +59,7 @@ class BytesOutput extends Output {
 	#if flash9
 	// optimized operations
 
-	override function setEndian(e) {
+	override function set_bigEndian(e) {
 		bigEndian = e;
 		b.endian = e ? flash.utils.Endian.BIG_ENDIAN : flash.utils.Endian.LITTLE_ENDIAN;
 		return e;

+ 2 - 2
std/haxe/io/Input.hx

@@ -27,7 +27,7 @@ package haxe.io;
 **/
 class Input {
 
-	public var bigEndian(default,setEndian) : Bool;
+	public var bigEndian(default,set) : Bool;
 	#if cs
 	private var helper:BytesData;
 	#elseif java
@@ -67,7 +67,7 @@ class Input {
 	public function close() {
 	}
 
-	function setEndian(b) {
+	function set_bigEndian(b) {
 		bigEndian = b;
 		return b;
 	}

+ 2 - 2
std/haxe/io/Output.hx

@@ -29,7 +29,7 @@ package haxe.io;
 **/
 class Output {
 	private static var LN2 = Math.log(2);
-	public var bigEndian(default, setEndian) : Bool;
+	public var bigEndian(default, set) : Bool;
 
 	#if java
 	private var helper:java.nio.ByteBuffer;
@@ -68,7 +68,7 @@ class Output {
 	public function close() {
 	}
 
-	function setEndian( b ) {
+	function set_bigEndian( b ) {
 		bigEndian = b;
 		return b;
 	}

+ 3 - 3
std/haxe/remoting/DelayedConnection.hx

@@ -23,7 +23,7 @@ package haxe.remoting;
 
 class DelayedConnection implements AsyncConnection, implements Dynamic<AsyncConnection> {
 
-	public var connection(getConnection,setConnection) : AsyncConnection;
+	public var connection(get,set) : AsyncConnection;
 
 	var __path : Array<String>;
 	var __data : {
@@ -52,11 +52,11 @@ class DelayedConnection implements AsyncConnection, implements Dynamic<AsyncConn
 		return d;
 	}
 
-	function getConnection() {
+	function get_connection() {
 		return __data.cnx;
 	}
 
-	function setConnection(cnx) {
+	function set_connection(cnx) {
 		__data.cnx = cnx;
 		process(this);
 		return cnx;

+ 8 - 8
std/haxe/xml/Fast.hx

@@ -109,15 +109,15 @@ private class NodeListAccess implements Dynamic<List<Fast>> {
 class Fast {
 
 	public var x(default,null) : Xml;
-	public var name(getName,null) : String;
-	public var innerData(getInnerData,null) : String;
-	public var innerHTML(getInnerHTML,null) : String;
+	public var name(get,null) : String;
+	public var innerData(get,null) : String;
+	public var innerHTML(get,null) : String;
 	public var node(default,null) : NodeAccess;
 	public var nodes(default,null) : NodeListAccess;
 	public var att(default,null) : AttribAccess;
 	public var has(default,null) : HasAttribAccess;
 	public var hasNode(default,null) : HasNodeAccess;
-	public var elements(getElements,null) : Iterator<Fast>;
+	public var elements(get,null) : Iterator<Fast>;
 
 	public function new( x : Xml ) {
 		if( x.nodeType != Xml.Document && x.nodeType != Xml.Element )
@@ -130,11 +130,11 @@ class Fast {
 		hasNode = new HasNodeAccess(x);
 	}
 
-	function getName() {
+	function get_name() {
 		return if( x.nodeType == Xml.Document ) "Document" else x.nodeName;
 	}
 
-	function getInnerData() {
+	function get_innerData() {
 		var it = x.iterator();
 		if( !it.hasNext() )
 			throw name+" does not have data";
@@ -154,14 +154,14 @@ class Fast {
 		return v.nodeValue;
 	}
 
-	function getInnerHTML() {
+	function get_innerHTML() {
 		var s = new StringBuf();
 		for( x in x )
 			s.add(x.toString());
 		return s.toString();
 	}
 
-	function getElements() {
+	function get_elements() {
 		var it = x.elements();
 		return {
 			hasNext : it.hasNext,

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

@@ -44,9 +44,9 @@ private enum RealXmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 
 	var _nodeName : String;
 	var _nodeValue : String;
@@ -136,7 +136,7 @@ private enum RealXmlType {
 		return _nodeValue = v;
 	}
 
-	private function getParent() : Xml {
+	private function get_parent() : Xml {
 		return _parent;
 	}
 

+ 2 - 2
std/js/JQuery.hx

@@ -345,7 +345,7 @@ extern class JQuery implements ArrayAccess<Dom.HtmlDom> {
 	/**
 		Return the current JQuery element (in a callback), similar to $(this) in JS.
 	**/
-	static var cur(getCurrent, null) : JQuery;
+	static var cur(get, null) : JQuery;
 
 	static var fx(default, null) : { off : Bool, interval : Int };
 	static var browser(default, null) : { webkit : Bool, opera : Bool, msie : Bool, mozilla : Bool, version : String };
@@ -361,7 +361,7 @@ extern class JQuery implements ArrayAccess<Dom.HtmlDom> {
 	//static function getJSON, getScript, grep
 	//static function is*, makeArray, map, merge, noop, now, param, proxy, sub, trim, type, unique
 
-	private static inline function getCurrent() : JQuery {
+	private static inline function get_current() : JQuery {
 		return untyped __js__("$(this)");
 	}
 

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

@@ -33,9 +33,9 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 
 	var _nodeName : String;
 	var _nodeValue : String;
@@ -125,7 +125,7 @@ enum XmlType {
 		return _nodeValue = v;
 	}
 
-	private function getParent() : Xml {
+	private function get_parent() : Xml {
 		return _parent;
 	}
 

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

@@ -33,9 +33,9 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 	public var nodeType(default,null) : XmlType;
 
 	private var _nodeName : String;
@@ -194,7 +194,7 @@ enum XmlType {
 		return _nodeValue = v;
 	}
 
-	private function getParent() : Xml {
+	private function get_parent() : Xml {
 		return _parent;
 	}
 

+ 5 - 5
std/neko/_std/sys/db/Mysql.hx

@@ -46,20 +46,20 @@ private class D {
 
 private class MysqlResultSet implements sys.db.ResultSet {
 
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
-	private var __r : Void;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
+	private var __r : Dynamic;
 	private var cache : Dynamic;
 
 	public function new(r) {
 		__r = r;
 	}
 
-	private function getLength() {
+	private function get_length() {
 		return D.result_get_length(__r);
 	}
 
-	private function getNFields() {
+	private function get_nfields() {
 		return D.result_get_nfields(__r);
 	}
 

+ 5 - 5
std/neko/_std/sys/db/Sqlite.hx

@@ -23,7 +23,7 @@ package sys.db;
 
 private class SqliteConnection implements Connection {
 
-	var c : Void;
+	var c : Dynamic;
 
 	public function new( file : String ) {
 		c = _connect(untyped file.__s);
@@ -93,8 +93,8 @@ private class SqliteConnection implements Connection {
 
 private class SqliteResultSet implements ResultSet {
 
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
 	var r : Void;
 	var cache : List<Dynamic>;
 
@@ -104,7 +104,7 @@ private class SqliteResultSet implements ResultSet {
 		hasNext(); // execute the request
 	}
 
-	function getLength() {
+	function get_length() {
 		if( nfields != 0 ) {
 			while( true ) {
 				var c = doNext();
@@ -117,7 +117,7 @@ private class SqliteResultSet implements ResultSet {
 		return result_get_length(r);
 	}
 
-	function getNFields() {
+	function get_nfields() {
 		return result_get_nfields(r);
 	}
 

+ 2 - 2
std/neko/db/Manager.hx

@@ -40,7 +40,7 @@ import neko.db.Connection;
 class Manager<T : Object> {
 
 	/* ----------------------------- STATICS ------------------------------ */
-	public static var cnx(default,setConnection) : Connection;
+	public static var cnx(default,set) : Connection;
 	private static var object_cache : Hash<Object> = new Hash();
 	private static var init_list : List<Manager<Object>> = new List();
 	private static var cache_field = "__cache__";
@@ -55,7 +55,7 @@ class Manager<T : Object> {
 		h;
 	}
 
-	private static function setConnection( c : Connection ) {
+	private static function set_cnx( c : Connection ) {
 		Reflect.setField(Manager,"cnx",c);
 		if( c != null ) {
 			if( c.dbName() == "MySQL" ) {

+ 5 - 5
std/neko/db/Mysql.hx

@@ -49,20 +49,20 @@ private class D {
 
 private class MysqlResultSet implements ResultSet {
 
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
-	private var __r : Void;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
+	private var __r : Dynamic;
 	private var cache : Dynamic;
 
 	public function new(r) {
 		__r = r;
 	}
 
-	private function getLength() {
+	private function get_length() {
 		return D.result_get_length(__r);
 	}
 
-	private function getNFields() {
+	private function get_nfields() {
 		return D.result_get_nfields(__r);
 	}
 

+ 4 - 4
std/neko/db/Sqlite.hx

@@ -95,8 +95,8 @@ private class SqliteConnection implements Connection {
 
 private class SqliteResultSet implements ResultSet {
 
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
 	var r : Void;
 	var cache : List<Dynamic>;
 
@@ -106,7 +106,7 @@ private class SqliteResultSet implements ResultSet {
 		hasNext(); // execute the request
 	}
 
-	function getLength() {
+	function get_length() {
 		if( nfields != 0 ) {
 			while( true ) {
 				var c = doNext();
@@ -119,7 +119,7 @@ private class SqliteResultSet implements ResultSet {
 		return result_get_length(r);
 	}
 
-	function getNFields() {
+	function get_nfields() {
 		return result_get_nfields(r);
 	}
 

+ 3 - 3
std/neko/vm/Module.hx

@@ -37,7 +37,7 @@ class Module {
 		The abstract handle.
 	**/
 	public var m : ModuleHandle;
-	public var name(getName,setName) : String;
+	public var name(get,set) : String;
 
 	public function new( m ) {
 		this.m = m;
@@ -52,11 +52,11 @@ class Module {
 		return _module_exec(m);
 	}
 
-	function getName() {
+	function get_name() {
 		return new String(_module_name(m));
 	}
 
-	function setName( n : String ) {
+	function set_name( n : String ) {
 		_module_set_name(m,untyped n.__s);
 		return n;
 	}

+ 3 - 3
std/neko/vm/Tls.hx

@@ -24,17 +24,17 @@ package neko.vm;
 class Tls<T> {
 
 	var t : Dynamic;
-	public var value(getValue,setValue) : T;
+	public var value(get,set) : T;
 
 	public function new() {
 		t = tls_create();
 	}
 
-	function getValue() : T {
+	function get_value() : T {
 		return tls_get(t);
 	}
 
-	function setValue( v : T ) {
+	function set_value( v : T ) {
 		tls_set(t,v);
 		return v;
 	}

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

@@ -59,9 +59,9 @@ enum XmlType {
 	public static var Document(default,null) : XmlType;
 
 	public var nodeType(default,null) : XmlType;
-	public var nodeName(get_nodeName,set_nodeName) : String;
-	public var nodeValue(get_nodeValue,set_nodeValue) : String;
-	public var parent(getParent,null) : Xml;
+	public var nodeName(get,set) : String;
+	public var nodeValue(get,set) : String;
+	public var parent(get,null) : Xml;
 
 	var _nodeName : String;
 	var _nodeValue : String;
@@ -78,7 +78,7 @@ enum XmlType {
 	}
 
 	private static function __end_element_handler(parser : Dynamic, name : String) : Void {
-		build = build.getParent();
+		build = build.parent;
 	}
 
 	private static function __decodeattr(value : String) : String
@@ -231,7 +231,7 @@ enum XmlType {
 		return _nodeValue = v;
 	}
 
-	private inline function getParent() : Xml {
+	private inline function get_parent() : Xml {
 		return _parent;
 	}
 

+ 4 - 4
std/php/_std/sys/db/Mysql.hx

@@ -83,8 +83,8 @@ private class MysqlConnection implements Connection {
 
 
 private class MysqlResultSet implements ResultSet {
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
 	private var __r : Void;
 	private var __c : Void;
 	private var cache : Dynamic;
@@ -94,7 +94,7 @@ private class MysqlResultSet implements ResultSet {
 		__c = c;
 	}
 
-	private function getLength() {
+	private function get_length() {
 		if(untyped __physeq__(__r, true))
 			return untyped __call__("mysql_affected_rows", __c);
 		else if (untyped __physeq__(__r, false))
@@ -103,7 +103,7 @@ private class MysqlResultSet implements ResultSet {
 	}
 
 	private var _nfields : Int;
-	private function getNFields() {
+	private function get_nfields() {
 		if(_nfields == null)
 			_nfields = untyped __call__("mysql_num_fields", __r);
 		return _nfields;

+ 4 - 4
std/php/_std/sys/db/Sqlite.hx

@@ -93,8 +93,8 @@ private class SqliteConnection implements Connection {
 
 private class SqliteResultSet implements ResultSet {
 
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
 	var r : Void;
 	var cache : Dynamic;
 
@@ -102,7 +102,7 @@ private class SqliteResultSet implements ResultSet {
 		this.r = r;
 	}
 
-	private function getLength() {
+	private function get_length() {
 		if(untyped __physeq__(r, true))
 			return untyped __call__("sqlite_changes", r);
 		else if (untyped __physeq__(r, false))
@@ -111,7 +111,7 @@ private class SqliteResultSet implements ResultSet {
 	}
 
 	private var _nfields : Int;
-	private function getNFields() {
+	private function get_nfields() {
 		if(_nfields == null)
 			_nfields = untyped __call__("sqlite_num_fields", r);
 		return _nfields;

+ 2 - 2
std/php/db/Manager.hx

@@ -31,14 +31,14 @@ import php.db.Connection;
 class Manager<T : Object> {
 
 	/* ----------------------------- STATICS ------------------------------ */
-	public static var cnx(default,setConnection) : Connection;
+	public static var cnx(default,set) : Connection;
 	private static var object_cache : Hash<Object> = new Hash();
 	private static var cache_field = "__cache__";
 	private static var FOR_UPDATE = "";
 
 	public static var managers = new Hash<Manager<Dynamic>>();
 
-	private static dynamic function setConnection( c : Connection ) {
+	private static dynamic function set_cnx( c : Connection ) {
 		Reflect.setField(Manager,"cnx",c);
 		if( c != null )
 			FOR_UPDATE = if( c.dbName() == "MySQL" ) " FOR UPDATE" else "";

+ 4 - 4
std/php/db/Mysql.hx

@@ -83,8 +83,8 @@ private class MysqlConnection implements Connection {
 
 
 private class MysqlResultSet implements ResultSet {
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
 	private var __r : Void;
 	private var __c : Void;
 	private var cache : Dynamic;
@@ -94,7 +94,7 @@ private class MysqlResultSet implements ResultSet {
 		__c = c;
 	}
 
-	private function getLength() {
+	private function get_length() {
 		if(untyped __physeq__(__r, true))
 			return untyped __call__("mysql_affected_rows", __c);
 		else if (untyped __physeq__(__r, false))
@@ -103,7 +103,7 @@ private class MysqlResultSet implements ResultSet {
 	}
 
 	private var _nfields : Int;
-	private function getNFields() {
+	private function get_nfields() {
 		if(_nfields == null)
 			_nfields = untyped __call__("mysql_num_fields", __r);
 		return _nfields;

+ 6 - 6
std/php/db/PDO.hx

@@ -263,8 +263,8 @@ private class BaseResultSet implements ResultSet {
 	var _columnNames : Array<String>;
 	var _columnTypes : Array<String>;
 
-	public var length(getLength, null) : Int;
-	public var nfields(getNFields, null) : Int;
+	public var length(get, null) : Int;
+	public var nfields(get, null) : Int;
 
 	public function new(pdo : PDOStatement, typeStrategy : TypeStrategy)
 	{
@@ -300,7 +300,7 @@ private class BaseResultSet implements ResultSet {
 		return throw "must override";
 	}
 
-	function getLength() : Int {
+	function get_length() : Int {
 		return throw "must override";
 	}
 
@@ -316,7 +316,7 @@ private class BaseResultSet implements ResultSet {
 		return o;
 	}
 
-	function getNFields() : Int {
+	function get_nfields() : Int {
 		return _fields;
 	}
 
@@ -357,7 +357,7 @@ private class AllResultSet extends BaseResultSet {
 		return pos < _length;
 	}
 
-	override function getLength() : Int {
+	override function get_length() : Int {
 		return _length;
 	}
 
@@ -385,7 +385,7 @@ private class PDOResultSet extends BaseResultSet {
 		return (untyped cache);
 	}
 
-	override function getLength() {
+	override function get_length() {
 		if (untyped __physeq__(pdo, false))
 			return 0;
 		return pdo.rowCount();

+ 4 - 4
std/php/db/Sqlite.hx

@@ -95,8 +95,8 @@ private class SqliteConnection implements Connection {
 
 private class SqliteResultSet implements ResultSet {
 
-	public var length(getLength,null) : Int;
-	public var nfields(getNFields,null) : Int;
+	public var length(get,null) : Int;
+	public var nfields(get,null) : Int;
 	var r : Void;
 	var cache : Dynamic;
 
@@ -104,7 +104,7 @@ private class SqliteResultSet implements ResultSet {
 		this.r = r;
 	}
 
-	private function getLength() {
+	private function get_length() {
 		if(untyped __physeq__(r, true))
 			return untyped __call__("sqlite_changes", r);
 		else if (untyped __physeq__(r, false))
@@ -113,7 +113,7 @@ private class SqliteResultSet implements ResultSet {
 	}
 
 	private var _nfields : Int;
-	private function getNFields() {
+	private function get_nfields() {
 		if(_nfields == null)
 			_nfields = untyped __call__("sqlite_num_fields", r);
 		return _nfields;

+ 2 - 2
std/sys/db/Manager.hx

@@ -35,7 +35,7 @@ import sys.db.Connection;
 class Manager<T : Object> {
 
 	/* ----------------------------- STATICS ------------------------------ */
-	public static var cnx(default, setConnection) : Connection;
+	public static var cnx(default, set) : Connection;
 	public static var lockMode : String;
 
 	private static inline var cache_field = "__cache__";
@@ -50,7 +50,7 @@ class Manager<T : Object> {
 		h;
 	}
 
-	private static function setConnection( c : Connection ) {
+	private static function set_cnx( c : Connection ) {
 		cnx = c;
 		lockMode = (c != null && c.dbName() == "MySQL") ? " FOR UPDATE" : "";
 		return c;

+ 2 - 2
std/sys/db/ResultSet.hx

@@ -23,8 +23,8 @@ package sys.db;
 
 interface ResultSet {
 
-	var length(getLength,null) : Int;
-	var nfields(getNFields,null) : Int;
+	var length(get,null) : Int;
+	var nfields(get,null) : Int;
 
 
 	function hasNext() : Bool;

+ 3 - 3
tests/unit/TestMisc.hx

@@ -26,9 +26,9 @@ class MyDynamicClass {
 		return Z + x + y;
 	}
 
-	public static var W(get_w, set_w) : Int = 55;
-	static function get_w() return W + 2
-	static function set_w(v) { W = v; return v; }
+	public static var W(get, set) : Int = 55;
+	static function get_W() return W + 2
+	static function set_W(v) { W = v; return v; }
 	
 }
 

+ 2 - 2
tests/unit/TestReflect.hx

@@ -36,7 +36,7 @@ class ClassWithProp implements InterfWithProp {
 }
 
 class SubClassWithProp extends ClassWithProp {
-	public var y(default, setY) : Int;
+	public var y(default, set) : Int;
 
 	public function new() {
 		super();
@@ -51,7 +51,7 @@ class SubClassWithProp extends ClassWithProp {
 		return y;
 	}
 
-	function setY(v) {
+	function set_y(v) {
 		y = v;
 		return v;
 	}

+ 18 - 11
typeload.ml

@@ -400,7 +400,13 @@ and load_complex_type ctx p t =
 						| "never" -> AccNever
 						| "default" -> AccNormal
 						| "dynamic" -> AccCall ((if get then "get_"  else "set_") ^ n)
-						| _ -> AccCall m
+						| "get" when get -> AccCall ("get_" ^ n)
+						| "set" when not get -> AccCall ("set_" ^ n)
+						| x when get && x = "get_" ^ n -> AccCall x
+						| x when not get && x = "set_" ^ n -> AccCall x
+						| _ ->	
+							(if Common.defined ctx.com Define.Haxe3 then error else ctx.com.warning) "Property custom access is no longer supported in Haxe3+" f.cff_pos;
+							AccCall m
 					in
 					let t = (match t with None -> error "Type required for structure property" p | Some t -> t) in
 					load_complex_type ctx p t, Var { v_read = access i1 true; v_write = access i2 false }
@@ -1300,24 +1306,26 @@ let init_class ctx c p context_init herits fields =
 				| None, _ -> mk_mono()
 				| Some t, _ -> load_complex_type ctx p t
 			) in
-			let check_get = ref (fun() -> ()) in
-			let check_set = ref (fun() -> ()) in
-			let check_method m t () =
+			let check_method m t req_name =
 				if ctx.com.display then () else
 				try
-					let t2 = (if stat then (PMap.find m c.cl_statics).cf_type else fst (class_field c m)) in
+					let t2, f = (if stat then let f = PMap.find m c.cl_statics in f.cf_type, f else class_field c m) in
 					unify_raise ctx t2 t p;
+					(match req_name with None -> () | Some n -> display_error ctx ("Please use " ^ n ^ " to name your property access method") f.cf_pos);
 				with
 					| Error (Unify l,_) -> raise (Error (Stack (Custom ("In method " ^ m ^ " required by property " ^ name),Unify l),p))
-					| Not_found -> if not (c.cl_interface || c.cl_extern) then display_error ctx ("Method " ^ m ^ " required by property " ^ name ^ " is missing") p
+					| Not_found -> 
+						if req_name <> None then display_error ctx "Custom property accessor is no longer supported, please use get/set" p else
+						if not (c.cl_interface || c.cl_extern) then display_error ctx ("Method " ^ m ^ " required by property " ^ name ^ " is missing") p
 			in
 			let get = (match get with
 				| "null" -> AccNo
 				| "dynamic" -> AccCall ("get_" ^ name)
 				| "never" -> AccNever
-				| "default" -> AccNormal
+				| "default" -> AccNormal				
 				| _ ->
-					check_get := check_method get (TFun ([],ret));
+					let get = if get = "get" then "get_" ^ name else get in
+					delay ctx PForce (fun() -> check_method get (TFun ([],ret)) (if get <> "get" && get <> "get_" ^ name && Common.defined ctx.com Define.Haxe3 then Some ("get_" ^ name) else None));
 					AccCall get
 			) in
 			let set = (match set with
@@ -1331,7 +1339,8 @@ let init_class ctx c p context_init herits fields =
 				| "dynamic" -> AccCall ("set_" ^ name)
 				| "default" -> AccNormal
 				| _ ->
-					check_set := check_method set (TFun (["",false,ret],ret));
+					let set = if set = "set" then "set_" ^ name else set in
+					delay ctx PForce (fun() -> check_method set (TFun (["",false,ret],ret)) (if set <> "set" && set <> "set_" ^ name && Common.defined ctx.com Define.Haxe3 then Some ("set_" ^ name) else None));
 					AccCall set
 			) in
 			if set = AccNormal && (match get with AccCall _ -> true | _ -> false) then error "Unsupported property combination" p;
@@ -1349,8 +1358,6 @@ let init_class ctx c p context_init herits fields =
 			} in
 			ctx.curfield <- cf;
 			bind_var ctx cf eo stat inline;
-			delay ctx PForce (fun() -> (!check_get)());
-			delay ctx PForce (fun() -> (!check_set)());
 			f, false, cf
 	in
 	let rec check_require = function