Ver código fonte

changed "property" to "var".

Nicolas Cannasse 19 anos atrás
pai
commit
766d2e2ff9

+ 12 - 11
parser.ml

@@ -181,8 +181,7 @@ and parse_type_path = parser
 	| [< '(POpen,_); t = parse_type_path; '(PClose,_); s >] -> parse_type_path_next (TPParent t) s
 	| [< '(BrOpen,_); s >] ->
 		let l = (match s with parser
-			| [< '(Const (Ident name),_) when name <> "property" >] -> parse_type_anonymous_resume name s
-			| [< '(Const (Type name),_) >] -> parse_type_anonymous_resume name s
+			| [< name = any_ident >] -> parse_type_anonymous_resume name s
 			| [< l = plist parse_signature_field; '(BrClose,_) >] -> l
 			| [< >] -> serror()
 		) in
@@ -241,15 +240,17 @@ and parse_class_field s =
 	match s with parser
 	| [< l = parse_cf_rights true []; doc = get_doc; s >] ->
 		match s with parser
-		| [< '(Kwd Var,p1); name = any_ident; t = parse_type_opt; s >] ->			
-			let e , p2 = (match s with parser
-			| [< '(Binop OpAssign,_) when List.mem AStatic l; e = expr; p2 = semicolon >] -> Some e , p2
-			| [< '(Semicolon,p2) >] -> None , p2
-			| [< >] -> serror()
-			) in
-			(FVar (name,doc,l,t,e),punion p1 p2)
-		| [< '(Const (Ident "property"),p1); name = any_ident; '(POpen,_); i1 = property_ident; '(Comma,_); i2 = property_ident; '(PClose,_); '(DblDot,_); t = parse_type_path; p2 = semicolon >] ->
-			(FProp (name,doc,l,i1,i2,t),punion p1 p2)
+		| [< '(Kwd Var,p1); name = any_ident; s >] ->
+			(match s with parser
+			| [< '(POpen,_); i1 = property_ident; '(Comma,_); i2 = property_ident; '(PClose,_); '(DblDot,_); t = parse_type_path; p2 = semicolon >] ->
+				(FProp (name,doc,l,i1,i2,t),punion p1 p2)
+			| [< t = parse_type_opt; s >] ->
+				let e , p2 = (match s with parser
+				| [< '(Binop OpAssign,_) when List.mem AStatic l; e = expr; p2 = semicolon >] -> Some e , p2
+				| [< '(Semicolon,p2) >] -> None , p2
+				| [< >] -> serror()
+				) in
+				(FVar (name,doc,l,t,e),punion p1 p2))
 		| [< '(Kwd Function,p1); name = parse_fun_name; pl = parse_type_params; '(POpen,_); al = psep Comma parse_fun_param; '(PClose,_); t = parse_type_opt; s >] ->			
 			let e = (match s with parser
 				| [< e = expr >] -> e

+ 1 - 1
std/Array.hx

@@ -33,7 +33,7 @@ extern class Array<T> {
 	/**
 		The length of the Array
 	**/
-	property length(default,null) : Int;
+	var length(default,null) : Int;
 
 	/**
 		Creates a new Array.

+ 1 - 1
std/List.hx

@@ -36,7 +36,7 @@ class List<T> {
 	/**
 		The number of elements in this list.
 	**/
-	public property length(default,null) : Int;
+	public var length(default,null) : Int;
 
 	/**
 		Creates a new empty list.

+ 1 - 1
std/String.hx

@@ -31,7 +31,7 @@ extern class String {
 	/**
 		The number of characters in the String.
 	**/
-	property length(default,null) : Int;
+	var length(default,null) : Int;
 
 	function new(string:String) : Void;
 

+ 10 - 10
std/Xml.hx

@@ -37,13 +37,13 @@ enum XmlType {
 **/
 extern class Xml {
 
-	static property Element(default,null) : XmlType;
-	static property PCData(default,null) : XmlType;
-	static property CData(default,null) : XmlType;
-	static property Comment(default,null) : XmlType;
-	static property DocType(default,null) : XmlType;
-	static property Prolog(default,null) : XmlType;
-	static property Document(default,null) : XmlType;
+	static var Element(default,null) : XmlType;
+	static var PCData(default,null) : XmlType;
+	static var CData(default,null) : XmlType;
+	static var Comment(default,null) : XmlType;
+	static var DocType(default,null) : XmlType;
+	static var Prolog(default,null) : XmlType;
+	static var Document(default,null) : XmlType;
 
 	static function parse( s : String ) : Xml;
 
@@ -55,15 +55,15 @@ extern class Xml {
 	static function createProlog( data : String ) : Xml;
 	static function createDocument() : Xml;
 
-	property nodeType(default,null) : XmlType;
+	var nodeType(default,null) : XmlType;
 
 	// nodeName : only works for Node
-	property nodeName(getNodeName,setNodeName) : String;
+	var nodeName(getNodeName,setNodeName) : String;
 	private function getNodeName() : String;
 	private function setNodeName( name : String ) : String;
 
 	// nodeValue : only works for not Node and not Document
-	property nodeValue(getNodeValue,setNodeValue) : String;
+	var nodeValue(getNodeValue,setNodeValue) : String;
 	private function getNodeValue() : String;
 	private function setNodeValue( name : String ) : String;
 

+ 12 - 12
std/flash/Camera.hx

@@ -2,26 +2,26 @@ package flash;
 
 extern class Camera {
 
-	static property names(default,null) : Array<String>;
+	static var names(default,null) : Array<String>;
 	static function get( index : Int ) : Camera;
 
-	property bandwidth(default,null) : Int;
+	var bandwidth(default,null) : Int;
 
-	property fps(default,null) : Float;
-	property currentFps(default,null) : Float;
+	var fps(default,null) : Float;
+	var currentFps(default,null) : Float;
 
-	property width(default,null) : Int;
-	property height(default,null) : Int;
+	var width(default,null) : Int;
+	var height(default,null) : Int;
 
-	property index(default,null) : Int;
+	var index(default,null) : Int;
 
-	property activityLevel(default,null) : Float;
-	property motionLevel(default,null) : Float;
+	var activityLevel(default,null) : Float;
+	var motionLevel(default,null) : Float;
 
-	property muted(default,null) : Bool;
-	property name(default,null) : String;
+	var muted(default,null) : Bool;
+	var name(default,null) : String;
 
-	property quality(default,null) : Int;
+	var quality(default,null) : Int;
 
 	function setMode(width:Int,height:Int,fps:Float,favorArea:Bool):Void;
 	function setMotionLevel(motionLevel:Float,timeOut:Float):Void;

+ 3 - 3
std/flash/FlashXml__.hx

@@ -27,9 +27,9 @@ import Xml;
 
 class FlashXml__ {
 
-	public property nodeName(getNodeName,setNodeName) : String;
-	public property nodeValue(getNodeValue,setNodeValue) : String;
-	public property nodeType(default,null) : XmlType;
+	public var nodeName(getNodeName,setNodeName) : String;
+	public var nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeType(default,null) : XmlType;
 
 	private var __x : Dynamic;
 

+ 10 - 10
std/flash/Microphone.hx

@@ -3,18 +3,18 @@ package flash;
 extern class Microphone
 {
 
-	static property names(default,null) : Array<String>;
+	static var names(default,null) : Array<String>;
 	static function get(index:Int) : Microphone;
 
-	property activityLevel(default,null) : Float;
-	property gain(default,null) : Float;
-	property index(default,null) : Int;
-	property muted(default,null) : Bool;
-	property name(default,null) : String;
-	property silenceLevel(default,null) : Int;
-	property silenceTimeOut(default,null) : Float;
-	property rate(default,null) : Float;
-	property useEchoSuppression(default,null) : Bool;
+	var activityLevel(default,null) : Float;
+	var gain(default,null) : Float;
+	var index(default,null) : Int;
+	var muted(default,null) : Bool;
+	var name(default,null) : String;
+	var silenceLevel(default,null) : Int;
+	var silenceTimeOut(default,null) : Float;
+	var rate(default,null) : Float;
+	var useEchoSuppression(default,null) : Bool;
 
 	function setSilenceLevel(silenceLevel:Int,timeOut:Float):Void;
 	function setRate(rate:Float):Void;

+ 4 - 4
std/flash/MovieClip.hx

@@ -29,10 +29,10 @@ implements Dynamic
 	var _target : String;
 	var _rotation : Float;
 	var _name : String;
-	property _droptarget(default,null) : String;
-	property _currentframe(default,null) : Int;
-	property _totalframes(default,null) : Int;
-	property _framesloaded(default,null) : Int;
+	var _droptarget(default,null) : String;
+	var _currentframe(default,null) : Int;
+	var _totalframes(default,null) : Int;
+	var _framesloaded(default,null) : Int;
 	var _quality : String;
 	var _focusrect : Bool;
 	var _soundbuftime : Float;

+ 6 - 6
std/flash/NetStream.hx

@@ -2,12 +2,12 @@ package flash;
 
 extern class NetStream
 {
-	property bufferLength(default,null) : Float;
-	property bufferTime(default,null) : Float;
-	property bytesLoaded(default,null) : Int;
-	property bytesTotal(default,null) : Int;
-	property time(default,null) : Float;
-	property currentFps(default,null) : Float;
+	var bufferLength(default,null) : Float;
+	var bufferTime(default,null) : Float;
+	var bytesLoaded(default,null) : Int;
+	var bytesTotal(default,null) : Int;
+	var time(default,null) : Float;
+	var currentFps(default,null) : Float;
 
 	// not documented ?
 	var liveDelay : Float;

+ 5 - 5
std/flash/PrintJob.hx

@@ -6,9 +6,9 @@ extern class PrintJob
 	function addPage(target:Dynamic, printArea:Dynamic, options:Dynamic, frameNum:Float):Bool;
 	function send():Void;
 
-	property paperWidth(default,null) : Float;
-	property paperHeight(default,null) : Float;
-	property pageWidth(default,null) : Float;
-	property pageHeight(default,null) : Float;
-	property orientation(default,null) : String;
+	var paperWidth(default,null) : Float;
+	var paperHeight(default,null) : Float;
+	var pageWidth(default,null) : Float;
+	var pageHeight(default,null) : Float;
+	var orientation(default,null) : String;
 }

+ 3 - 3
std/js/JsXml__.hx

@@ -41,7 +41,7 @@ class JsXml__ {
 	static var edoctype_elt = ~/[\[|\]>]/;
 	static var ecomment_end = ~/-->/;
 
-	public property nodeType(default,null) : XmlType;
+	public var nodeType(default,null) : XmlType;
 	public var _nodeName : String;
 	public var _nodeValue : String;
 	public var _attributes : Hash<String>;
@@ -204,7 +204,7 @@ class JsXml__ {
 		untyped return r;
 	}
 
-	public property nodeName(getNodeName,setNodeName) : String;
+	public var nodeName(getNodeName,setNodeName) : String;
 
 	private function getNodeName() : String {
 		if( nodeType != Xml.Element )
@@ -218,7 +218,7 @@ class JsXml__ {
 		return _nodeName = n;
 	}
 
-	public property nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeValue(getNodeValue,setNodeValue) : String;
 
 	private function getNodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )

+ 1 - 1
std/neko/NekoArray__.hx

@@ -26,7 +26,7 @@ package neko;
 
 class NekoArray__<T> implements Array<T> {
 
-	public property length(default,null) : Int;
+	public var length(default,null) : Int;
 
 	private function new() {
 		untyped {

+ 1 - 1
std/neko/NekoString__.hx

@@ -28,7 +28,7 @@ class NekoString__ implements String {
 
 	private static var __split : Dynamic = Lib.load("std","string_split",2);
 
-	public property length(default,null) : Int;
+	public var length(default,null) : Int;
 
 	private function new(s) {
 		untyped {

+ 3 - 3
std/neko/NekoXml__.hx

@@ -28,7 +28,7 @@ import Xml;
 class NekoXml__ {
 
 	private var _children : Array<Xml>;
-	public property nodeType(default,null) : XmlType;
+	public var nodeType(default,null) : XmlType;
 
 	private var _nodeName : String;
 	private var _nodeValue : String;
@@ -162,7 +162,7 @@ class NekoXml__ {
 	}
 
 
-	public property nodeName(getNodeName,setNodeName) : String;
+	public var nodeName(getNodeName,setNodeName) : String;
 	private function getNodeName() : String {
 		if( nodeType != Xml.Element )
 			throw "bad nodeType";
@@ -174,7 +174,7 @@ class NekoXml__ {
 		return _nodeName = n;
 	}
 
-	public property nodeValue(getNodeValue,setNodeValue) : String;
+	public var nodeValue(getNodeValue,setNodeValue) : String;
 	private function getNodeValue() : String {
 		if( nodeType == Xml.Element || nodeType == Xml.Document )
 			throw "bad nodeType";

+ 1 - 1
std/neko/Web.hx

@@ -154,7 +154,7 @@ class Web {
 		_set_main(f);
 	}
 
-	public static property isModNeko(default,null) : Bool;
+	public static var isModNeko(default,null) : Bool;
 
 	static var _set_main : Dynamic;
 	static var _get_host_name : Dynamic;

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

@@ -26,8 +26,8 @@ package neko.db;
 
 class ResultSet {
 
-	public property length(getLength,null) : Int;
-	public property nfields(getNFields,null) : Int;
+	public var length(getLength,null) : Int;
+	public var nfields(getNFields,null) : Int;
 	private var __r : Void;
 	private var cache : Dynamic;