libvaladoc: gir-reader: Improve @-quirks-mode

diff --git a/src/libvaladoc/documentation/gtkdoccommentparser.vala b/src/libvaladoc/documentation/gtkdoccommentparser.vala
index b804692f026e75dc9409af41faae8f2799bcd7b2..376624e5687faf1492e28ae040a4af4d76f00703 100644 (file)
--- a/src/libvaladoc/documentation/gtkdoccommentparser.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentparser.vala
@@ -80,6 +80,13 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator {
                                continue;
                        }
 
+                       // ignore numbers
+                       if (cmp0.get (1).isdigit ()) {
+                               offset = offset + 2;
+                               continue;
+                       }
+
+
                        Text sec = factory.create_text (text.content.substring (offset+1, -1));
                        text.content = text.content.substring (0, offset+1);
                        return sec;

diff --git a/src/libvaladoc/documentation/gtkdoccommentscanner.vala b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
index fd16e3b153e28a365ec531efe1c2d748c49df46b..2c24947fb0011346ffeacfeaaa32587e29d543d0 100644 (file)
--- a/src/libvaladoc/documentation/gtkdoccommentscanner.vala
+++ b/src/libvaladoc/documentation/gtkdoccommentscanner.vala
@@ -582,11 +582,12 @@ public class Valadoc.Gtkdoc.Scanner {
        private Token? word_prefix () {
                unowned string start = this.pos;
                int column_start = this.column;
-               if (get () == '<') {
+               unichar c = get ();
+               if (c == '<' || c == '@') {
                        next_char ();
                }
 
-               for (unichar c = get (); c != ' ' && c != '\t' && c != '\n' && c != '\0' && c != '<'; c = next_char ());
+               for (c = get (); c != ' ' && c != '\t' && c != '\n' && c != '\0' && c != '<' && c != '@'; c = next_char ());
                int len = offset (this.pos, start);
                if (len == 0) {
                        this.column = column_start;