[Boost-commit] svn:boost r86643 - trunk/tools/quickbook/src

Subject: [Boost-commit] svn:boost r86643 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2013-11-12 04:15:18

Author: danieljames
Date: 2013-11-12 04:15:17 EST (Tue, 12 Nov 2013)
New Revision: 86643
URL: http://svn.boost.org/trac/boost/changeset/86643

Log:
Rename path_details to path_parameter.

Text files modified: 
   trunk/tools/quickbook/src/actions.cpp       |     9 +++++----                               
   trunk/tools/quickbook/src/include_paths.cpp |    11 ++++++-----                             
   trunk/tools/quickbook/src/include_paths.hpp |     8 ++++----                                
   3 files changed, 15 insertions(+), 13 deletions(-)

Modified: trunk/tools/quickbook/src/actions.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions.cpp	Tue Nov 12 04:14:56 2013	(r86642)
+++ trunk/tools/quickbook/src/actions.cpp	2013-11-12 04:15:17 EST (Tue, 12 Nov 2013)	(r86643)
@@ -1769,9 +1769,9 @@
 
     xinclude_path calculate_xinclude_path(value const& p, quickbook::state& state)
     {
-        path_details details = check_path(p, state);
+        path_parameter parameter = check_path(p, state);
 
-        fs::path path = detail::generic_to_path(details.value);
+        fs::path path = detail::generic_to_path(parameter.value);
         fs::path full_path = path;
 
         // If the path is relative
@@ -1900,10 +1900,11 @@
 
         value_consumer values = include;
         value include_doc_id = values.optional_consume(general_tags::include_id);
-        path_details details = check_path(values.consume(), state);
+        path_parameter parameter = check_path(values.consume(), state);
         values.finish();
 
-        std::set<include_search_return> search = include_search(details, state, first);
+        std::set<include_search_return> search =
+            include_search(parameter, state, first);
         std::set<include_search_return>::iterator i = search.begin();
         std::set<include_search_return>::iterator e = search.end();
         for (; i != e; ++i)

Modified: trunk/tools/quickbook/src/include_paths.cpp
==============================================================================
--- trunk/tools/quickbook/src/include_paths.cpp	Tue Nov 12 04:14:56 2013	(r86642)
+++ trunk/tools/quickbook/src/include_paths.cpp	2013-11-12 04:15:17 EST (Tue, 12 Nov 2013)	(r86643)
@@ -23,7 +23,7 @@
     // check_path
     //
 
-    path_details check_path(value const& path, quickbook::state& state)
+    path_parameter check_path(value const& path, quickbook::state& state)
     {
         // Paths are encoded for quickbook 1.6+ and also xmlbase
         // values (technically xmlbase is a 1.6 feature, but that
@@ -54,19 +54,20 @@
             boost::replace(path_text, '\\', '/');
         }
 
-        return path_details(path_text, path_details::path);
+        return path_parameter(path_text, path_parameter::path);
     }
 
     //
     // Search include path
     //
 
-    std::set<include_search_return> include_search(path_details const& details,
+    std::set<include_search_return> include_search(
+            path_parameter const& parameter,
             quickbook::state& state, string_iterator pos)
     {
         std::set<include_search_return> result;
 
-        fs::path path = detail::generic_to_path(details.value);
+        fs::path path = detail::generic_to_path(parameter.value);
 
         // If the path is relative, try and resolve it.
         if (!path.has_root_directory() && !path.has_root_name())
@@ -104,7 +105,7 @@
 
         detail::outerr(state.current_file, pos)
             << "Unable to find file: "
-            << details.value
+            << parameter.value
             << std::endl;
         ++state.error_count;
 

Modified: trunk/tools/quickbook/src/include_paths.hpp
==============================================================================
--- trunk/tools/quickbook/src/include_paths.hpp	Tue Nov 12 04:14:56 2013	(r86642)
+++ trunk/tools/quickbook/src/include_paths.hpp	2013-11-12 04:15:17 EST (Tue, 12 Nov 2013)	(r86643)
@@ -23,18 +23,18 @@
 
 namespace quickbook
 {
-    struct path_details {
+    struct path_parameter {
         // Will possibly add 'url' and 'glob' to this list later:
         enum path_type { path };
 
         std::string value;
         path_type type;
 
-        path_details(std::string const& value, path_type type) :
+        path_parameter(std::string const& value, path_type type) :
             value(value), type(type) {}
     };
 
-    path_details check_path(value const& path, quickbook::state& state);
+    path_parameter check_path(value const& path, quickbook::state& state);
 
     struct include_search_return
     {
@@ -47,7 +47,7 @@
         bool operator<(include_search_return const& other) const;
     };
 
-    std::set<include_search_return> include_search(path_details const& details,
+    std::set<include_search_return> include_search(path_parameter const&,
             quickbook::state& state, string_iterator pos);
 }