[Boost-commit] svn:boost r65027 - trunk/tools/quickbook/detail

Subject: [Boost-commit] svn:boost r65027 - trunk/tools/quickbook/detail
From: dnljms_at_[hidden]
Date: 2010-08-26 16:53:18

Author: danieljames
Date: 2010-08-26 16:53:14 EDT (Thu, 26 Aug 2010)
New Revision: 65027
URL: http://svn.boost.org/trac/boost/changeset/65027

Log:
Rename overloaded 'parse' methods.

I find them confusing.
Text files modified: 
   trunk/tools/quickbook/detail/actions.cpp   |     2 +-                                      
   trunk/tools/quickbook/detail/actions.hpp   |     2 +-                                      
   trunk/tools/quickbook/detail/quickbook.cpp |    14 +++++++-------                          
   3 files changed, 9 insertions(+), 9 deletions(-)

Modified: trunk/tools/quickbook/detail/actions.cpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.cpp	(original)
+++ trunk/tools/quickbook/detail/actions.cpp	2010-08-26 16:53:14 EDT (Thu, 26 Aug 2010)
@@ -1545,7 +1545,7 @@
         *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.file_string();
 
         // parse the file
-        quickbook::parse(actions.filename.file_string().c_str(), actions, true);
+        quickbook::parse_file(actions.filename.file_string().c_str(), actions, true);
 
         // restore the values
         std::swap(actions.filename, filein);

Modified: trunk/tools/quickbook/detail/actions.hpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.hpp	(original)
+++ trunk/tools/quickbook/detail/actions.hpp	2010-08-26 16:53:14 EDT (Thu, 26 Aug 2010)
@@ -47,7 +47,7 @@
 
     // forward declarations
     struct actions;
-    int parse(char const* filein_, actions& actor, bool ignore_docinfo = false);
+    int parse_file(char const* filein_, actions& actor, bool ignore_docinfo = false);
 
     struct error_action
     {

Modified: trunk/tools/quickbook/detail/quickbook.cpp
==============================================================================
--- trunk/tools/quickbook/detail/quickbook.cpp	(original)
+++ trunk/tools/quickbook/detail/quickbook.cpp	2010-08-26 16:53:14 EDT (Thu, 26 Aug 2010)
@@ -123,7 +123,7 @@
     //
     ///////////////////////////////////////////////////////////////////////////
     int
-    parse(char const* filein_, actions& actor, bool ignore_docinfo)
+    parse_file(char const* filein_, actions& actor, bool ignore_docinfo)
     {
         using std::cerr;
         using std::vector;
@@ -167,11 +167,11 @@
     }
 
     static int
-    parse(char const* filein_, fs::path const& outdir, string_stream& out, bool ignore_docinfo = false)
+    parse_document(char const* filein_, fs::path const& outdir, string_stream& out, bool ignore_docinfo = false)
     {
         actions actor(filein_, outdir, out);
         set_macros(actor);
-        bool r = parse(filein_, actor);
+        bool r = parse_file(filein_, actor);
         if (actor.section_level != 0)
             detail::outwarn(filein_)
                 << "Warning missing [endsect] detected at end of file."
@@ -187,7 +187,7 @@
     }
 
     static int
-    parse(
+    parse_document(
         char const* filein_
       , char const* fileout_
       , int indent
@@ -202,7 +202,7 @@
         if (pretty_print)
         {
             string_stream buffer;
-            result = parse(filein_, outdir, buffer);
+            result = parse_document(filein_, outdir, buffer);
             if (result == 0)
             {
                 result = post_process(buffer.str(), fileout, indent, linewidth);
@@ -211,7 +211,7 @@
         else
         {
             string_stream buffer;
-            result = parse(filein_, outdir, buffer);
+            result = parse_document(filein_, outdir, buffer);
             fileout << buffer.str();
         }
         return result;
@@ -349,7 +349,7 @@
                 << fileout
                 << std::endl;
 
-            return quickbook::parse(filein.c_str(), fileout.c_str(), indent, linewidth, pretty_print);
+            return quickbook::parse_document(filein.c_str(), fileout.c_str(), indent, linewidth, pretty_print);
         }
         else
         {