Merge pull request #52 from cquammen/master

cdunn2001 · cdunn2001 · commit bc8b5d871fcd · 2014-10-11T16:40:51.000-05:00
Removed unneeded newlines from parsed comments
diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
@@ -61,6 +61,9 @@ static std::string readInputTestFile(const char* path) {
 
 static void
 printValueTree(FILE* fout, Json::Value& value, const std::string& path = ".") {
+  if (value.hasComment(Json::commentBefore)) {
+    fprintf(fout, "%s\n", value.getComment(Json::commentBefore).c_str());
+  }
   switch (value.type()) {
   case Json::nullValue:
     fprintf(fout, "%s=null\n", path.c_str());
@@ -117,6 +120,10 @@ printValueTree(FILE* fout, Json::Value& value, const std::string& path = ".") {
   default:
     break;
   }
+
+  if (value.hasComment(Json::commentAfter)) {
+    fprintf(fout, "%s\n", value.getComment(Json::commentAfter).c_str());
+  }
 }
 
 static int parseAndSaveValueTree(const std::string& input,
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -358,8 +358,6 @@ Reader::addComment(Location begin, Location end, CommentPlacement placement) {
     assert(lastValue_ != 0);
     lastValue_->setComment(std::string(begin, end), placement);
   } else {
-    if (!commentsBefore_.empty())
-      commentsBefore_ += "\n";
     commentsBefore_ += std::string(begin, end);
   }
 }
diff --git a/test/data/test_basic_08.expected b/test/data/test_basic_08.expected
@@ -1,2 +1,3 @@
+// C++ style comment
 .=null
 
diff --git a/test/data/test_basic_09.expected b/test/data/test_basic_09.expected
@@ -1,2 +1,4 @@
+/* C style comment
+ */
 .=null
 
diff --git a/test/data/test_comment_02.expected b/test/data/test_comment_02.expected
@@ -1,7 +1,14 @@
 .={}
+/* C-style comment
+
+    C-style-2 comment */
 .c-test={}
 .c-test.a=1
+/* Internal comment c-style */
 .c-test.b=2
+// C++-style comment
 .cpp-test={}
+// Multiline comment cpp-style
+// Second line
 .cpp-test.c=3
 .cpp-test.d=4
diff --git a/test/data/test_comment_02.json b/test/data/test_comment_02.json
@@ -9,7 +9,8 @@
    },
    // C++-style comment
    "cpp-test" : {
-      // Internal comment cpp-style
+      // Multiline comment cpp-style
+      // Second line
       "c" : 3,
       "d" : 4
    }
diff --git a/test/data/test_integer_01.expected b/test/data/test_integer_01.expected
@@ -1 +1,2 @@
+// Max signed integer
 .=2147483647
diff --git a/test/data/test_integer_02.expected b/test/data/test_integer_02.expected
@@ -1 +1,2 @@
+// Min signed integer
 .=-2147483648
diff --git a/test/data/test_integer_03.expected b/test/data/test_integer_03.expected
@@ -1 +1,2 @@
+// Max unsigned integer
 .=4294967295
diff --git a/test/data/test_integer_04.expected b/test/data/test_integer_04.expected
@@ -1,2 +1,3 @@
+// Min unsigned integer
 .=0
 
diff --git a/test/data/test_preserve_comment_01.expected b/test/data/test_preserve_comment_01.expected
@@ -1,3 +1,11 @@
+/* A comment
+   at the beginning of the file.
+ */
 .={}
 .first=1
+/* Comment before 'second'
+ */
 .second=2
+/* A comment at 
+   the end of the file.
+ */
diff --git a/test/data/test_real_01.expected b/test/data/test_real_01.expected
@@ -1,2 +1,3 @@
+// 2^33 => out of integer range, switch to double
 .=8589934592
 
diff --git a/test/data/test_real_02.expected b/test/data/test_real_02.expected
@@ -1,2 +1,3 @@
+// -2^32 => out of signed integer range, switch to double
 .=-4294967295
 
diff --git a/test/data/test_real_03.expected b/test/data/test_real_03.expected
@@ -1,2 +1,3 @@
+// -2^32 => out of signed integer range, switch to double
 .=-4294967295
 
diff --git a/test/data/test_real_04.expected b/test/data/test_real_04.expected
@@ -1,2 +1,3 @@
+// 1.2345678
 .=1.2345678
 
diff --git a/test/data/test_real_05.expected b/test/data/test_real_05.expected
@@ -1,3 +1,4 @@
+// 1234567.8
 .=1234567.8
 
 
diff --git a/test/data/test_real_06.expected b/test/data/test_real_06.expected
@@ -1,3 +1,4 @@
+// -1.2345678
 .=-1.2345678
 
 
diff --git a/test/data/test_real_07.expected b/test/data/test_real_07.expected
@@ -1,3 +1,4 @@
+// -1234567.8
 .=-1234567.8
 
 
diff --git a/test/data/test_real_08.expected b/test/data/test_real_08.expected
@@ -1 +1,4 @@
+// Out of 32-bit integer range, switch to double in 32-bit mode. Length the
+// same as UINT_MAX in base 10 and digit less than UINT_MAX's last digit in
+// order to catch a bug in the parsing code.
 .=4300000001
diff --git a/test/data/test_real_09.expected b/test/data/test_real_09.expected
@@ -1 +1,4 @@
+// Out of 64-bit integer range, switch to double in all modes. Length the same
+// as ULONG_MAX in base 10 and digit less than ULONG_MAX's last digit in order
+// to catch a bug in the parsing code.
 .=1.9e+19
diff --git a/test/data/test_real_10.expected b/test/data/test_real_10.expected
@@ -1 +1,4 @@
+// Out of 32-bit signed integer range, switch to double in all modes. Length
+// the same as INT_MIN in base 10 and digit less than INT_MIN's last digit in
+// order to catch a bug in the parsing code.
 .=-2200000001
diff --git a/test/data/test_real_11.expected b/test/data/test_real_11.expected
@@ -1 +1,4 @@
+// Out of 64-bit signed integer range, switch to double in all modes. Length
+// the same as LONG_MIN in base 10 and digit less than LONG_MIN's last digit in
+// order to catch a bug in the parsing code.
 .=-9.3e+18
diff --git a/test/data/test_real_12.expected b/test/data/test_real_12.expected
@@ -1 +1,2 @@
+// 2^64 -> switch to double.
 .=1.844674407370955e+19

Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,6 @@ Reader::addComment(Location begin, Location end, CommentPlacement placement) {`
`358`	`358`	`assert(lastValue_ != 0);`
`359`	`359`	`lastValue_->setComment(std::string(begin, end), placement);`
`360`	`360`	`} else {`
`361`		`- if (!commentsBefore_.empty())`
`362`		`- commentsBefore_ += "\n";`
`363`	`361`	`commentsBefore_ += std::string(begin, end);`
`364`	`362`	`}`
`365`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+// C++ style comment`
`1`	`2`	`.=null`
`2`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,4 @@`
	`1`	`+/* C style comment`
	`2`	`+ */`
`1`	`3`	`.=null`
`2`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+// Max signed integer`
`1`	`2`	`.=2147483647`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+// Min signed integer`
`1`	`2`	`.=-2147483648`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+// Max unsigned integer`
`1`	`2`	`.=4294967295`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+// Min unsigned integer`
`1`	`2`	`.=0`
`2`	`3`