Page MenuHomePhabricator
Files F15430745

D19675.diff
No OneTemporary
Actions

D19675.diff
View Options

diff --git a/src/parser/argument/PhutilArgumentParser.php b/src/parser/argument/PhutilArgumentParser.php
--- a/src/parser/argument/PhutilArgumentParser.php
+++ b/src/parser/argument/PhutilArgumentParser.php
@@ -110,17 +110,22 @@
*
* @param list List of argument specs, see
* @{class:PhutilArgumentSpecification}.
+ * @param bool Require flags appear before any non-flag arguments.
* @return this
* @task parse
*/
- public function parsePartial(array $specs) {
- return $this->parseInternal($specs, false);
+ public function parsePartial(array $specs, $initial_only = false) {
+ return $this->parseInternal($specs, false, $initial_only);
}
/**
* @return this
*/
- private function parseInternal(array $specs, $correct_spelling) {
+ private function parseInternal(
+ array $specs,
+ $correct_spelling,
+ $initial_only) {
+
$specs = PhutilArgumentSpecification::newSpecsFromList($specs);
$this->mergeSpecs($specs);
@@ -130,6 +135,7 @@
$argv = $this->argv;
$len = count($argv);
+ $is_initial = true;
for ($ii = 0; $ii < $len; $ii++) {
$arg = $argv[$ii];
$map = null;
@@ -151,6 +157,8 @@
$pre = '-';
$arg = substr($arg, 1);
$map = $specs_by_short;
+ } else {
+ $is_initial = false;
}
if ($map) {
@@ -182,6 +190,14 @@
}
if (isset($map[$arg])) {
+ if ($initial_only && !$is_initial) {
+ throw new PhutilArgumentUsageException(
+ pht(
+ 'Argument "%s" appears after the first non-flag argument. '.
+ 'This special argument must appear before other arguments.',
+ "{$pre}{$arg}"));
+ }
+
$spec = $map[$arg];
unset($argv[$ii]);
@@ -282,7 +298,7 @@
* @task parse
*/
public function parseFull(array $specs) {
- $this->parseInternal($specs, true);
+ $this->parseInternal($specs, true, false);
if (count($this->argv)) {
$arg = head($this->argv);
@@ -578,6 +594,11 @@
return $this->argv;
}
+ public function setUnconsumedArgumentVector(array $argv) {
+ $this->argv = $argv;
+ return $this;
+ }
+
/* -( Command Help )------------------------------------------------------- */

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 8:45 AM (1 d, 20 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7613364
Default Alt Text
D19675.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility