Moved error code into error.h.

3 files changed, 91 insertions, 35 deletions

diff --git a/Makefile.am b/Makefile.am
index 5ee1c4d7..ac633fce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ lib_cppflags  = -I$(srcdir)/src -I$(srcdir)/lib	\
 
 libledger_util_la_SOURCES =			\
 	src/utils.cc				\
+	src/error.cc				\
 	src/times.cc				\
 	src/mask.cc				\
 	src/stream.cc				\
diff --git a/src/error.cc b/src/error.cc
new file mode 100644
index 00000000..8fc8fa53
--- /dev/null
+++ b/src/error.cc
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2003-2009, John Wiegley.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of New Artisans LLC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "utils.h"
+
+namespace ledger {
+
+std::ostringstream _desc_buffer;
+std::ostringstream _ctxt_buffer;
+
+string error_context()
+{
+  string context = _ctxt_buffer.str();
+  _ctxt_buffer.str("");
+  return context;
+}
+
+string file_context(const path& file, std::size_t line)
+{
+  std::ostringstream buf;
+  buf << "\"" << file << "\", line " << line << ": ";
+  return buf.str();
+}
+
+string line_context(const string&    line,
+		    istream_pos_type pos,
+		    istream_pos_type end_pos)
+{
+  std::ostringstream buf;
+  buf << "  " << line << "\n";
+
+  if (pos != istream_pos_type(0)) {
+    buf << "  ";
+    if (end_pos == istream_pos_type(0)) {
+      for (istream_pos_type i = 0; i < pos; i += 1)
+	buf << " ";
+      buf << "^";
+    } else {
+      for (istream_pos_type i = 0; i < end_pos; i += 1) {
+	if (i >= pos)
+	  buf << "^";
+	else
+	  buf << " ";
+      }
+    }
+  }
+  return buf.str();
+}
+
+void report_error(const std::exception& err)
+{
+  std::cerr << error_context() << std::endl
+	    << "Error: " << err.what() << std::endl;
+}
+
+} // namespace ledger
diff --git a/src/error.h b/src/error.h
index 0f128b4e..d61490aa 100644
--- a/src/error.h
+++ b/src/error.h
@@ -65,43 +65,14 @@ extern std::ostringstream _ctxt_buffer;
   ((long(_ctxt_buffer.tellp()) == 0) ?				\
    (_ctxt_buffer << msg) : (_ctxt_buffer << std::endl << msg))
 
-inline string error_context() {
-  string context = _ctxt_buffer.str();
-  _ctxt_buffer.str("");
-  return context;
-}
-
-inline string file_context(const path& file, std::size_t line) {
-  std::ostringstream buf;
-  buf << "\"" << file << "\", line " << line << ": ";
-  return buf.str();
-}
+string error_context();
 
-inline string line_context(const string&    line,
-			   istream_pos_type pos     = istream_pos_type(0),
-			   istream_pos_type end_pos = istream_pos_type(0))
-{
-  std::ostringstream buf;
-  buf << "  " << line << "\n";
+string file_context(const path& file, std::size_t line);
+string line_context(const string&    line,
+		    istream_pos_type pos     = istream_pos_type(0),
+		    istream_pos_type end_pos = istream_pos_type(0));
 
-  if (pos != istream_pos_type(0)) {
-    buf << "  ";
-    if (end_pos == istream_pos_type(0)) {
-      for (istream_pos_type i = 0; i < pos; i += 1)
-	buf << " ";
-      buf << "^\n";
-    } else {
-      for (istream_pos_type i = 0; i < end_pos; i += 1) {
-	if (i >= pos)
-	  buf << "^";
-	else
-	  buf << " ";
-      }
-      buf << '\n';
-    }
-  }
-  return buf.str();
-}
+void report_error(const std::exception& err);
 
 #define DECLARE_EXCEPTION(name, kind)				\
   class name : public kind {					\