- don't simplify (aka remove extra whitespace from) comment texts

Mon, 28 Apr 2014 17:56:51 +0300

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Mon, 28 Apr 2014 17:56:51 +0300
changeset 746
893c43b337dd
parent 745
ab8adddc0f5c
child 747
17a854ef4412

- don't simplify (aka remove extra whitespace from) comment texts

src/ldDocument.cc file | annotate | diff | comparison | revisions
--- a/src/ldDocument.cc	Mon Apr 28 17:50:42 2014 +0300
+++ b/src/ldDocument.cc	Mon Apr 28 17:56:51 2014 +0300
@@ -850,13 +850,14 @@
 			case 0:
 			{
 				// Comment
-				String comm = line.mid (line.indexOf ("0") + 1).simplified();
+				String commentText (line.mid (line.indexOf ("0") + 2));
+				String commentTextSimplified (commentText.simplified());
 
 				// Handle BFC statements
 				if (tokens.size() > 2 && tokens[1] == "BFC")
 				{
 					for (int i = 0; i < LDBFC::NumStatements; ++i)
-						if (comm == format ("BFC %1", LDBFC::k_statementStrings [i]))
+						if (commentTextSimplified == format ("BFC %1", LDBFC::k_statementStrings [i]))
 							return new LDBFC ( (LDBFC::Statement) i);
 
 					// MLCAD is notorious for stuffing these statements in parts it
@@ -864,7 +865,7 @@
 					// need to handle MLCAD-style invertnext, clip and noclip separately.
 					struct
 					{
-						String			a;
+						String				a;
 						LDBFC::Statement	b;
 					} BFCData[] =
 					{
@@ -874,7 +875,7 @@
 					};
 
 					for (const auto& i : BFCData)
-						if (comm == "BFC CERTIFY " + i.a)
+						if (commentTextSimplified == "BFC CERTIFY " + i.a)
 							return new LDBFC (i.b);
 				}
 
@@ -909,7 +910,7 @@
 
 				// Just a regular comment:
 				LDComment* obj = new LDComment;
-				obj->setText (comm);
+				obj->setText (commentText);
 				return obj;
 			}
 

mercurial