rta: add `live_methods_to_tree` to provide human-readable infos on methods

[nit.git] / lib / opts.nit

diff --git a/lib/opts.nit b/lib/opts.nit
index 11c2ccc..ec3c006 100644 (file)
--- a/lib/opts.nit
+++ b/lib/opts.nit
@@ -138,12 +138,12 @@ abstract class OptionParameter
        redef fun read_param(it)
        do
                super
-               if it.is_ok and it.item.first != '-' then
+               if it.is_ok and it.item.chars.first != '-' then
                        value = convert(it.item)
                        it.next
                else
                        if _parameter_mandatory then
-                               _errors.add("parameter expected for option {names.first}")
+                               _errors.add("Parameter expected for option {names.first}.")
                        end
                end
        end
@@ -261,7 +261,7 @@ class OptionContext
                var parseargs = true
                build
                var rest = _rest
-               
+
                while parseargs and it.is_ok do
                        var str = it.item
                        if str == "--" then
@@ -269,24 +269,39 @@ class OptionContext
                                rest.add_all(it.to_a)
                                parseargs = false
                        else
-                               if _optmap.has_key(str) then
-                                       var opt = _optmap[str]
-                                       it.next
-                                       opt.read_param(it)
+                               # We're looking for packed short options
+                               if str.last_index_of('-') == 0 and str.length > 2 then
+                                       var next_called = false
+                                       for i in [1..str.length] do
+                                               var short_opt = "-" + str.chars[i].to_s
+                                               if _optmap.has_key(short_opt) then
+                                                       var option = _optmap[short_opt]
+                                                       if option isa OptionParameter then
+                                                               it.next
+                                                               next_called = true
+                                                       end
+                                                       option.read_param(it)
+                                               end
+                                       end
+                                       if not next_called then it.next
                                else
-                                       rest.add(it.item)
-                                       it.next
+                                       if _optmap.has_key(str) then
+                                               var opt = _optmap[str]
+                                               it.next
+                                               opt.read_param(it)
+                                       else
+                                               rest.add(it.item)
+                                               it.next
+                                       end
                                end
                        end
                end
 
                for opt in _options do
                        if opt.mandatory and not opt.read then
-                               _errors.add("mandatory option {opt.names.join(", ")} not found")
+                               _errors.add("Mandatory option {opt.names.join(", ")} not found.")
                        end
                end
-
-               check_errors
        end
 
        fun add_option(opts: Option...)
@@ -313,20 +328,18 @@ class OptionContext
                end
        end
 
-       private fun check_errors
+       fun get_errors: Array[String]
        do
+               var errors: Array[String] = new Array[String]
+
+               errors.add_all(_errors)
+
                for o in _options do
                        for e in o.errors do
-                               _errors.add(e)
+                               errors.add(e)
                        end
                end
 
-               if _errors.length > 0 then
-                       stderr.write("Errors occured during parsing:\n")
-                       for e in _errors do
-                               stderr.write(" - " + e + "\n")
-                       end
-                       exit(1)
-               end
+               return errors
        end
 end