Merge pull request #20525 from JuliaLang/jb/fix20524

fix #20524, macros not handling nested tuple destructuring

src/ast.scm

@@ -187,6 +187,9 @@
 (define (ssavalue? e)
  (and (pair? e) (eq? (car e) 'ssavalue)))
 
+(define (globalref? e)
+ (and (pair? e) (eq? (car e) 'globalref)))
+
 (define (symbol-like? e)
  (or (and (symbol? e) (not (eq? e 'true)) (not (eq? e 'false)))
  (ssavalue? e)))

src/julia-syntax.scm

@@ -2381,7 +2381,7 @@
  ((=)
  (let ((v (decl-var (cadr e)))
  (rest (find-assigned-vars (caddr e) env)))
- (if (or (ssavalue? v) (memq v env))
+ (if (or (ssavalue? v) (memq v env) (globalref? v))
  rest
  (cons v rest))))
  (else

src/macroexpand.scm

@@ -310,6 +310,11 @@
  ((eq? (car e) 'curly) (decl-var* (cadr e)))
  (else (decl-var e))))
 
+(define (decl-vars* e)
+ (if (and (pair? e) (eq? (car e) 'tuple))
+ (apply append (map decl-vars* (cdr e)))
+ (list (decl-var* e))))
+
 (define (function-def? e)
  (and (pair? e) (or (eq? (car e) 'function) (eq? (car e) '->)
  (and (eq? (car e) '=) (length= e 3)
@@ -340,11 +345,7 @@
  (list fname)
  '())))
  ((and (eq? (car e) '=) (not (function-def? e)))
- (append! (filter
- symbol?
- (if (and (pair? (cadr e)) (eq? (car (cadr e)) 'tuple))
- (map decl-var* (cdr (cadr e)))
- (list (decl-var* (cadr e)))))
+ (append! (filter symbol? (decl-vars* (cadr e)))
  (find-assigned-vars-in-expansion (caddr e) #f)))
  (else
  (apply append! (map (lambda (x)

test/core.jl

@@ -1752,6 +1752,19 @@ let
  @test f5876(Int) === Int
 end
 
+# issue #20524
+macro m20524(ex)
+ quote
+ global f20524
+ function f20524()
+ $ex
+ end
+ end
+end
+@m20524 ((a,(b20524,c)) = (8,(1,5)); (a,b20524,c))
+@test f20524() === (8,1,5)
+@test !isdefined(:b20524) # should not assign to a global
+
 # issue #6387
 bitstype 64 Date6387{C}