Skip to content

Allow GlobalRef and module qualified names in macro definitions #53535

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

Allow GlobalRef and module qualified names in macro definitions #53535

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
12 changes: 10 additions & 2 deletions src/julia-parser.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2610,15 +2610,23 @@

(define (valid-modref? e)
(and (length= e 3) (eq? (car e) '|.|) (pair? (caddr e))
(eq? (car (caddr e)) 'quote) (symbol? (cadr (caddr e)))
(or (eq? (car (caddr e)) 'quote)
(eq? (car (caddr e)) 'inert))
(symbol? (cadr (caddr e)))
(or (symbol? (cadr e))
(valid-modref? (cadr e)))))

(define (macroify-name e . suffixes)
(cond ((symbol? e) (symbol (apply string #\@ e suffixes)))
((and (pair? e) (eq? (car e) 'quote))
`(quote ,(apply macroify-name (cadr e) suffixes)))
((and (pair? e) (eq? (car e) 'inert))
`(inert ,(apply macroify-name (cadr e) suffixes)))
((globalref? e)
`(globalref ,(cadr e) ,(apply macroify-name (caddr e) suffixes)))
((valid-modref? e)
`(|.| ,(cadr e)
(quote ,(apply macroify-name (cadr (caddr e)) suffixes))))
,(apply macroify-name (caddr e) suffixes)))
(else (error (string "invalid macro usage \"@(" (deparse e) ")\"" )))))

(define (macroify-call s call startloc)
Expand Down
11 changes: 7 additions & 4 deletions src/julia-syntax.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,15 +1347,18 @@
(else (error "invalid let syntax"))))
(else (error "invalid let syntax")))))))))

(define (valid-macro-def-name? e)
(or (symbol? e) (valid-modref? e) (globalref? e)))

(define (expand-macro-def e)
(cond ((and (pair? (cadr e))
(eq? (car (cadr e)) 'call)
(symbol? (cadr (cadr e))))
(valid-macro-def-name? (cadr (cadr e))))
(let ((anames (remove-empty-parameters (cddr (cadr e)))))
(if (has-parameters? anames)
(error "macros cannot accept keyword arguments"))
(expand-forms
`(function (call ,(symbol (string #\@ (cadr (cadr e))))
`(function (call ,(macroify-name (cadr (cadr e)))
(|::| __source__ (core LineNumberNode))
(|::| __module__ (core Module))
,@(map (lambda (v)
Expand All @@ -1364,8 +1367,8 @@
v))
anames))
,@(cddr e)))))
((and (length= e 2) (symbol? (cadr e)))
(expand-forms `(function ,(symbol (string #\@ (cadr e))))))
((and (length= e 2) (valid-macro-def-name? (cadr e)))
(expand-forms `(function ,(macroify-name (cadr e)))))
(else
(error "invalid macro definition"))))

Expand Down
13 changes: 13 additions & 0 deletions test/syntax.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3637,3 +3637,16 @@ end
@test array == [7]
@test execs == 4
end

# Allow GlobalRefs in macro definition
module MyMacroModule
macro mymacro end
end
macro MyMacroModule.mymacro()
1
end
@eval macro $(GlobalRef(MyMacroModule, :mymacro))(x)
2
end
@test (@MyMacroModule.mymacro) == 1
@test (@MyMacroModule.mymacro(a)) == 2