From: Jürg Billeter <j@bitron.ch>
Date: Sat, 17 Jan 2009 17:02:19 +0000 (+0000)
Subject: Read comments
X-Git-Tag: VALA_0_5_6~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49293f73e4e96edcbac5a467f31c09fc0d5782b0;p=thirdparty%2Fvala.git

Read comments

2009-01-17  Jürg Billeter  <j@bitron.ch>

	* vapigen/valamarkupreader.vala:

	Read comments

svn path=/trunk/; revision=2374
---

diff --git a/ChangeLog b/ChangeLog
index 7107ece7a..4d6b2bd23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-17  Jürg Billeter  <j@bitron.ch>
+
+	* vapigen/valamarkupreader.vala:
+
+	Read comments
+
 2009-01-17  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/packages/gtk+-2.0/:
diff --git a/vapigen/valamarkupreader.vala b/vapigen/valamarkupreader.vala
index 0ca27dcec..ef16b9e83 100644
--- a/vapigen/valamarkupreader.vala
+++ b/vapigen/valamarkupreader.vala
@@ -1,6 +1,6 @@
 /* valamarkupreader.vala
  *
- * Copyright (C) 2008  Jürg Billeter
+ * Copyright (C) 2008-2009  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -112,6 +112,22 @@ public class Vala.MarkupReader : Object {
 				// processing instruction
 			} else if (current[0] == '!') {
 				// comment or doctype
+				current++;
+				if (current < end - 1 && current[0] == '-' && current[1] == '-') {
+					// comment
+					current += 2;
+					while (current < end - 2) {
+						if (current[0] == '-' && current[1] == '-' && current[2] == '>') {
+							// end of comment
+							current += 3;
+							break;
+						}
+						current++;
+					}
+
+					// ignore comment, read next token
+					return read_token (out token_begin, out token_end);
+				}
 			} else if (current[0] == '/') {
 				type = MarkupTokenType.END_ELEMENT;
 				current++;