Remove trailing whitespace from error messages

Fix for bug #867

src/context.h

@@ -101,10 +101,10 @@ public:
   }
 
   void warning(const string& what) const {
-    warning_func(location() + what);
+    warning_func(location() + " " + what);
   }
   void warning(const boost::format& what) const {
-    warning_func(location() + string(what.str()));
+    warning_func(location() + " " + string(what.str()));
   }
 };
 

src/convert.cc

@@ -86,7 +86,7 @@ value_t convert_command(call_scope_t& args)
       if (entry != journal.checksum_map.end()) {
         INFO(file_context(reader.get_pathname(),
                           reader.get_linenum())
-             << "Ignoring known UUID " << ref);
+             << " " << "Ignoring known UUID " << ref);
         checked_delete(xact);     // ignore it
         continue;
       }

src/error.cc

@@ -49,7 +49,7 @@ string error_context()
 string file_context(const path& file, const std::size_t line)
 {
   std::ostringstream buf;
-  buf << '"' << file.string() << "\", line " << line << ": ";
+  buf << '"' << file.string() << "\", line " << line << ":";
   return buf.str();
 }
 

test/baseline/cmd-source.test

@@ -28,29 +28,29 @@
 
 test source -> 7
 __ERROR__
-While parsing file "$FILE", line 1: 
+While parsing file "$FILE", line 1:
 While parsing periodic transaction:
 > ~ xxx
 Error: Unexpected date period token 'xxx'
-While parsing file "$FILE", line 6: 
+While parsing file "$FILE", line 6:
 Error: Only one posting with null amount allowed per transaction
-While parsing file "$FILE", line 11: 
+While parsing file "$FILE", line 11:
 Error: Only one posting with null amount allowed per transaction
-While parsing file "$FILE", line 13: 
+While parsing file "$FILE", line 13:
 While parsing transaction:
 > 2012/03/xx
 Error: Invalid date: 2012/03/xx
-While parsing file "$FILE", line 18: 
+While parsing file "$FILE", line 18:
 While parsing posting:
   G               AAA
                   ^^^
 Error: No quantity specified for amount
-While parsing file "$FILE", line 22: 
+While parsing file "$FILE", line 22:
 While parsing posting:
   I             1,00.00 EUR
                 ^^^^^^^^^^^
 Error: Incorrect use of thousand-mark comma
-While parsing file "$FILE", line 27: 
+While parsing file "$FILE", line 27:
 While balancing transaction from "$FILE", lines 25-27:
 > 2012-03-27 * Test
 >     K              100.00 EUR

test/baseline/dir-alias-fail.test

@@ -7,6 +7,6 @@ alias Foo=Foo
    Bar
 test source -> 1
 __ERROR__
-While parsing file "$FILE", line 3: 
+While parsing file "$FILE", line 3:
 Error: Illegal alias Foo=Foo
 end test

test/baseline/dir-commodity.test

@@ -12,7 +12,7 @@ commodity GBP
 
 test bal --pedantic -> 1
 __ERROR__
-While parsing file "$FILE", line 10: 
+While parsing file "$FILE", line 10:
 While parsing posting:
   A            20.00 EUR
                ^^^^^^^^^

test/baseline/opt-pedantic.test

@@ -8,7 +8,7 @@
 
 test bal --pedantic -> 1
 __ERROR__
-While parsing file "$FILE", line 2: 
+While parsing file "$FILE", line 2:
 While parsing posting:
   Expenses:Phone            20.00 GBP
 

test/regress/15A80F68.test

@@ -6,7 +6,7 @@
 
 test bal -> 1
 __ERROR__
-While parsing file "$FILE", line 4: 
+While parsing file "$FILE", line 4:
 While parsing posting:
   A                          (2 FOO @ 10.00 EUR) = 20.00 EUR
                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

test/regress/1A546C4D.test

@@ -4,7 +4,7 @@
 
 test bal -> 1
 __ERROR__
