Merge branch 'master' of github.com:perl6/nqp into loop_labels

Raku · Apr 25, 2014 · 47ab859 · 47ab859
2 parents 156b5cc + b596f16
commit 47ab859
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/HLL/CommandLine.nqp b/src/HLL/CommandLine.nqp
@@ -257,9 +257,10 @@ class HLL::CommandLine::Parser {
                             if %!options{$o} {
                                 if self.wants-value($o) {
                                     if $i + 1 == $len {
-                                        nqp::die("Option '$o' in grouped options '-$opt' needs a value, but does not have one");
+                                        $result.add-option($o, get-value("-$o"));
+                                    } else {
+                                        $result.add-option($o, nqp::substr($opt, $i + 1));
                                     }
-                                    $result.add-option($o, nqp::substr($opt, $i + 1));
                                     last;
                                 }
                                 else {

diff --git a/tools/build/MOAR_REVISION b/tools/build/MOAR_REVISION
@@ -1 +1 @@
-2014.04-26-g73f8fe1
+2014.04-29-ga109e8d