Nicolas Cannasse 13 yıl önce
ebeveyn
işleme
9e350b51c4
2 değiştirilmiş dosya ile 7 ekleme ve 1 silme
  1. 1 1
      doc/ImportAll.hx
  2. 6 0
      std/haxe/rtti/XmlParser.hx

+ 1 - 1
doc/ImportAll.hx

@@ -74,7 +74,7 @@ class ImportAll {
 					case "ImportAll", "neko.db.MacroManager": continue;
 					case "haxe.TimerQueue": if( Context.defined("neko") || Context.defined("php") || Context.defined("cpp") ) continue;
 					case "haxe.web.Request": if( !(Context.defined("neko") || Context.defined("php") || Context.defined("js")) ) continue;
-					case "haxe.macro.DefaultJSGenerator","haxe.macro.Context", "haxe.macro.Compiler": if( !Context.defined("neko") ) continue;
+					case "haxe.macro.ExampleJSGenerator","haxe.macro.Context", "haxe.macro.Compiler": if( !Context.defined("neko") ) continue;
 					case "haxe.remoting.SocketWrapper": if( !Context.defined("flash") ) continue;
 					case "haxe.remoting.SyncSocketConnection": if( !(Context.defined("neko") || Context.defined("php") || Context.defined("cpp")) ) continue;
 					}

+ 6 - 0
std/haxe/rtti/XmlParser.hx

@@ -199,6 +199,12 @@ class XmlParser {
 			// compare params ?
 			if( tinf.path == inf.path ) {
 				var sameType = true;
+				if( (tinf.doc == null) != (inf.doc == null) ) {
+					if( inf.doc == null )
+						inf.doc = tinf.doc;
+					else
+						tinf.doc = inf.doc;
+				}
 				if( tinf.module == inf.module && tinf.doc == inf.doc && tinf.isPrivate == inf.isPrivate )
 					switch( ct ) {
 					case TClassdecl(c):