Skip to content

Added second name and flag parsing as false to Flag #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kylef merged 2 commits into from
Nov 6, 2015
Merged

Added second name and flag parsing as false to Flag #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ba6bc
Added second name and flag parsing as false to Flag
Oct 18, 2015
217b918
Applied required changes for merge request.
Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Commander/ArgumentDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,23 @@ public class Flag : ArgumentDescriptor {

public let name:String
public let flag:Character?
public let disabledName:String
public let disabledFlag:Character?
public let description:String?
public let `default`:ValueType
public var type:ArgumentType { return .Option }

public init(_ name:String, flag:Character? = nil, description:String? = nil, `default`:Bool = false) {
public init(_ name:String, flag:Character? = nil, disabledName:String? = nil, disabledFlag:Character? = nil, description:String? = nil, `default`:Bool = false) {
self.name = name
self.disabledName = disabledName ?? "no-\(name)"
self.flag = flag
self.disabledFlag = disabledFlag
self.description = description
self.`default` = `default`
}

public func parse(parser:ArgumentParser) throws -> ValueType {
if parser.hasOption("no-\(name)") {
if parser.hasOption(disabledName) {
return false
}

Expand All @@ -150,6 +154,11 @@ public class Flag : ArgumentDescriptor {
return true
}
}
if let disabledFlag = disabledFlag {
if parser.hasFlag(disabledFlag) {
return false
}
}

return `default`
}
Expand Down