Skip to content

fix deprecated syntax for Julia 0.6 #19

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
bicycle1885 merged 1 commit into from
Mar 3, 2017
Merged

fix deprecated syntax for Julia 0.6 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
julia 0.4
Compat 0.17
14 changes: 8 additions & 6 deletions src/DocOpt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ module DocOpt

export docopt

import Compat: @compat

import Base: ==

# port of str.partition in Python
Expand Down Expand Up @@ -31,9 +33,9 @@ type DocOptExit <: Exception
usage::AbstractString
end

abstract Pattern
abstract LeafPattern <: Pattern
abstract BranchPattern <: Pattern
@compat abstract type Pattern end
@compat abstract type LeafPattern <: Pattern end
@compat abstract type BranchPattern <: Pattern end

type Argument <: LeafPattern
name
Expand Down Expand Up @@ -80,7 +82,7 @@ type Option <: LeafPattern
end
end

typealias Children Vector{Pattern}
const Children = Vector{Pattern}

type Required <: BranchPattern
children::Children
Expand Down Expand Up @@ -348,7 +350,7 @@ function parse_long(tokens::Tokens, options)
value = eq == value == "" ? nothing : value
similar = filter(o -> o.long == long, options)
if tokens.error === DocOptExit && isempty(similar) # if no exact match
similar = filter(o -> !is(o.long, nothing) && startswith(o.long, long), options)
similar = filter(o -> o.long !== nothing && startswith(o.long, long), options)
end
if length(similar) > 1 # might be simply specified ambiguously 2+ times?
throw(tokens.error("$long is not a unique prefix: $(join(map(s -> s.long, similar), ","))"))
Expand Down Expand Up @@ -476,7 +478,7 @@ function parse_atom(tokens, options)
return parse_long(tokens, options)
elseif startswith(token, '-') && !isdash(token)
return parse_shorts(tokens, options)
elseif startswith(token, '<') && endswith(token, '>') || isupper(token)
elseif startswith(token, '<') && endswith(token, '>') || all(isupper, token)
return [Argument(move!(tokens))]
else
return [Command(move!(tokens))]
Expand Down