From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 21 Oct 2013 18:10:03 +0000 (+0200)
Subject: Merge branch 'staging'
X-Git-Tag: 0.22.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4038abdfdde146ec46c3037035a4e4c14e97942e;p=thirdparty%2Fvala.git

Merge branch 'staging'

Conflicts:
	vala/valagirparser.vala
---

4038abdfdde146ec46c3037035a4e4c14e97942e
diff --cc vala/valagirparser.vala
index 5fab592a8,e6857067e..4f130ce0a
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@@ -2053,21 -2059,25 +2057,29 @@@ public class Vala.GirParser : CodeVisit
  	}
  
  	Comment? parse_doc () {
- 		if (reader.name != "doc") {
- 			return null;
- 		}
 -		skip_other_docs ();
++		Comment? comment = null;
  
- 		start_element ("doc");
- 		next ();
 -		if (reader.name != "doc") {
 -			return null;
 -		}
++		while (current_token == MarkupTokenType.START_ELEMENT) {
++			unowned string reader_name = reader.name;
  
- 		Comment? comment = null;
 -		start_element ("doc");
 -		next ();
++			if (reader_name == "doc") {
++				start_element ("doc");
++				next ();
  
- 		if (current_token == MarkupTokenType.TEXT) {
- 			comment = new Comment (reader.content, current.source_reference);
- 			next ();
 -		Comment? comment = null;
+ 
 -		if (current_token == MarkupTokenType.TEXT) {
 -			comment = new Comment (reader.content, current.source_reference);
 -			next ();
 -		}
++				if (current_token == MarkupTokenType.TEXT) {
++					comment = new Comment (reader.content, current.source_reference);
++					next ();
++				}
+ 
 -		end_element ("doc");
++				end_element ("doc");
++			} else if (reader_name == "doc-version" || reader_name == "doc-deprecated" || reader_name == "doc-stability") {
++				skip_element ();
++			} else {
++				break;
++			}
 +		}
  
- 		end_element ("doc");
 -		skip_other_docs ();
  		return comment;
  	}