[vala] Remove trailing whitespace from content in markup reader
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] Remove trailing whitespace from content in markup reader
- Date: Mon, 9 Aug 2010 08:28:31 +0000 (UTC)
commit ba68965853126361e2a9c5932ff0b5ccee05db1d
Author: Florian Brosch <flo brosch gmail com>
Date: Sun Aug 8 16:00:37 2010 +0200
Remove trailing whitespace from content in markup reader
vala/valamarkupreader.vala | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/vala/valamarkupreader.vala b/vala/valamarkupreader.vala
index 7805e25..843fba6 100644
--- a/vala/valamarkupreader.vala
+++ b/vala/valamarkupreader.vala
@@ -154,7 +154,7 @@ public class Vala.MarkupReader : Object {
}
current++;
- string attr_value = text ('"');
+ string attr_value = text ('"', false);
if (current >= end || current[0] != '"') {
// error
@@ -179,7 +179,7 @@ public class Vala.MarkupReader : Object {
space ();
if (current[0] != '<') {
- content = text ('<');
+ content = text ('<', true);
} else {
// no text
// read next token
@@ -196,7 +196,7 @@ public class Vala.MarkupReader : Object {
return type;
}
- string text (char end_char) {
+ string text (char end_char, bool rm_trailing_whitespace) {
StringBuilder content = new StringBuilder ();
char* text_begin = current;
char* last_linebreak = current;
@@ -253,6 +253,13 @@ public class Vala.MarkupReader : Object {
column += (int) (current - last_linebreak);
+ // Removes trailing whitespace
+ if (rm_trailing_whitespace) {
+ char* str_pos = ((char*)content.str) + content.len;
+ for (str_pos--; str_pos > ((char*)content.str) && str_pos[0].isspace(); str_pos--);
+ content.erase ((ssize_t) (str_pos-((char*) content.str) + 1), -1);
+ }
+
return content.str;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]