end
# Consume parameters for this option
- protected fun read_param(it: Iterator[String])
+ protected fun read_param(opts: OptionContext, it: Iterator[String])
do
read = true
end
# Init a new OptionBool with a `help` message and `names`.
init(help: String, names: String...) is old_style_init do super(help, false, names)
- redef fun read_param(it)
+ redef fun read_param(opts, it)
do
super
value = true
# Init a new OptionCount with a `help` message and `names`.
init(help: String, names: String...) is old_style_init do super(help, 0, names)
- redef fun read_param(it)
+ redef fun read_param(opts, it)
do
super
value += 1
protected fun convert(str: String): VALUE is abstract
# Is the parameter mandatory?
- var parameter_mandatory: Bool = true is writable
+ var parameter_mandatory = true is writable
- redef fun read_param(it)
+ redef fun read_param(opts, it)
do
super
- if it.is_ok and (it.item.is_empty or it.item.chars.first != '-') then
+
+ var ok = it.is_ok
+ if ok and not parameter_mandatory and not it.item.is_empty and it.item.chars.first == '-' then
+ # The next item may looks like a known command
+ # Only check if `not parameter_mandatory`
+ for opt in opts.options do
+ if opt.names.has(it.item) then
+ # The next item is a known command
+ ok = false
+ break
+ end
+ end
+ end
+
+ if ok then
value = convert(it.item)
it.next
else
- if parameter_mandatory then
- errors.add("Parameter expected for option {names.first}.")
- end
+ errors.add("Parameter expected for option {names.first}.")
end
end
end
var rest = new Array[String]
# Errors found in the context after parsing
- var errors = new Array[String]
+ var context_errors = new Array[String]
private var optmap = new HashMap[String, Option]
it.next
next_called = true
end
- option.read_param(it)
+ option.read_param(self, it)
end
end
if not next_called then it.next
if optmap.has_key(str) then
var opt = optmap[str]
it.next
- opt.read_param(it)
+ opt.read_param(self, it)
else
rest.add(it.item)
it.next
for opt in options do
if opt.mandatory and not opt.read then
- errors.add("Mandatory option {opt.names.join(", ")} not found.")
+ context_errors.add("Mandatory option {opt.names.join(", ")} not found.")
end
end
end
end
# Options parsing errors.
- fun get_errors: Array[String]
+ fun errors: Array[String]
do
var errors = new Array[String]
- errors.add_all(errors)
+ errors.add_all context_errors
for o in options do
for e in o.errors do
errors.add(e)