From: Florian Brosch <flo.brosch@gmail.com>
Date: Sat, 21 Jul 2012 16:51:03 +0000 (+0200)
Subject: libvaladoc: Avoid reparsing of comments
X-Git-Tag: 0.37.1~3^2~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eef0cec3e990ea2646ba3cffab1980f65b031a3f;p=thirdparty%2Fvala.git

libvaladoc: Avoid reparsing of comments
---

diff --git a/src/libvaladoc/api/enumvalue.vala b/src/libvaladoc/api/enumvalue.vala
index d63af2167..b71559533 100644
--- a/src/libvaladoc/api/enumvalue.vala
+++ b/src/libvaladoc/api/enumvalue.vala
@@ -56,6 +56,10 @@ public class Valadoc.Api.EnumValue: Symbol {
 	 * {@inheritDoc}
 	 */
 	internal override void process_comments (Settings settings, DocumentationParser parser) {
+		if (documentation != null) {
+			return ;
+		}
+
 		if (source_comment != null) {
 			documentation = parser.parse (this, source_comment);
 		}
diff --git a/src/libvaladoc/api/errorcode.vala b/src/libvaladoc/api/errorcode.vala
index 8253c1b93..c42202360 100644
--- a/src/libvaladoc/api/errorcode.vala
+++ b/src/libvaladoc/api/errorcode.vala
@@ -44,6 +44,10 @@ public class Valadoc.Api.ErrorCode : Symbol {
 	 * {@inheritDoc}
 	 */
 	internal override void process_comments (Settings settings, DocumentationParser parser) {
+		if (documentation != null) {
+			return ;
+		}
+
 		if (source_comment != null) {
 			documentation = parser.parse (this, source_comment);
 		}
diff --git a/src/libvaladoc/api/member.vala b/src/libvaladoc/api/member.vala
index 77df1b7a4..59a80490d 100644
--- a/src/libvaladoc/api/member.vala
+++ b/src/libvaladoc/api/member.vala
@@ -33,6 +33,10 @@ public abstract class Valadoc.Api.Member : Symbol {
 	}
 
 	internal override void process_comments (Settings settings, DocumentationParser parser) {
+		if (documentation != null) {
+			return ;
+		}
+
 		if (source_comment != null) {
 			documentation = parser.parse (this, source_comment);
 		}
diff --git a/src/libvaladoc/api/namespace.vala b/src/libvaladoc/api/namespace.vala
index 0b9b3464a..85da99183 100644
--- a/src/libvaladoc/api/namespace.vala
+++ b/src/libvaladoc/api/namespace.vala
@@ -40,6 +40,10 @@ public class Valadoc.Api.Namespace : Symbol {
 	 * {@inheritDoc}
 	 */
 	internal override void process_comments (Settings settings, DocumentationParser parser) {
+		if (documentation != null) {
+			return ;
+		}
+
 		if (source_comment != null) {
 			documentation = parser.parse (this, source_comment);
 		}
diff --git a/src/libvaladoc/api/typesymbol.vala b/src/libvaladoc/api/typesymbol.vala
index f829cb100..83b977601 100644
--- a/src/libvaladoc/api/typesymbol.vala
+++ b/src/libvaladoc/api/typesymbol.vala
@@ -49,6 +49,10 @@ public abstract class Valadoc.Api.TypeSymbol : Symbol {
 	 * {@inheritDoc}
 	 */
 	internal override void process_comments (Settings settings, DocumentationParser parser) {
+		if (documentation != null) {
+			return ;
+		}
+
 		if (source_comment != null) {
 			documentation = parser.parse (this, source_comment);
 		}
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 65a6fc706..49699a5c7 100644
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -72,8 +72,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
 		}
 
 		if (_symbol == null && symbol_name != "main") {
-			// TODO use ContentElement's source reference
-			string node_segment = (container == null)? "" : container.get_full_name () + ": ";
+			string node_segment = (container is Api.Package)? "" : container.get_full_name () + ": ";
 			reporter.simple_warning ("%s: %s@link: warning: %s does not exist", file_path, node_segment, symbol_name);
 		}