summaryrefslogtreecommitdiffhomepage
path: root/dlang/src/ssp_parser.d
diff options
context:
space:
mode:
Diffstat (limited to 'dlang/src/ssp_parser.d')
-rw-r--r--dlang/src/ssp_parser.d12
1 files changed, 11 insertions, 1 deletions
diff --git a/dlang/src/ssp_parser.d b/dlang/src/ssp_parser.d
index 1a1efe2..2efd94b 100644
--- a/dlang/src/ssp_parser.d
+++ b/dlang/src/ssp_parser.d
@@ -17,6 +17,12 @@ SspDocument parseSsp(string content) {
SspDocument doc;
SspObject current_obj;
bool in_object = false;
+ /+ ↓ whether a text line has been seen for the object being read.
+ Not "is the text non-empty": an object whose first text line is blank
+ (a verse opening on an empty line, which the sample set has seven of)
+ would then lose it, the next line overwriting rather than appending.
+ +/
+ bool seen_text = false;
string current_section = "";
string current_block = ""; // meta, make, doc_has, or section name
@@ -40,6 +46,7 @@ SspDocument parseSsp(string content) {
commitObject(doc, current_section, current_obj);
current_obj = SspObject.init;
in_object = false;
+ seen_text = false;
}
continue;
}
@@ -68,6 +75,7 @@ SspDocument parseSsp(string content) {
commitObject(doc, current_section, current_obj);
current_obj = SspObject.init;
in_object = false;
+ seen_text = false;
}
current_block = "";
continue;
@@ -97,6 +105,7 @@ SspDocument parseSsp(string content) {
current_obj = SspObject.init;
current_obj.section = current_section;
in_object = true;
+ seen_text = false;
parseObjectDeclaration(line, current_obj);
continue;
}
@@ -113,10 +122,11 @@ SspDocument parseSsp(string content) {
if (line.length >= 1 && line[0] == '|') {
if (in_object) {
string text_content = (line.length > 2) ? line[2 .. $] : "";
- if (current_obj.text.length > 0) {
+ if (seen_text) {
current_obj.text ~= "\n" ~ text_content;
} else {
current_obj.text = text_content;
+ seen_text = true;
}
}
continue;