-While parsing file "$FILE", line 2: 
+While parsing file "$FILE", line 2:
 While parsing posting:
   Assets:Cash                   $1,00.00
                                 ^^^^^^^^

test/regress/2E3496BD.test

@@ -6,7 +6,7 @@ D 1,000.00 USD
 
 test bal -> 1
 __ERROR__
-While parsing file "$FILE", line 5: 
+While parsing file "$FILE", line 5:
 While balancing transaction from "$FILE", lines 3-5:
 > 2007-12-31 * Start of year / Opening balances.
 >   Account1   1000 EUR @ 1.6 USD

test/regress/5D92A5EB.test

@@ -14,7 +14,7 @@
 
 test -J reg checking -> 1
 __ERROR__
-While parsing file "$FILE", line 13: 
+While parsing file "$FILE", line 13:
 While parsing periodic transaction:
 > ~ Monthly from 2010/7/1
 >     Expenses:Auto:Gas               $100.00

test/regress/6188B0EC.test

@@ -4,7 +4,7 @@
 
 test bal -> 1
 __ERROR__
-While parsing file "$FILE", line 3: 
+While parsing file "$FILE", line 3:
 Error: File to include was not found: "$sourcepath/test/regress/6188B0EC-does-not-exist.dat"
 end test
 

test/regress/8EAF77C0.test

@@ -12,6 +12,6 @@
 
 test reg -> 1
 __ERROR__
-While parsing file "$FILE", line 5: 
+While parsing file "$FILE", line 5:
 Error: Unexpected whitespace at beginning of line
 end test

test/regress/BF3C1F82-2.test

@@ -2,11 +2,11 @@
 include non-existent-ledger-file-BF3C1F82
 test -f - reg -> 1
 __ERROR__
-While parsing file "", line 2: 
+While parsing file "", line 2:
 Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
 end test
 test -f /dev/stdin reg -> 1
 __ERROR__
-While parsing file "", line 2: 
+While parsing file "", line 2:
 Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
 end test

test/regress/BF3C1F82.test

@@ -5,14 +5,14 @@
   b
 test -f - reg -> 1
 __ERROR__
-While parsing file "", line 3: 
+While parsing file "", line 3:
 While parsing transaction:
 <no source context>
 Error: Day of month is not valid for year
 end test
 test -f /dev/stdin reg -> 1
 __ERROR__
-While parsing file "", line 3: 
+While parsing file "", line 3:
 While parsing transaction:
 <no source context>
 Error: Day of month is not valid for year

test/regress/D51BFF74.test

@@ -16,7 +16,7 @@
 
 test reg -> 1
 __ERROR__
-While parsing file "$FILE", line 6: 
+While parsing file "$FILE", line 6:
 While parsing posting:
   Expenses:Food                              $- 20
                                              ^^^^^

test/regress/D9C8EB08.test

@@ -10,7 +10,7 @@
 
 test bal -> 1
 __ERROR__
-While parsing file "$FILE", line 9: 
+While parsing file "$FILE", line 9:
 Error: 'end' or 'end apply' found, but no enclosing 'apply' directive
 end test
 

test/regress/DDB54BB8.test

@@ -4,7 +4,7 @@
 
 test bal -> 1
 __ERROR__
-While parsing file "$FILE", line 3: 
+While parsing file "$FILE", line 3:
 Unbalanced remainder is:
               -0,10€
 Amount to balance against:

test/regress/error-in-include.test

@@ -3,8 +3,8 @@
 
 test bal -> 1
 __ERROR__
-In file included from "$FILE", line 2: 
-While parsing file "$sourcepath/test/regress/error-in-include.dat", line 4: 
+In file included from "$FILE", line 2:
+While parsing file "$sourcepath/test/regress/error-in-include.dat", line 4:
 While balancing transaction from "$sourcepath/test/regress/error-in-include.dat", lines 2-4:
 > 2014-05-13 * Does not balance
 >     A              $10.00