Branch at revision 46530

[SVN r46531]

CMakeLists.txt

@@ -1,22 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    program_options.hpp
-    program_options
-)
-
-# Add a library target to the build system
-boost_library_project(
-  program_options
-  SRCDIRS  src
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "Access to configuration data given on command line, in config files and other sources."
-  MODULARIZED
-  AUTHORS  "Vladimir Prus <ghost -at- cs.msu.su>"
-  #  MAINTAINERS 
-)
-
-

doc/Jamfile.v2

@@ -5,7 +5,6 @@ toolset.using doxygen ;
 boostbook program_option 
     : program_options.xml 
     : <implicit-dependency>autodoc 
-      <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
     ;
 
 doxygen autodoc 

module.cmake

@@ -1,3 +0,0 @@
-boost_module(program_options DEPENDS any bind smart_ptr tokenizer)
-
-# bind is needed because of a dependency on boost/mem_fn.hpp

src/CMakeLists.txt

@@ -1,5 +0,0 @@
-boost_add_library(boost_program_options
-  cmdline.cpp config_file.cpp options_description.cpp parsers.cpp 
-  variables_map.cpp value_semantic.cpp positional_options.cpp 
-  utf8_codecvt_facet.cpp convert.cpp winmain.cpp
-  SHARED_COMPILE_FLAGS "-DBOOST_PROGRAM_OPTIONS_DYN_LINK=1")

src/cmdline.cpp

@@ -23,7 +23,6 @@
 #include <cassert>
 #include <cstring>
 #include <cctype>
-#include <climits>
 
 #include <cstdio>
 
