[valadoc] libvaladoc: documentationparser: Do not allow two spaces in a a row
- From: Florian Brosch <flobrosch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valadoc] libvaladoc: documentationparser: Do not allow two spaces in a a row
- Date: Thu, 24 Feb 2011 01:32:32 +0000 (UTC)
commit b090ee600a96810a47b10543d22bcff628f6134b
Author: Florian Brosch <flo brosch gmail com>
Date: Wed Feb 16 01:58:04 2011 +0100
libvaladoc: documentationparser: Do not allow two spaces in a a row
.../documentation/documentationparser.vala | 43 ++++++++++---------
1 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index d2a7b2b..c263161 100644
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -957,31 +957,35 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
.set_name ("SourceCode")
.set_start (() => { push (_factory.create_source_code ()); });
- Rule run_subrules =
- Rule.one_of ({
- text, inline_taglet, bold, italic, underlined, monospace, embedded, link, source_code
- })
- .set_reduce (() => {
+ Rule.Action append_head_to_head2 = () => {
var head = (Inline) pop ();
((InlineContent) peek ()).content.add (head);
+ };
+
+ Rule run_optional_space =
+ Rule.option ({ space })
+ .set_reduce (append_head_to_head2);
+
+ Rule run_subrules =
+ Rule.one_of ({
+ Rule.seq ({
+ text
+ })
+ .set_reduce (append_head_to_head2),
+ Rule.seq ({
+ Rule.one_of ({
+ inline_taglet, bold, italic, underlined, monospace, embedded, link, source_code
+ })
+ .set_reduce (append_head_to_head2),
+ run_optional_space
+ })
});
Rule run_arobase =
Rule.seq ({
TokenType.AROBASE.action (add_text)
})
- .set_reduce (() => {
- var head = (Inline) pop ();
- ((InlineContent) peek ()).content.add (head);
- });
-
- Rule run_optional_space =
- Rule.option ({ space })
- .set_reduce (() => {
- var head = (Inline) pop ();
- ((InlineContent) peek ()).content.add (head);
- });
-
+ .set_reduce (append_head_to_head2);
run.set_rule (
Rule.seq ({
@@ -990,10 +994,9 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
Rule.option ({
Rule.many ({
Rule.one_of ({
- run_arobase,
+ Rule.seq ({ run_arobase, run_optional_space }),
run_subrules
- }),
- run_optional_space
+ })
})
})
})
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]