libvaladoc: DocumentationParser: Fix row- and collspan

diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 8f0198dfc2d730a77d1ea307dfc68976b0794dd7..2753874393dd510b630c6607f74e2813d3339245 100644 (file)
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -1092,11 +1092,11 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
                                        Rule.one_of ({
                                                Rule.seq ({
                                                        TokenType.PIPE,
-                                                       TokenType.any_number ().action ((token) => { ((TableCell) peek ()).colspan = token.to_int (); })
+                                                       TokenType.any_number ().action ((token) => { ((TableCell) peek ()).rowspan = token.to_int (); })
                                                }),
                                                Rule.seq ({
                                                        TokenType.MINUS,
-                                                       TokenType.any_number ().action ((token) => { ((TableCell) peek ()).rowspan = token.to_int (); })
+                                                       TokenType.any_number ().action ((token) => { ((TableCell) peek ()).colspan = token.to_int (); })
                                                })
                                        })
                                }),

diff --git a/src/libvaladoc/documentation/wikiscanner.vala b/src/libvaladoc/documentation/wikiscanner.vala
index 9e1717ce005bbd5780228fd0d0034925df72e41c..b9c2fbecb4aed6e56657d106b669db45635ba04f 100644 (file)
--- a/src/libvaladoc/documentation/wikiscanner.vala
+++ b/src/libvaladoc/documentation/wikiscanner.vala
@@ -207,11 +207,7 @@ public class Valadoc.WikiScanner : Object, Scanner {
                                break;
 
                        case '-':
-                               if (_last_char.isalnum () || get_next_char ().isalnum ()) {
-                                       append_char (c);
-                               } else {
-                                       emit_token (TokenType.MINUS);
-                               }
+                               emit_token (TokenType.MINUS);
                                break;
 
                        case '=':