Browse Source

fix some bugs in XmlParser (see #3381)

Simon Krajewski 11 years ago
parent
commit
1bc7e24c82
1 changed files with 2 additions and 2 deletions
  1. 2 2
      std/haxe/rtti/XmlParser.hx

+ 2 - 2
std/haxe/rtti/XmlParser.hx

@@ -91,12 +91,12 @@ class XmlParser {
 			f1.set = RMethod;
 			f1.set = RMethod;
 			return true;
 			return true;
 		}
 		}
-		return false;
+		return Type.enumEq(f1.get, f2.get) && Type.enumEq(f1.set, f2.set);
 	}
 	}
 
 
 	function mergeDoc( f1 : ClassField, f2 : ClassField ) {
 	function mergeDoc( f1 : ClassField, f2 : ClassField ) {
 		if( f1.doc == null )
 		if( f1.doc == null )
-			f2.doc = f2.doc;
+			f1.doc = f2.doc;
 		else if( f2.doc == null )
 		else if( f2.doc == null )
 			f2.doc = f1.doc;
 			f2.doc = f1.doc;
 		return true;
 		return true;