From a107e2b2e7d63375dc93eaa96134c0c124b0f250 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sun, 29 Apr 2018 19:47:30 -0700 Subject: Reenable tests --- src/main/scala/package.scala | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'src/main/scala/package.scala') diff --git a/src/main/scala/package.scala b/src/main/scala/package.scala index f813971..68936cd 100644 --- a/src/main/scala/package.scala +++ b/src/main/scala/package.scala @@ -2,10 +2,11 @@ package commando class CommandBuilder(name: String, params: Seq[Parameter]) { - private def optionals = params.collect{ - case opt: Optional => opt - }.toSet - private def positionals = params.collect{ + private def optionals = + params.collect { + case opt: Optional => opt + }.toSet + private def positionals = params.collect { case pos: Positional => pos } @@ -17,32 +18,33 @@ class CommandBuilder(name: String, params: Seq[Parameter]) { } - - object `package` { - val DefaultErrorHandler: (Command, String) => Unit = (command: Command, err: String) => { - System.err.println(s"${command.name}: $err") - System.exit(2) - } - - + val DefaultErrorHandler: (Command, String) => Unit = + (command: Command, err: String) => { + System.err.println(s"${command.name}: $err") + System.exit(2) + } def parse(arguments: Seq[String], - command: Command, onError: (Command, String) => Unit = DefaultErrorHandler): Unit = + command: Command, + onError: (Command, String) => Unit = DefaultErrorHandler): Unit = Parser.parse(arguments, command, onError) - def cmd(name: String)(params: Parameter*): CommandBuilder = new CommandBuilder(name, params) - def opt(name: String, short: Char = '\u0000', param: (String, Boolean) = ("", false)): Optional = + def cmd(name: String)(params: Parameter*): CommandBuilder = + new CommandBuilder(name, params) + def opt(name: String, + short: Char = '\u0000', + param: (String, Boolean) = ("", false)): Optional = Optional( name, if (short == '\u0000') None else Some(short), argumentAllowed = (param != ("", false)), argumentRequired = (param != ("", false)) && param._2, - parameterName = if(param._1 == "") "param" else param._1 + parameterName = if (param._1 == "") "param" else param._1 ) - def pos(name: String, required: Boolean = true): Positional = Positional(name, required) - + def pos(name: String, required: Boolean = true): Positional = + Positional(name, required) } -- cgit v1.2.3