From 342554a9b5a40fcf0d0509d2cef0d22fc332c887 Mon Sep 17 00:00:00 2001 From: Robby Date: Mon, 23 Sep 2024 19:03:09 -0500 Subject: [PATCH] Updated proxy options. --- cli/jvm/src/main/scala/org/sireum/Cli.scala | 286 ++++++++++---------- proyek | 2 +- 2 files changed, 144 insertions(+), 144 deletions(-) diff --git a/cli/jvm/src/main/scala/org/sireum/Cli.scala b/cli/jvm/src/main/scala/org/sireum/Cli.scala index 47d06143..18b3a534 100644 --- a/cli/jvm/src/main/scala/org/sireum/Cli.scala +++ b/cli/jvm/src/main/scala/org/sireum/Cli.scala @@ -387,13 +387,13 @@ object Cli { val skipCompile: B, val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -418,13 +418,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -442,13 +442,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -502,13 +502,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -542,13 +542,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String], val infoFlow: B, val charBitWidth: Z, @@ -627,13 +627,13 @@ object Cli { val skipCompile: B, val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -659,13 +659,13 @@ object Cli { val skipCompile: B, val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -689,13 +689,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -712,13 +712,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -747,13 +747,13 @@ object Cli { val skipCompile: B, val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -773,13 +773,13 @@ object Cli { val versions: ISZ[String], val cache: Option[String], val docs: B, + val sources: B, val proxyHost: Option[String], val proxyNonHosts: Option[String], val proxyPort: Option[String], val proxyProtocol: Option[String], val proxyUser: Option[String], val proxyPassword: Option[String], - val sources: B, val repositories: ISZ[String] ) extends SireumTopOption @@ -3518,16 +3518,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -3557,13 +3557,13 @@ import Cli._ var skipCompile: B = false var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -3726,13 +3726,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -3762,12 +3768,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -3783,7 +3783,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekAssembleOption(help, parseArguments(args, j), includeSources, includeTests, jar, noDeps, mainClass, meta, isNative, uber, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekAssembleOption(help, parseArguments(args, j), includeSources, includeTests, jar, noDeps, mainClass, meta, isNative, uber, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekCompile(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -3842,16 +3842,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -3874,13 +3874,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -4001,13 +4001,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -4037,12 +4043,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -4058,7 +4058,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekCompileOption(help, parseArguments(args, j), javac, fresh, par, recompile, scalac, sha3, js, meta, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekCompileOption(help, parseArguments(args, j), javac, fresh, par, recompile, scalac, sha3, js, meta, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekDep(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -4100,16 +4100,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -4125,13 +4125,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -4207,13 +4207,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -4243,12 +4249,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -4264,7 +4264,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekDepOption(help, parseArguments(args, j), js, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekDepOption(help, parseArguments(args, j), js, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekExportBuildToolH(arg: String): Option[SireumProyekExportBuildTool.Type] = { @@ -4554,16 +4554,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -4584,13 +4584,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -4696,13 +4696,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -4732,12 +4738,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -4753,7 +4753,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekIveOption(help, parseArguments(args, j), empty, edition, force, rebuildIve, javac, scalac, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekIveOption(help, parseArguments(args, j), empty, edition, force, rebuildIve, javac, scalac, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekLogikaFPRoundingModeH(arg: String): Option[SireumProyekLogikaFPRoundingMode.Type] = { @@ -4839,16 +4839,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",") @@ -4963,13 +4963,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var infoFlow: B = false var charBitWidth: Z = 32 @@ -5103,13 +5103,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -5139,12 +5145,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -5439,7 +5439,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekLogikaOption(help, parseArguments(args, j), all, strictAliasing, verbose, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories, infoFlow, charBitWidth, fpRounding, useReal, intBitWidth, interprocedural, interproceduralContracts, strictPureMode, line, loopBound, callBound, patternExhaustive, pureFun, sat, skipMethods, skipTypes, logPc, logPcLines, logRawPc, logVc, logVcDir, logDetailedInfo, logAtRewrite, stats, par, branchPar, branchParReturn, rwPar, dontSplitFunQuant, splitAll, splitContract, splitIf, splitMatch, rwMax, rwTrace, rwEvalTrace, elideEncoding, rawInscription, rlimit, sequential, simplify, smt2SatConfigs, smt2ValidConfigs, satTimeout, timeout, searchPC)) + return Some(SireumProyekLogikaOption(help, parseArguments(args, j), all, strictAliasing, verbose, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories, infoFlow, charBitWidth, fpRounding, useReal, intBitWidth, interprocedural, interproceduralContracts, strictPureMode, line, loopBound, callBound, patternExhaustive, pureFun, sat, skipMethods, skipTypes, logPc, logPcLines, logRawPc, logVc, logVcDir, logDetailedInfo, logAtRewrite, stats, par, branchPar, branchParReturn, rwPar, dontSplitFunQuant, splitAll, splitContract, splitIf, splitMatch, rwMax, rwTrace, rwEvalTrace, elideEncoding, rawInscription, rlimit, sequential, simplify, smt2SatConfigs, smt2ValidConfigs, satTimeout, timeout, searchPC)) } def parseSireumProyekPublishTargetH(arg: String): Option[SireumProyekPublishTarget.Type] = { @@ -5541,16 +5541,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -5575,13 +5575,13 @@ import Cli._ var skipCompile: B = false var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -5714,13 +5714,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -5750,12 +5756,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -5771,7 +5771,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekPublishOption(help, parseArguments(args, j), m2, target, version, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekPublishOption(help, parseArguments(args, j), m2, target, version, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekRun(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -5834,16 +5834,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -5867,13 +5867,13 @@ import Cli._ var skipCompile: B = false var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -6000,13 +6000,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -6036,12 +6042,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -6057,7 +6057,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekRunOption(help, parseArguments(args, j), dir, java, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekRunOption(help, parseArguments(args, j), dir, java, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekSlangcheck(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -6110,16 +6110,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -6141,13 +6141,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -6262,13 +6262,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -6298,12 +6304,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -6319,7 +6319,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekSlangcheckOption(help, parseArguments(args, j), license, packageName, outputDir, testDir, par, strictAliasing, verbose, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekSlangcheckOption(help, parseArguments(args, j), license, packageName, outputDir, testDir, par, strictAliasing, verbose, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekStats(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -6360,16 +6360,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -6384,13 +6384,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -6460,13 +6460,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -6496,12 +6502,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -6517,7 +6517,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekStatsOption(help, parseArguments(args, j), ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekStatsOption(help, parseArguments(args, j), ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekTest(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -6586,16 +6586,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -6622,13 +6622,13 @@ import Cli._ var skipCompile: B = false var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -6773,13 +6773,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -6809,12 +6815,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -6830,7 +6830,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekTestOption(help, parseArguments(args, j), classes, coverage, java, packages, suffixes, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekTestOption(help, parseArguments(args, j), classes, coverage, java, packages, suffixes, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, javac, fresh, par, recompile, scalac, sha3, skipCompile, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumProyekTipe(args: ISZ[String], i: Z): Option[SireumTopOption] = { @@ -6876,16 +6876,16 @@ import Cli._ | cache directory) (expects a path) | --no-docs Disable retrieval of javadoc files from Ivy | dependencies + | --no-sources Disable retrieval of source files from Ivy + | dependencies | --proxy-host Proxy host for ivy resolution (expects a string) - | --proxy-hosts Proxy non-hosts for ivy resolution (expects a string) + | --proxy-non-hosts Proxy non-hosts for ivy resolution (expects a string) | --proxy-port Proxy port for ivy resolution (expects a string) | --proxy-protocol Proxy protocol for ivy resolution (expects a string) | --proxy-user-env Proxy user environment variable for ivy resolution | (expects a string) | --proxy-passwd-env Proxy password environment variable for ivy resolution | (expects a string) - | --no-sources Disable retrieval of source files from Ivy - | dependencies |-r, --repositories Additional repository URLs to retrieve Ivy | dependencies from (expects a string separated by | ",")""".render @@ -6903,13 +6903,13 @@ import Cli._ var versions: ISZ[String] = ISZ[String]() var cache: Option[String] = None[String]() var docs: B = true + var sources: B = true var proxyHost: Option[String] = None[String]() var proxyNonHosts: Option[String] = None[String]() var proxyPort: Option[String] = None[String]() var proxyProtocol: Option[String] = None[String]() var proxyUser: Option[String] = None[String]() var proxyPassword: Option[String] = None[String]() - var sources: B = true var repositories: ISZ[String] = ISZ[String]() var j = i var isOption = T @@ -7000,13 +7000,19 @@ import Cli._ case Some(v) => docs = v case _ => return None() } + } else if (arg == "--no-sources") { + val o: Option[B] = { j = j - 1; Some(!sources) } + o match { + case Some(v) => sources = v + case _ => return None() + } } else if (arg == "--proxy-host") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyHost = v case _ => return None() } - } else if (arg == "--proxy-hosts") { + } else if (arg == "--proxy-non-hosts") { val o: Option[Option[String]] = parseString(args, j + 1) o match { case Some(v) => proxyNonHosts = v @@ -7036,12 +7042,6 @@ import Cli._ case Some(v) => proxyPassword = v case _ => return None() } - } else if (arg == "--no-sources") { - val o: Option[B] = { j = j - 1; Some(!sources) } - o match { - case Some(v) => sources = v - case _ => return None() - } } else if (arg == "-r" || arg == "--repositories") { val o: Option[ISZ[String]] = parseStrings(args, j + 1, ',') o match { @@ -7057,7 +7057,7 @@ import Cli._ isOption = F } } - return Some(SireumProyekTipeOption(help, parseArguments(args, j), par, strictAliasing, verbose, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, sources, repositories)) + return Some(SireumProyekTipeOption(help, parseArguments(args, j), par, strictAliasing, verbose, ignoreRuntime, json, name, outputDirName, project, slice, symlink, versions, cache, docs, sources, proxyHost, proxyNonHosts, proxyPort, proxyProtocol, proxyUser, proxyPassword, repositories)) } def parseSireumSlang(args: ISZ[String], i: Z): Option[SireumTopOption] = { diff --git a/proyek b/proyek index 42c0ddc2..e3edc01a 160000 --- a/proyek +++ b/proyek @@ -1 +1 @@ -Subproject commit 42c0ddc264e29cef23f9f0cc36be1ab887294aa4 +Subproject commit e3edc01a0fb1cb39f1811d7e21fb4186e4b61fbc