From 79e9dff2bd36dacbab49f5384219687e2de7e661 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Fri, 28 Jul 2017 23:49:49 -0400 Subject: [PATCH] Revert "deprecation warning for old parametric method syntax. fixes #11310 (#22834)" This partially reverts commit c6e51d0cddc6d786a655d7504e072f1d986675de. --- src/julia-syntax.scm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm index f57a8c90be1cd..9063744bc26b6 100644 --- a/src/julia-syntax.scm +++ b/src/julia-syntax.scm @@ -838,9 +838,12 @@ (sig (car temp)) (params (cdr temp))) (if (pair? params) - (syntax-deprecation #f - (string "inner constructor " name "(...)" (linenode-string (function-body-lineno body))) - (deparse `(where (call (curly ,name ,@params) ...) ,@params)))) + (let* ((lnos (filter (lambda (e) (and (pair? e) (eq? (car e) 'line))) + body)) + (lno (if (null? lnos) '() (car lnos)))) + (syntax-deprecation #f + (string "inner constructor " name "(...)" (linenode-string lno)) + (deparse `(where (call (curly ,name ,@params) ...) ,@params))))) `(function ,sig ,(ctor-body body params))))))) (define (function-body-lineno body) @@ -1117,16 +1120,6 @@ (eq? (caar argl) 'parameters)))))) (name (if (or (decl? name) (and (pair? name) (eq? (car name) 'curly))) #f name))) - (if has-sp - (syntax-deprecation #f - (string "parametric method syntax " (deparse (cadr e)) - (linenode-string (function-body-lineno body))) - (deparse `(where (call ,(or name - (cadr (cadr (cadr e)))) - ,@(if (has-parameters? argl) - (cons (car argl) (cddr argl)) - (cdr argl))) - ,@raw-typevars)))) (expand-forms (method-def-expr name sparams argl body rett)))) (else