-
-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
stdin/stdout/stderr and devnull (#499)
* split at-compat macro into separate file * stdin/stdout/stderr and devnull * no more need for at-compat to use stdout etc * Base._redirect_stdfoo returns nothing * better yet, just copy the return value
- Loading branch information
Showing
4 changed files
with
157 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| # The @compat macro is used to implement compatibility rules that require | ||
| # syntax rewriting rather than simply new function/constant/module definitions. | ||
|
|
||
| using Base.Meta | ||
| export @compat | ||
|
|
||
| """Get just the function part of a function declaration.""" | ||
| withincurly(ex) = isexpr(ex, :curly) ? ex.args[1] : ex | ||
|
|
||
| is_index_style(ex::Expr) = ex == :(Compat.IndexStyle) || ex == :(Base.IndexStyle) || | ||
| (ex.head == :(.) && (ex.args[1] == :Compat || ex.args[1] == :Base) && | ||
| ex.args[2] == Expr(:quote, :IndexStyle)) | ||
|
|
||
| is_index_style(arg) = false | ||
|
|
||
| istopsymbol(ex, mod, sym) = ex in (sym, Expr(:(.), mod, Expr(:quote, sym))) | ||
|
|
||
| if VERSION < v"0.6.0-dev.2782" | ||
| function new_style_typealias(ex::ANY) | ||
| isexpr(ex, :(=)) || return false | ||
| ex = ex::Expr | ||
| return length(ex.args) == 2 && isexpr(ex.args[1], :curly) | ||
| end | ||
| else | ||
| new_style_typealias(ex) = false | ||
| end | ||
|
|
||
| function _compat(ex::Expr) | ||
| if ex.head === :call | ||
| f = ex.args[1] | ||
| if VERSION < v"0.6.0-dev.826" && length(ex.args) == 3 && # julia#18510 | ||
| istopsymbol(withincurly(ex.args[1]), :Base, :Nullable) | ||
| ex = Expr(:call, f, ex.args[2], Expr(:call, :(Compat._Nullable_field2), ex.args[3])) | ||
| end | ||
| elseif ex.head === :curly | ||
| f = ex.args[1] | ||
| if VERSION < v"0.6.0-dev.2575" #20414 | ||
| ex = Expr(:curly, map(a -> isexpr(a, :call, 2) && a.args[1] == :(<:) ? | ||
| :($TypeVar($(QuoteNode(gensym(:T))), $(a.args[2]), false)) : | ||
| isexpr(a, :call, 2) && a.args[1] == :(>:) ? | ||
| :($TypeVar($(QuoteNode(gensym(:T))), $(a.args[2]), $Any, false)) : a, | ||
| ex.args)...) | ||
| end | ||
| elseif ex.head === :quote && isa(ex.args[1], Symbol) | ||
| # Passthrough | ||
| return ex | ||
| elseif new_style_typealias(ex) | ||
| ex.head = :typealias | ||
| elseif ex.head === :const && length(ex.args) == 1 && new_style_typealias(ex.args[1]) | ||
| ex = ex.args[1]::Expr | ||
| ex.head = :typealias | ||
| end | ||
| if VERSION < v"0.6.0-dev.2840" | ||
| if ex.head == :(=) && isa(ex.args[1], Expr) && ex.args[1].head == :call | ||
| a = ex.args[1].args[1] | ||
| if is_index_style(a) | ||
| ex.args[1].args[1] = :(Base.linearindexing) | ||
| elseif isa(a, Expr) && a.head == :curly | ||
| if is_index_style(a.args[1]) | ||
| ex.args[1].args[1].args[1] = :(Base.linearindexing) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| if VERSION < v"0.7.0-DEV.880" | ||
| if ex.head == :curly && ex.args[1] == :CartesianRange && length(ex.args) >= 2 | ||
| a = ex.args[2] | ||
| if a != :CartesianIndex && !(isa(a, Expr) && a.head == :curly && a.args[1] == :CartesianIndex) | ||
| return Expr(:curly, :CartesianRange, Expr(:curly, :CartesianIndex, ex.args[2])) | ||
| end | ||
| end | ||
| end | ||
| if VERSION < v"0.7.0-DEV.2562" | ||
| if ex.head == :call && ex.args[1] == :finalizer | ||
| ex.args[2], ex.args[3] = ex.args[3], ex.args[2] | ||
| end | ||
| end | ||
| return Expr(ex.head, map(_compat, ex.args)...) | ||
| end | ||
|
|
||
| _compat(ex) = ex | ||
|
|
||
| function _get_typebody(ex::Expr) | ||
| args = ex.args | ||
| if ex.head !== :type || length(args) != 3 || args[1] !== true | ||
| throw(ArgumentError("Invalid usage of @compat: $ex")) | ||
| end | ||
| name = args[2] | ||
| if !isexpr(args[3], :block) | ||
| throw(ArgumentError("Invalid type declaration: $ex")) | ||
| end | ||
| body = (args[3]::Expr).args | ||
| filter!(body) do e | ||
| if isa(e, LineNumberNode) || isexpr(e, :line) | ||
| return false | ||
| end | ||
| return true | ||
| end | ||
| return name, body | ||
| end | ||
|
|
||
| function _compat_primitive(typedecl) | ||
| name, body = _get_typebody(typedecl) | ||
| if length(body) != 1 | ||
| throw(ArgumentError("Invalid primitive type declaration: $typedecl")) | ||
| end | ||
| return Expr(:bitstype, body[1], name) | ||
| end | ||
|
|
||
| function _compat_abstract(typedecl) | ||
| name, body = _get_typebody(typedecl) | ||
| if length(body) != 0 | ||
| throw(ArgumentError("Invalid abstract type declaration: $typedecl")) | ||
| end | ||
| return Expr(:abstract, name) | ||
| end | ||
|
|
||
| macro compat(ex...) | ||
| if VERSION < v"0.6.0-dev.2746" && length(ex) == 2 && ex[1] === :primitive | ||
| return esc(_compat_primitive(ex[2])) | ||
| elseif length(ex) != 1 | ||
| throw(ArgumentError("@compat called with wrong number of arguments: $ex")) | ||
| elseif (VERSION < v"0.6.0-dev.2746" && isexpr(ex[1], :abstract) && | ||
| length(ex[1].args) == 1 && isexpr(ex[1].args[1], :type)) | ||
| # This can in principle be handled in nested case but we do not | ||
| # do that to be consistent with primitive types. | ||
| return esc(_compat_abstract(ex[1].args[1])) | ||
| end | ||
| esc(_compat(ex[1])) | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters