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 7107ece7aee8608bc84c325626a4e59660a32c16..4d6b2bd2343f599ef0f0e798ec18a3c80cad884b 100644 (file)
--- 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 0ca27dcecd06a19cb4cfd4056cf76827c858102c..ef16b9e8372211dd5291b968eb98c845a1f3d4a6 100644 (file)
--- 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++;