fix JuliaLang#23010, method parameter deprecation warning fixes

also some general improvements to the scheme `deparse` function

src/ast.scm

@@ -2,7 +2,12 @@
 
 ;; deparser
 
-(define (deparse-arglist l (sep ",")) (string.join (map deparse l) sep))
+(define (deparse-arglist l (sep ", "))
+ (if (has-parameters? l)
+ (string (string.join (map deparse (cdr l)) sep)
+ "; "
+ (string.join (map deparse (cdar l)) ", "))
+ (string.join (map deparse l) sep)))
 
 (define (deparse e)
  (define (block-stmts e)
@@ -60,11 +65,25 @@
  (string ":" (deparse (cadr e)))
  (string ":(" (deparse (cadr e)) ")")))
  ((vect) (string #\[ (deparse-arglist (cdr e)) #\]))
- ((vcat) (string #\[ (deparse-arglist (cdr e) ";") #\]))
- ((hcat) (string #\[ (deparse-arglist (cdr e) " ") #\]))
- ((row) (deparse-arglist (cdr e) " "))
+ ((vcat)
+ (string #\[
+ ;; note: this is a parser quasi-bug; arguably `[a,b;c]` should
+ ;; be a `vect` expression with parameters, not `vcat`
+ (deparse-arglist (cdr e) (if (has-parameters? (cdr e))
+ ", " "; "))
+ #\]))
+ ((typed_vcat) (string (deparse (cadr e))
+ (deparse (cons 'vcat (cddr e)))))
+ ((hcat) (string #\[ (deparse-arglist (cdr e) " ") #\]))
+ ((typed_hcat) (string (deparse (cadr e))
+ (deparse (cons 'hcat (cddr e)))))
+ ((row) (deparse-arglist (cdr e) " "))
  ((braces) (string #\{ (deparse-arglist (cdr e)) #\}))
- ((bracescat) (string #\{ (deparse-arglist (cdr e) ";") #\}))
+ ((bracescat)
+ (string #\{
+ (deparse-arglist (cdr e) (if (has-parameters? (cdr e))
+ ", " "; "))
+ #\}))
  ((const) (string "const " (deparse (cadr e))))
  ((global local)
  (string (car e) " " (string.join (map deparse (cdr e)) ", ")))
@@ -86,7 +105,11 @@
  ((block)
  (deparse-block "begin" (cdr e)))
  ((comprehension)
- (string "[ " (deparse (cadr e)) " for " (deparse-arglist (cddr e) ", ") " ]"))
+ (let ((e (cadr e)))
+ (string "[ " (deparse (cadr e)) " for " (deparse-arglist (cddr e) ", ") " ]")))
+ ((typed_comprehension)
+ (string (deparse (cadr e))
+ (deparse (cons 'comprehension (cddr e)))))
  ((generator)
  (string "(" (deparse (cadr e)) " for " (deparse-arglist (cddr e) ", ") ")"))
  ((where)

src/julia-syntax.scm

@@ -1038,9 +1038,10 @@
  (if (nospecialize-meta? a) (caddr a) a))
  argl))
  (argl (if op (cons `(|::| (call (core Typeof) ,op)) argl) argl))
- (sparams (map analyze-typevar (cond (has-sp (cddr head))
- (where where)
- (else '()))))
+ (raw-typevars (cond (has-sp (cddr head))
+ (where where)
+ (else '())))
+ (sparams (map analyze-typevar raw-typevars))
  (isstaged (eq? (car e) 'stagedfunction))
  (adj-decl (lambda (n) (if (and (decl? n) (length= n 2))
  `(|::| |#self#| ,(cadr n))
@@ -1060,7 +1061,10 @@
  (syntax-deprecation #f
  (string "parametric method syntax " (deparse (cadr e))
  (linenode-string (function-body-lineno body)))
- (deparse `(where (call ,name ,@(cdr argl)) ,@(map car sparams)))))
+ (deparse `(where (call ,name ,@(if (has-parameters? argl)
+ (cons (car argl) (cddr argl))
+ (cdr argl)))
+ ,@raw-typevars))))
  (expand-forms
  (method-def-expr name sparams argl body isstaged rett))))
  (else

test/parse.jl

@@ -809,7 +809,7 @@ for op in ["+", "-", "\$", "|", ".+", ".-", "*", ".*"]
 end
 
 # issue #17701
-@test expand(Main, :(i==3 && i+=1)) == Expr(:error, "invalid assignment location \"==(i,3) && i\"")
+@test expand(Main, :(i==3 && i+=1)) == Expr(:error, "invalid assignment location \"==(i, 3) && i\"")
 
 # issue #18667
 @test expand(Main, :(true = 1)) == Expr(:error, "invalid assignment location \"true\"")