Skip to content
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

Jump to bottom

Support atsign-__MODULE__ #363

Merged
merged 1 commit into from
Jun 8, 2017
Merged

Support atsign-__MODULE__ #363

merged 1 commit into from
Jun 8, 2017

Conversation

timholy
Copy link
Sponsor Member

@timholy timholy commented Jun 7, 2017

@timholy
Copy link
Sponsor Member Author

timholy commented Jun 7, 2017

Probably also worth CCing @JobJob just to make sure I didn't break his invokelatest stuff.

vtjnash
vtjnash requested changes Jun 7, 2017
View reviewed changes
src/Compat.jl Outdated
if !isdefined(Base, Symbol("@__MODULE__"))
export @__MODULE__
macro __MODULE__()
esc(:(current_module()))
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be just return current_module() (if it had needed the function call, you also wouldn't have wanted the esc either)

src/Compat.jl Outdated
esc(:(current_module()))
end
Base.binding_module(mod::Module, s::Symbol) = Base.binding_module(s)
Base.expand(mod::Module, x::ANY) = expand(x)
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all of these functions should take the form eval(mod, :(expand($(QuoteNode(x))))

src/Compat.jl Outdated
# https://github.com/JuliaLang/julia/pull/19784
if isdefined(Base, :invokelatest)
import Base.invokelatest
else
invokelatest(f, args...) = eval(current_module(), Expr(:call, f, map(QuoteNode, args)...))
invokelatest(f, args...) = eval(@__MODULE__, Expr(:call, f, map(QuoteNode, args)...))
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

invokelatest was introduced first, so this change is unnecessary

@timholy
Copy link
Sponsor Member Author

timholy commented Jun 7, 2017

Thanks, @vtjnash!

@timholy
Add atsign-__MODULE__ from Julia 0.7/1.0
8ed726c 
Also add auxiliary methods deprecated by atsign-__MODULE__ change
JobJob
JobJob reviewed Jun 8, 2017
View reviewed changes
test/runtests.jl
@@ -1860,7 +1862,8 @@ let foo() = begin
end
@test foo() == 2
end
@test Compat.invokelatest(current_module) === current_module()
cm359() = @__MODULE__
@test Compat.invokelatest(cm359) === @__MODULE__
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a === current_module() here?

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will emit a depwarn on 0.7. But perhaps worth it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just while testing yeah? Anyway, I doubt it will ever make a difference, and if you, stevengj and vtjnash are happy, I think we're probably pretty ok 😄

@timholy timholy merged commit 2436d35 into master Jun 8, 2017
@timholy timholy deleted the teh/MODULE branch June 8, 2017 17:24
@musm
Copy link
Contributor

musm commented Jun 19, 2017 •
edited
Loading

Would it be possible to also add support for https://github.com/JuliaLang/julia/blob/3c3ced4153cdc2c75319b41155c38ad1f2545fc2/base/boot.jl#L233
i.e. include accepting a module in the first argument

@vtjnash
Copy link
Sponsor Member

vtjnash commented Jun 19, 2017

include doesn't take a module as the first argument. Perhaps you meant Base.include, which is not exported anymore, but does?

@musm
Copy link
Contributor

musm commented Jun 19, 2017

Yes sorry I meant Base.include

martinholters added a commit that referenced this pull request Sep 29, 2019
@martinholters
Drop compat code for at-__MODULE__ (from #363)
bec7c71
martinholters added a commit that referenced this pull request Sep 29, 2019
@martinholters
Drop compat code for at-__MODULE__ (from #363)
523a220
martinholters added a commit that referenced this pull request Oct 8, 2019
@martinholters
Drop compat code for at-__MODULE__ (from #363)
20b3ff8
martinholters added a commit that referenced this pull request Oct 13, 2019
@martinholters
Drop support for Julia versions <1.0 (#665)
4fa5519 
* Bump required Julia version to 1.0

* Remove compatibility support code for:
  * `at-__MODULE__` (from #363)
  * `devnull`, `stdin`, `stdout`, and `stderr` from #499
  * `at-nospecialize` (from #385 and #409)
  * `isabstracttype` and `isconcretetype` (from #477)
  * `invokelatest` from #424
  * array-like access to `Cmd` from #379
  * `Val(n)` and `ntuple`/`reshape` with `Val` from #381 and #399
  * `logdet(::Any)` fallback from #382
  * `chol(::UniformScaling)` from #382
  * `pushfirst!`, `popfirst!` from #444
  * `fieldcount` from #386
  * `read(obj, ::Type{String})` from #385 and #580
  * `InexactError`, `DomainError`, and `OverflowError` constructors from #393
  * `corrected` kw arg to `cov` from #401
  * `adjoint` from #401
  * `partialsort` from #401
  * `pairs` from #428
  * `AbstractRange` from #400
  * `rtoldefault` from #401
  * `Dates.Period` rounding from #462
  * `IterativeEigensolvers` from #435
  * `occursin` from #520
  * `Char` concatenation from #406
  * `BitSet` from #407
  * `diagm` and `spdiagm` with pairs from #408
  * `Array` c'tors from `UniformScaling` from #412 and #438
  * `IOContext` ctor taking pairs from #427
  * `undef` from #417 and #514
  * `get` on `ENV` from #430
  * `ComplexF...` from #431
  * `tr` from #614
  * `textwidth` from #644
  * `isnumeric` from #543
  * `AbstractDict` from #435
  * `axes` #435 and #442
  * `Nothing` and `Cvoid` from #435
  * `Compat.SuiteSparse` from #435
  * `invpermute!` from #445
  * `replace` with a pair from #445
  * `copyto!` from #448
  * `contains` from #452
  * `CartesianIndices` and `LinearIndices` from #446, #455, and #524
  * `findall` from #466 (and #467).
  * `argmin` and `argmax` from #470, #472, and #622
  * `parentmodule` from #461
  * `codeunits` from #474
  * `nameof` from #471
  * `GC` from #477
  * `AbstractDisplay` from #482
  * `bytesavailable` from #483
  * `firstindex` and `lastindex` from #480 and #494
  * `printstyled` from #481
  * `hasmethod` from #486
  * `objectid` from #486
  * `Compat.find*` from #484 and #513
  * `repr` and `showable` from #497
  * `Compat.names` from #493 and #505
  * `Compat.round` and friends #500, #530, and #537
  * `IOBuffer` from #501 and #504
  * `range` with kw args and `LinRange` from #511
  * `cp` and `mv` from #512
  * `indexin` from #515
  * `isuppercase` and friends from #516
  * `dims` and `init` kwargs from #518, #528, #590, #592, and #613
  * `selectdim` from #522 and #531
  * `repeat` from #625
  * `fetch(::Task)` from #549
  * `isletter` from #542
  * `isbitstype` from #560
  * `at-cfunction` from #553 and #566
  * `codeunit` and `thisind` and friends from #573
  * `something` from #562
  * `permutedims` from #582
  * `atan` from #574
  * `split` and `rsplit` from #572
  * `mapslices` from #588
  * `floatmin` and `floatmax` from #607
  * `dropdims` from #618
  * required keyword arguments from #586
  * `CartesianRange` in `at-compat` from #377
  * `finalizer` from #416
  * `readline`, `eachline`, and `readuntil` from #477, #541, and #575
  * curried `isequal`, `==`, and `in` from #517
  * `Some` from #435 and #563
  * `at-warn` and friends from #458

* Remove old deprecations

* Deprecate:
  * `Compat.Sockets` from #545 and #594
  * `TypeUtils` from #304
  * `macros_have_sourceloc` from #355
  * `Compat.Sys` from #380, #433, and #552
  * `Compat.MathConstants` from #401
  * `Compat.Test`, `Compat.SharedArrays`, `Compat.Mmap`, and `Compat.DelimitedFiles` from #404
  * `Compat.Dates` from #413
  * `Compat.Libdl` from #465 (and #467)
  * `AbstractDateTime` from #443
  * `Compat.Printf` from #435
  * `Compat.LinearAlgebra` from #463
  * `Compat.SparseArrays` from #459
  * `Compat.Random` from #460, #601, and #647
  * `Compat.Markdown` from #492
  * `Compat.REPL` from #469
  * `Compat.Serialization` from #473
  * `Compat.Statistics` from #583
  * `Fix2` from #517
  * `Compat.Base64` from #418
  * `Compat.Unicode` from #432 and #507
  * `notnothing` from #435 and #563
  * `Compat.IteratorSize` and `Compat.IteratorEltype` from #451
  * `enable_debug(::Bool)` from #458
  * `Compat.Distributed` from #477
  * `Compat.Pkg` from #485
  * `Compat.InteractiveUtils` from #485
  * `Compat.LibGit2` from #487
  * `Compat.UUIDs` from #490
  * `Compat.qr` from #534
  * `Compat.rmul!` from #546
  * `Compat.norm` abd friends from #577

* Remove obsolete README entry, missed in #385

* Remove obsolete tests (e.g. missed in #372)

* Remove obsolete `VERSION` conditionals and some minor clean-up
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JobJob JobJob JobJob left review comments

@vtjnash vtjnash vtjnash approved these changes

@stevengj stevengj stevengj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@timholy @musm @vtjnash @JobJob @stevengj