[valadoc] libvaladoc: DocumentationParser: Fix row- and collspan



commit 7ec5e31f870d2ef42453e5a0214f0054b19c3cb8
Author: Florian Brosch <flo brosch gmail com>
Date:   Wed Feb 16 20:09:42 2011 +0100

    libvaladoc: DocumentationParser: Fix row- and collspan

 .../documentation/documentationparser.vala         |    4 ++--
 src/libvaladoc/documentation/wikiscanner.vala      |    6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 8f0198d..2753874 100644
--- 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 9e1717c..b9c2fbe 100644
--- 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 '=':



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]