Merge pull request #3 from docopt/fix-1

Fix #1: Hangs until killed

Author: jaredgrubb

README.rst

@@ -71,12 +71,15 @@ and we have tried to maintain full feature parity (and code structure) as the
 original.
 
 This port is written in C++11 and also requires a good C++11 standard library
-(in particular, one with ``regex`` support). The following compilers should
-be able to handle this:
+(in particular, one with ``regex`` support). The following compilers are known
+to work with docopt:
 
-- clang 3.3
-- gcc 4.9 (If someone can verify this, or provide patches, that would be great!)
-- Visual C++ 2013: will *not* compile this code. Hopefully next year.
+- clang 3.3 and later
+- gcc 4.9
+
+Note that gcc-4.8 will not work due to its missing the ``regex`` module. 
+Note that Visual C++ 2013 will not compile this code, as its C++11 is not
+quite good enough. If a later VC++ works, please let me know!
 
 This port is licensed under the MIT license, just like the original module.
 However, we are also dual-licensing this code under the Boost License, version 1.0,
@@ -436,4 +439,5 @@ Changelog
 **docopt** follows `semantic versioning <http://semver.org>`_.  The
 first release with stable API will be 1.0.0 (soon).
 
-- 0.6.4.1 The initial C++ port of docopt.py
+- 0.6.1 The initial C++ port of docopt.py
+

docopt.cpp

@@ -174,23 +174,33 @@ Option Option::parse(std::string const& option_description)
 	}
 
 	static const std::regex pattern {"(--|-)?(.*?)([,= ]|$)"};
-	std::for_each(std::sregex_iterator{option_description.begin(), options_end, pattern},
-		      std::sregex_iterator{},
-		      [&](std::smatch const& match)
-		      {
-			      if (match[1].matched) {
-				      if (match[1].length()==1) {
-					      shortOption = "-" + match[2].str();
-				      } else {
-					      longOption =  "--" + match[2].str();
-				      }
-			      } else if (match[2].matched && match[2].length()) {
-				      argcount = 1;
-			      } else {
-				      // delimeter
-			      }
-		      });
-	
+	for(std::sregex_iterator i {option_description.begin(), options_end, pattern, std::regex_constants::match_not_null},
+	       e{};
+	    i != e;
+	    ++i)
+	{
+		std::smatch const& match = *i;
+		if (match[1].matched) { // [1] is optional.
+			if (match[1].length()==1) {
+				shortOption = "-" + match[2].str();
+			} else {
+				longOption =  "--" + match[2].str();
+			}
+		} else if (match[2].length() > 0) { // [2] always matches.
+			std::string m = match[2];
+			argcount = 1;
+		} else {
+			// delimeter
+		}
+
+		if (match[3].length() == 0) { // [3] always matches.
+			// Hit end of string. For some reason 'match_not_null' will let us match empty
+			// at the end, and then we'll spin in an infinite loop. So, if we hit an empty
+			// match, we know we must be at the end.
+			break;
+		}
+	}
+
 	if (argcount) {
 		std::smatch match;
 		if (std::regex_search(options_end, option_description.end(),
@@ -537,8 +547,16 @@ std::vector<T*> flat_filter(Pattern& pattern) {
 }
 
 std::vector<std::string> parse_section(std::string const& name, std::string const& source) {
+	// ECMAScript regex only has "?=" for a non-matching lookahead. In order to make sure we always have
+	// a newline to anchor our matching, we have to avoid matching the final newline of each grouping.
+	// Therefore, our regex is adjusted from the docopt Python one to use ?= to match the newlines before
+	// the following lines, rather than after.
 	std::regex const re_section_pattern {
-		"(?:^|\\n)([^\\n]*" + name + "[^\\n]*\\n?(?:[ \\t].*?(?:\\n|$))*)",
+		"(?:^|\\n)"  // anchored at a linebreak (or start of string)
+		"("
+		   "[^\\n]*" + name + "[^\\n]*(?=\\n?)" // a line that contains the name
+		   "(?:\\n[ \\t].*?(?=\\n|$))*"         // followed by any number of lines that are indented
+		")",
 		std::regex::icase
 	};
 
@@ -571,7 +589,7 @@ std::vector<std::string> longOptions(I iter, I end) {
 	std::vector<std::string> ret;
 	std::transform(iter, end,
 		       std::back_inserter(ret),
-		       [](decltype(*iter) const& opt) { return opt->longOption(); });
+		       [](typename I::reference opt) { return opt->longOption(); });
 	return ret;
 }
 

docopt_value.h

@@ -218,7 +218,6 @@ namespace docopt {
 	}
 
 	template <class T>
-	inline
 	void hash_combine(std::size_t& seed, const T& v);
 
 	inline