@@ -255,62 +254,6 @@ namespace boost { namespace program_options { namespace detail {
             }
         }
 
-        /* If an key option is followed by a positional option,
-           can can consume more tokens (e.g. it's multitoke option),
-           give those tokens to it.  */
-        vector<option> result2;
-        for (unsigned i = 0; i < result.size(); ++i)
-        {
-            result2.push_back(result[i]);
-            option& opt = result2.back();
-
-            if (opt.string_key.empty())
-                continue;
-
-            const option_description* xd = 
-                m_desc->find_nothrow(opt.string_key, 
-                                     (m_style & allow_guessing));
-            if (!xd)
-                continue;
-
-            unsigned min_tokens = xd->semantic()->min_tokens();
-            unsigned max_tokens = xd->semantic()->max_tokens();
-            if (min_tokens < max_tokens && opt.value.size() < max_tokens)
-            {
-                // This option may grab some more tokens.
-                // We only allow to grab tokens that are not already
-                // recognized as key options.
-
-                int can_take_more = max_tokens - opt.value.size();
-                unsigned j = i+1;
-                for (; can_take_more && j < result.size(); --can_take_more, ++j)
-                {
-                    option& opt2 = result[j];
-                    if (!opt2.string_key.empty())
-                        break;
-
-                    if (opt2.position_key == INT_MAX)
-                    {
-                        // We use INT_MAX to mark positional options that
-                        // were found after the '--' terminator and therefore
-                        // should stay positional forever.
-                        break;
-                    }
-
-                    assert(opt2.value.size() == 1);
-                    
-                    opt.value.push_back(opt2.value[0]);
-
-                    assert(opt2.original_tokens.size() == 1);
-
-                    opt.original_tokens.push_back(opt2.original_tokens[0]);
-                }
-                i = j-1;
-            }
-        }
-        result.swap(result2);
-        
-
         // Assign position keys to positional options.
         int position_key = 0;
         for(unsigned i = 0; i < result.size(); ++i) {
@@ -384,21 +327,18 @@ namespace boost { namespace program_options { namespace detail {
                     invalid_command_line_syntax::extra_parameter);                                                                
             }
             
-            // If an option wants, at minimum, N tokens, we grab them
-            // there and don't care if they look syntactically like an
-            // option.
+            max_tokens -= opt.value.size();
 
-            if (opt.value.size() <= min_tokens)
-            {
-                min_tokens -= opt.value.size();
-            }
-            else
-            {
-                min_tokens = 0;
-            }
+            // A value is optional if min_tokens == 0, but max_tokens > 0.
+            // If a value is optional, it must appear in opt.value (because
+            // it was 'adjacent'.  Otherwise, remove the expectation of a
+            // non-adjacent value.  (For now, we just check max_tokens == 1,
+            // as there is no current support for max_tokens>1)
+            if (min_tokens == 0 && max_tokens == 1 && opt.value.empty())
+                --max_tokens;
 
             // Everything's OK, move the values to the result.            
-            for(;!other_tokens.empty() && min_tokens--; ) {
+            for(;!other_tokens.empty() && max_tokens--; ) {
                 opt.value.push_back(other_tokens[0]);
                 opt.original_tokens.push_back(other_tokens[0]);
                 other_tokens.erase(other_tokens.begin());
@@ -552,8 +492,6 @@ namespace boost { namespace program_options { namespace detail {
             {
                 option opt;
                 opt.value.push_back(args[i]);
-                opt.original_tokens.push_back(args[i]);
-                opt.position_key = INT_MAX;
                 result.push_back(opt);
             }
             args.clear();

test/CMakeLists.txt

@@ -1,21 +0,0 @@
-boost_additional_test_dependencies(program_options BOOST_DEPENDS test)
-
-set(PROGRAM_OPTIONS_LIBRARIES
-  boost_program_options
-  boost_test_exec_monitor)
-
-macro(program_options_test_run TESTNAME)
-  boost_test_run(${TESTNAME} 
-    DEPENDS boost_program_options boost_test_exec_monitor STATIC)
-  boost_test_run("${TESTNAME}_dll"
-    "${TESTNAME}.cpp"
-    DEPENDS boost_program_options boost_test_exec_monitor-static SHARED)
-endmacro(program_options_test_run)
-
-program_options_test_run(options_description_test) 
-program_options_test_run(parsers_test)
-program_options_test_run(variable_map_test)
-program_options_test_run(cmdline_test)
-program_options_test_run(positional_options_test)
-program_options_test_run(unicode_test) 
-program_options_test_run(winmain) 

test/parsers_test.cpp

@@ -146,52 +146,8 @@ void test_command_line()
     variables_map vm;
     po::store(po::parse_command_line(3, cmdline4, desc2), vm);
 
-    char* cmdline5[] = {"", "-p7", "-o", "1", "2", "3", "-x8"};
-    options_description desc3;
-    desc3.add_options()
-        (",p", po::value<string>())
-        (",o", po::value<string>()->multitoken())
-        (",x", po::value<string>())
-        ;
-    vector<option> a5 = 
-        parse_command_line(7, cmdline5, desc3, 0, additional_parser).options;
-    BOOST_CHECK_EQUAL(a5.size(), 3u);
-    check_value(a5[0], "-p", "7");
-    BOOST_REQUIRE(a5[1].value.size() == 3);
-    BOOST_CHECK_EQUAL(a5[1].string_key, "-o");
-    BOOST_CHECK_EQUAL(a5[1].value[0], "1");
-    BOOST_CHECK_EQUAL(a5[1].value[1], "2");
-    BOOST_CHECK_EQUAL(a5[1].value[2], "3");
-    check_value(a5[2], "-x", "8");   
 
 
-    po::options_description desc4( "" );
-    desc4.add_options()
-        ( "multitoken,m",
-          po::value< std::vector< std::string > >()->multitoken(),
-          "values"
-            )
-        ( "file",
-          po::value< std::string >(),
-          "the file to process"
-            )
-        ;
-
-    po::positional_options_description p;
-    p.add( "file", 1 );
-
-    char* cmdline6[] = {"", "-m", "token1", "token2", "--", "some_file"};
-    vector<option> a6 = 
-        command_line_parser(6, cmdline6).options(desc4).positional(p)
-        .run().options;
-    BOOST_CHECK_EQUAL(a6.size(), 2u);
-    BOOST_REQUIRE(a6[0].value.size() == 2);
-    BOOST_CHECK_EQUAL(a6[0].string_key, "multitoken");
-    BOOST_CHECK_EQUAL(a6[0].value[0], "token1");
-    BOOST_CHECK_EQUAL(a6[0].value[1], "token2");
-    BOOST_CHECK_EQUAL(a6[1].string_key, "file");
-    BOOST_REQUIRE(a6[1].value.size() == 1);
-    BOOST_CHECK_EQUAL(a6[1].value[0], "some_file");
 }
 
 void test_config_file()

test/variable_map_test.cpp

@@ -96,11 +96,8 @@ void test_variable_map()
     ("imp", po::value<int>()->implicit_value(100))
     ("iim", po::value<int>()->implicit_value(200)->default_value(201))
     ("mmp,m", po::value<int>()->implicit_value(123)->default_value(124))
-    ("foo", po::value<int>())
     ;
-    /* The -m option is implicit. It does not have value in inside the token,
-       and we should not grab the next token.  */
-    char* cmdline6_[] = {  "--imp=1", "-m", "--foo=1" };
+    char* cmdline6_[] = {  "--imp=1", "-m" };
     vector<string> cmdline6 = sv(cmdline6_,
                                  sizeof(cmdline6_)/sizeof(cmdline6_[0]));
     parsed_options a6 = command_line_parser(cmdline6).options(desc3).run();
@@ -108,7 +105,7 @@ void test_variable_map()
     variables_map vm4;
     store(a6, vm4);
     notify(vm4);
-    BOOST_REQUIRE(vm4.size() == 4);
+    BOOST_REQUIRE(vm4.size() == 3);
     BOOST_CHECK(vm4["imp"].as<int>() == 1);
     BOOST_CHECK(vm4["iim"].as<int>() == 201);
     BOOST_CHECK(vm4["mmp"].as<int>() == 123);