2009-05-15 23:44:14 +02:00
|
|
|
|
;;; TREE-IL -> GLIL compiler
|
|
|
|
|
|
|
2020-05-08 14:48:47 +02:00
|
|
|
|
;; Copyright (C) 2001,2008-2014,2016,2018-2020 Free Software Foundation, Inc.
|
2009-05-15 23:44:14 +02:00
|
|
|
|
|
2009-06-17 00:22:09 +01:00
|
|
|
|
;;;; This library is free software; you can redistribute it and/or
|
|
|
|
|
|
;;;; modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
|
;;;; License as published by the Free Software Foundation; either
|
|
|
|
|
|
;;;; version 3 of the License, or (at your option) any later version.
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;;;;
|
2009-06-17 00:22:09 +01:00
|
|
|
|
;;;; This library is distributed in the hope that it will be useful,
|
|
|
|
|
|
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
;;;; Lesser General Public License for more details.
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;;;;
|
2009-06-17 00:22:09 +01:00
|
|
|
|
;;;; You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
;;;; License along with this library; if not, write to the Free Software
|
|
|
|
|
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2009-05-15 23:44:14 +02:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
|
|
(define-module (language tree-il analyze)
|
2009-07-23 17:00:56 +02:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2009-07-31 00:42:58 +02:00
|
|
|
|
#:use-module (srfi srfi-9)
|
2010-01-11 01:19:16 +01:00
|
|
|
|
#:use-module (srfi srfi-11)
|
2012-01-26 00:35:46 +01:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2010-02-02 23:59:03 +01:00
|
|
|
|
#:use-module (ice-9 vlist)
|
2011-09-06 00:18:36 +02:00
|
|
|
|
#:use-module (ice-9 match)
|
2009-05-15 23:44:14 +02:00
|
|
|
|
#:use-module (system base syntax)
|
2009-07-31 00:42:58 +02:00
|
|
|
|
#:use-module (system base message)
|
2009-11-08 01:02:08 +01:00
|
|
|
|
#:use-module (system vm program)
|
2009-05-15 23:44:14 +02:00
|
|
|
|
#:use-module (language tree-il)
|
2009-11-08 17:53:14 +01:00
|
|
|
|
#:use-module (system base pmatch)
|
2020-04-29 11:13:33 +02:00
|
|
|
|
#:export (analyze-tree
|
2009-11-06 10:42:45 +01:00
|
|
|
|
unused-variable-analysis
|
2010-01-11 01:19:16 +01:00
|
|
|
|
unused-toplevel-analysis
|
2018-07-24 11:53:02 +02:00
|
|
|
|
shadowed-toplevel-analysis
|
2009-11-07 18:32:26 +01:00
|
|
|
|
unbound-variable-analysis
|
2016-06-25 18:08:28 +02:00
|
|
|
|
macro-use-before-definition-analysis
|
2010-10-08 16:25:32 +02:00
|
|
|
|
arity-analysis
|
2020-05-08 14:48:47 +02:00
|
|
|
|
format-analysis
|
|
|
|
|
|
make-analyzer))
|
2009-05-15 23:44:14 +02:00
|
|
|
|
|
2009-11-06 10:42:45 +01:00
|
|
|
|
;;;
|
|
|
|
|
|
;;; Tree analyses for warnings.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define-record-type <tree-analysis>
|
2013-05-28 12:06:30 -04:00
|
|
|
|
(make-tree-analysis down up post init)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
tree-analysis?
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(down tree-analysis-down) ;; (lambda (x result env locs) ...)
|
|
|
|
|
|
(up tree-analysis-up) ;; (lambda (x result env locs) ...)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(post tree-analysis-post) ;; (lambda (result env) ...)
|
|
|
|
|
|
(init tree-analysis-init)) ;; arbitrary value
|
|
|
|
|
|
|
|
|
|
|
|
(define (analyze-tree analyses tree env)
|
|
|
|
|
|
"Run all tree analyses listed in ANALYSES on TREE for ENV, using
|
2013-05-28 12:06:30 -04:00
|
|
|
|
`tree-il-fold'. Return TREE. The down and up procedures of each
|
|
|
|
|
|
analysis are passed a ``location stack', which is the stack of
|
|
|
|
|
|
`tree-il-src' values for each parent tree (a list); it can be used to
|
|
|
|
|
|
approximate source location when accurate information is missing from a
|
|
|
|
|
|
given `tree-il' element."
|
2010-01-08 12:02:00 +01:00
|
|
|
|
|
|
|
|
|
|
(define (traverse proc update-locs)
|
|
|
|
|
|
;; Return a tree traversing procedure that returns a list of analysis
|
|
|
|
|
|
;; results prepended by the location stack.
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(lambda (x results)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(let ((locs (update-locs x (car results))))
|
|
|
|
|
|
(cons locs ;; the location stack
|
|
|
|
|
|
(map (lambda (analysis result)
|
|
|
|
|
|
((proc analysis) x result env locs))
|
|
|
|
|
|
analyses
|
|
|
|
|
|
(cdr results))))))
|
|
|
|
|
|
|
2013-05-28 12:06:30 -04:00
|
|
|
|
;; Extending and shrinking the location stack.
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(define (extend-locs x locs) (cons (tree-il-src x) locs))
|
|
|
|
|
|
(define (shrink-locs x locs) (cdr locs))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
|
|
|
|
|
(let ((results
|
2013-05-28 12:06:30 -04:00
|
|
|
|
(tree-il-fold (traverse tree-analysis-down extend-locs)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(traverse tree-analysis-up shrink-locs)
|
|
|
|
|
|
(cons '() ;; empty location stack
|
|
|
|
|
|
(map tree-analysis-init analyses))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
tree)))
|
|
|
|
|
|
|
|
|
|
|
|
(for-each (lambda (analysis result)
|
|
|
|
|
|
((tree-analysis-post analysis) result env))
|
|
|
|
|
|
analyses
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(cdr results)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
|
|
|
|
|
tree)
|
|
|
|
|
|
|
2009-07-31 00:42:58 +02:00
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Unused variable analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; <binding-info> records are used during tree traversals in
|
2010-01-08 12:02:00 +01:00
|
|
|
|
;; `unused-variable-analysis'. They contain a list of the local vars
|
|
|
|
|
|
;; currently in scope, and a list of locals vars that have been referenced.
|
2009-07-31 00:42:58 +02:00
|
|
|
|
(define-record-type <binding-info>
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(make-binding-info vars refs)
|
2009-07-31 00:42:58 +02:00
|
|
|
|
binding-info?
|
|
|
|
|
|
(vars binding-info-vars) ;; ((GENSYM NAME LOCATION) ...)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(refs binding-info-refs)) ;; (GENSYM ...)
|
2009-07-31 00:42:58 +02:00
|
|
|
|
|
2010-10-20 22:40:10 +02:00
|
|
|
|
(define (gensym? sym)
|
|
|
|
|
|
;; Return #t if SYM is (likely) a generated symbol.
|
|
|
|
|
|
(string-any #\space (symbol->string sym)))
|
|
|
|
|
|
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(define unused-variable-analysis
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; Report unused variables in the given tree.
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(make-tree-analysis
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(lambda (x info env locs)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
;; Going down into X: extend INFO's variable list
|
|
|
|
|
|
;; accordingly.
|
|
|
|
|
|
(let ((refs (binding-info-refs info))
|
|
|
|
|
|
(vars (binding-info-vars info))
|
|
|
|
|
|
(src (tree-il-src x)))
|
|
|
|
|
|
(define (extend inner-vars inner-names)
|
2010-02-02 23:58:03 +01:00
|
|
|
|
(fold (lambda (var name vars)
|
|
|
|
|
|
(vhash-consq var (list name src) vars))
|
|
|
|
|
|
vars
|
|
|
|
|
|
inner-vars
|
|
|
|
|
|
inner-names))
|
|
|
|
|
|
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(record-case x
|
2013-05-28 12:06:30 -04:00
|
|
|
|
((<lexical-ref> gensym)
|
|
|
|
|
|
(make-binding-info vars (vhash-consq gensym #t refs)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
((<lexical-set> gensym)
|
2010-02-02 23:58:03 +01:00
|
|
|
|
(make-binding-info vars (vhash-consq gensym #t refs)))
|
2010-05-02 11:22:23 +02:00
|
|
|
|
((<lambda-case> req opt inits rest kw gensyms)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(let ((names `(,@req
|
2009-11-08 01:08:54 +01:00
|
|
|
|
,@(or opt '())
|
2009-11-06 10:42:45 +01:00
|
|
|
|
,@(if rest (list rest) '())
|
|
|
|
|
|
,@(if kw (map cadr (cdr kw)) '()))))
|
2010-05-02 11:22:23 +02:00
|
|
|
|
(make-binding-info (extend gensyms names) refs)))
|
|
|
|
|
|
((<let> gensyms names)
|
|
|
|
|
|
(make-binding-info (extend gensyms names) refs))
|
|
|
|
|
|
((<letrec> gensyms names)
|
|
|
|
|
|
(make-binding-info (extend gensyms names) refs))
|
|
|
|
|
|
((<fix> gensyms names)
|
|
|
|
|
|
(make-binding-info (extend gensyms names) refs))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(else info))))
|
|
|
|
|
|
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(lambda (x info env locs)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
;; Leaving X's scope: shrink INFO's variable list
|
|
|
|
|
|
;; accordingly and reported unused nested variables.
|
|
|
|
|
|
(let ((refs (binding-info-refs info))
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(vars (binding-info-vars info)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(define (shrink inner-vars refs)
|
2010-02-02 23:58:03 +01:00
|
|
|
|
(vlist-for-each
|
|
|
|
|
|
(lambda (var)
|
|
|
|
|
|
(let ((gensym (car var)))
|
|
|
|
|
|
;; Don't report lambda parameters as unused.
|
|
|
|
|
|
(if (and (memq gensym inner-vars)
|
|
|
|
|
|
(not (vhash-assq gensym refs))
|
|
|
|
|
|
(not (lambda-case? x)))
|
|
|
|
|
|
(let ((name (cadr var))
|
|
|
|
|
|
;; We can get approximate source location by going up
|
|
|
|
|
|
;; the LOCS location stack.
|
|
|
|
|
|
(loc (or (caddr var)
|
|
|
|
|
|
(find pair? locs))))
|
2010-10-20 22:40:10 +02:00
|
|
|
|
(if (and (not (gensym? name))
|
|
|
|
|
|
(not (eq? name '_)))
|
|
|
|
|
|
(warning 'unused-variable loc name))))))
|
2010-02-02 23:58:03 +01:00
|
|
|
|
vars)
|
|
|
|
|
|
(vlist-drop vars (length inner-vars)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
|
|
|
|
|
;; For simplicity, we leave REFS untouched, i.e., with
|
|
|
|
|
|
;; names of variables that are now going out of scope.
|
|
|
|
|
|
;; It doesn't hurt as these are unique names, it just
|
|
|
|
|
|
;; makes REFS unnecessarily fat.
|
|
|
|
|
|
(record-case x
|
2010-05-02 11:22:23 +02:00
|
|
|
|
((<lambda-case> gensyms)
|
|
|
|
|
|
(make-binding-info (shrink gensyms refs) refs))
|
|
|
|
|
|
((<let> gensyms)
|
|
|
|
|
|
(make-binding-info (shrink gensyms refs) refs))
|
|
|
|
|
|
((<letrec> gensyms)
|
|
|
|
|
|
(make-binding-info (shrink gensyms refs) refs))
|
|
|
|
|
|
((<fix> gensyms)
|
|
|
|
|
|
(make-binding-info (shrink gensyms refs) refs))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(else info))))
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (result env) #t)
|
2010-02-02 23:58:03 +01:00
|
|
|
|
(make-binding-info vlist-null vlist-null)))
|
2009-10-06 23:39:56 +02:00
|
|
|
|
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Unused top-level variable analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2010-01-11 18:28:19 +01:00
|
|
|
|
;; <reference-graph> record top-level definitions that are made, references to
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;; top-level definitions and their context (the top-level definition in which
|
|
|
|
|
|
;; the reference appears), as well as the current context (the top-level
|
|
|
|
|
|
;; definition we're currently in). The second part (`refs' below) is
|
2010-01-11 18:28:19 +01:00
|
|
|
|
;; effectively a graph from which we can determine unused top-level definitions.
|
|
|
|
|
|
(define-record-type <reference-graph>
|
|
|
|
|
|
(make-reference-graph refs defs toplevel-context)
|
|
|
|
|
|
reference-graph?
|
|
|
|
|
|
(defs reference-graph-defs) ;; ((NAME . LOC) ...)
|
|
|
|
|
|
(refs reference-graph-refs) ;; ((REF-CONTEXT REF ...) ...)
|
|
|
|
|
|
(toplevel-context reference-graph-toplevel-context)) ;; NAME | #f
|
|
|
|
|
|
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(define (graph-reachable-nodes root refs reachable)
|
|
|
|
|
|
;; Add to REACHABLE the nodes reachable from ROOT in graph REFS. REFS is a
|
|
|
|
|
|
;; vhash mapping nodes to the list of their children: for instance,
|
|
|
|
|
|
;; ((A -> (B C)) (B -> (A)) (C -> ())) corresponds to
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;;
|
|
|
|
|
|
;; ,-------.
|
|
|
|
|
|
;; v |
|
|
|
|
|
|
;; A ----> B
|
|
|
|
|
|
;; |
|
|
|
|
|
|
;; v
|
|
|
|
|
|
;; C
|
2010-02-02 23:59:03 +01:00
|
|
|
|
;;
|
|
|
|
|
|
;; REACHABLE is a vhash of nodes known to be otherwise reachable.
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
|
|
|
|
|
(let loop ((root root)
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(path vlist-null)
|
|
|
|
|
|
(result reachable))
|
|
|
|
|
|
(if (or (vhash-assq root path)
|
|
|
|
|
|
(vhash-assq root result))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
result
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(let* ((children (or (and=> (vhash-assq root refs) cdr) '()))
|
|
|
|
|
|
(path (vhash-consq root #t path))
|
|
|
|
|
|
(result (fold (lambda (kid result)
|
|
|
|
|
|
(loop kid path result))
|
|
|
|
|
|
result
|
|
|
|
|
|
children)))
|
|
|
|
|
|
(fold (lambda (kid result)
|
|
|
|
|
|
(vhash-consq kid #t result))
|
|
|
|
|
|
result
|
|
|
|
|
|
children)))))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(define (graph-reachable-nodes* roots refs)
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;; Return the list of nodes in REFS reachable from the nodes listed in ROOTS.
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(vlist-fold (lambda (root+true result)
|
|
|
|
|
|
(let* ((root (car root+true))
|
|
|
|
|
|
(reachable (graph-reachable-nodes root refs result)))
|
|
|
|
|
|
(vhash-consq root #t reachable)))
|
|
|
|
|
|
vlist-null
|
|
|
|
|
|
roots))
|
|
|
|
|
|
|
|
|
|
|
|
(define (partition* pred vhash)
|
|
|
|
|
|
;; Partition VHASH according to PRED. Return the two resulting vhashes.
|
|
|
|
|
|
(let ((result
|
|
|
|
|
|
(vlist-fold (lambda (k+v result)
|
|
|
|
|
|
(let ((k (car k+v))
|
|
|
|
|
|
(v (cdr k+v))
|
|
|
|
|
|
(r1 (car result))
|
|
|
|
|
|
(r2 (cdr result)))
|
|
|
|
|
|
(if (pred k)
|
|
|
|
|
|
(cons (vhash-consq k v r1) r2)
|
|
|
|
|
|
(cons r1 (vhash-consq k v r2)))))
|
|
|
|
|
|
(cons vlist-null vlist-null)
|
|
|
|
|
|
vhash)))
|
|
|
|
|
|
(values (car result) (cdr result))))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
|
|
|
|
|
(define unused-toplevel-analysis
|
|
|
|
|
|
;; Report unused top-level definitions that are not exported.
|
|
|
|
|
|
(let ((add-ref-from-context
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(lambda (graph name)
|
|
|
|
|
|
;; Add an edge CTX -> NAME in GRAPH.
|
|
|
|
|
|
(let* ((refs (reference-graph-refs graph))
|
|
|
|
|
|
(defs (reference-graph-defs graph))
|
|
|
|
|
|
(ctx (reference-graph-toplevel-context graph))
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(ctx-refs (or (and=> (vhash-assq ctx refs) cdr) '())))
|
|
|
|
|
|
(make-reference-graph (vhash-consq ctx (cons name ctx-refs) refs)
|
2010-01-11 18:28:19 +01:00
|
|
|
|
defs ctx)))))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
(define (macro-variable? name env)
|
|
|
|
|
|
(and (module? env)
|
|
|
|
|
|
(let ((var (module-variable env name)))
|
|
|
|
|
|
(and var (variable-bound? var)
|
|
|
|
|
|
(macro? (variable-ref var))))))
|
|
|
|
|
|
|
|
|
|
|
|
(make-tree-analysis
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(lambda (x graph env locs)
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;; Going down into X.
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(let ((ctx (reference-graph-toplevel-context graph))
|
|
|
|
|
|
(refs (reference-graph-refs graph))
|
|
|
|
|
|
(defs (reference-graph-defs graph)))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
(record-case x
|
2013-05-28 12:06:30 -04:00
|
|
|
|
((<toplevel-ref> name src)
|
|
|
|
|
|
(add-ref-from-context graph name))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
((<toplevel-define> name src)
|
|
|
|
|
|
(let ((refs refs)
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(defs (vhash-consq name (or src (find pair? locs))
|
|
|
|
|
|
defs)))
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(make-reference-graph refs defs name)))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
((<toplevel-set> name src)
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(add-ref-from-context graph name))
|
|
|
|
|
|
(else graph))))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(lambda (x graph env locs)
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;; Leaving X's scope.
|
|
|
|
|
|
(record-case x
|
|
|
|
|
|
((<toplevel-define>)
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(let ((refs (reference-graph-refs graph))
|
|
|
|
|
|
(defs (reference-graph-defs graph)))
|
|
|
|
|
|
(make-reference-graph refs defs #f)))
|
|
|
|
|
|
(else graph)))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(lambda (graph env)
|
|
|
|
|
|
;; Process the resulting reference graph: determine all private definitions
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;; not reachable from any public definition. Macros
|
|
|
|
|
|
;; (syntax-transformers), which are globally bound, never considered
|
|
|
|
|
|
;; unused since we can't tell whether a macro is actually used; in
|
2010-01-11 18:28:19 +01:00
|
|
|
|
;; addition, macros are considered roots of the graph since they may use
|
2010-01-11 01:19:16 +01:00
|
|
|
|
;; private bindings. FIXME: The `make-syntax-transformer' calls don't
|
|
|
|
|
|
;; contain any literal `toplevel-ref' of the global bindings they use so
|
|
|
|
|
|
;; this strategy fails.
|
|
|
|
|
|
(define (exported? name)
|
|
|
|
|
|
(if (module? env)
|
|
|
|
|
|
(module-variable (module-public-interface env) name)
|
|
|
|
|
|
#t))
|
|
|
|
|
|
|
|
|
|
|
|
(let-values (((public-defs private-defs)
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(partition* (lambda (name)
|
|
|
|
|
|
(or (exported? name)
|
|
|
|
|
|
(macro-variable? name env)))
|
|
|
|
|
|
(reference-graph-defs graph))))
|
|
|
|
|
|
(let* ((roots (vhash-consq #f #t public-defs))
|
2010-01-11 18:28:19 +01:00
|
|
|
|
(refs (reference-graph-refs graph))
|
|
|
|
|
|
(reachable (graph-reachable-nodes* roots refs))
|
2010-02-02 23:59:03 +01:00
|
|
|
|
(unused (vlist-filter (lambda (name+src)
|
|
|
|
|
|
(not (vhash-assq (car name+src)
|
|
|
|
|
|
reachable)))
|
|
|
|
|
|
private-defs)))
|
|
|
|
|
|
(vlist-for-each (lambda (name+loc)
|
|
|
|
|
|
(let ((name (car name+loc))
|
|
|
|
|
|
(loc (cdr name+loc)))
|
2010-10-20 22:40:10 +02:00
|
|
|
|
(if (not (gensym? name))
|
|
|
|
|
|
(warning 'unused-toplevel loc name))))
|
2010-02-02 23:59:03 +01:00
|
|
|
|
unused))))
|
|
|
|
|
|
|
|
|
|
|
|
(make-reference-graph vlist-null vlist-null #f))))
|
2010-01-11 01:19:16 +01:00
|
|
|
|
|
2018-07-24 11:53:02 +02:00
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Shadowed top-level definition analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
(define shadowed-toplevel-analysis
|
|
|
|
|
|
;; Report top-level definitions that shadow previous top-level
|
|
|
|
|
|
;; definitions from the same compilation unit.
|
|
|
|
|
|
(make-tree-analysis
|
|
|
|
|
|
(lambda (x defs env locs)
|
|
|
|
|
|
;; Going down into X.
|
|
|
|
|
|
(record-case x
|
|
|
|
|
|
((<toplevel-define> name src)
|
|
|
|
|
|
(match (vhash-assq name defs)
|
|
|
|
|
|
((_ . previous-definition)
|
|
|
|
|
|
(warning 'shadowed-toplevel src name
|
|
|
|
|
|
(toplevel-define-src previous-definition))
|
|
|
|
|
|
defs)
|
|
|
|
|
|
(#f
|
|
|
|
|
|
(vhash-consq name x defs))))
|
|
|
|
|
|
(else defs)))
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (x defs env locs)
|
|
|
|
|
|
;; Leaving X's scope.
|
|
|
|
|
|
defs)
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (defs env)
|
|
|
|
|
|
#t)
|
|
|
|
|
|
|
|
|
|
|
|
vlist-null))
|
|
|
|
|
|
|
2009-10-06 23:39:56 +02:00
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Unbound variable analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; <toplevel-info> records are used during tree traversal in search of
|
|
|
|
|
|
;; possibly unbound variable. They contain a list of references to
|
2010-01-08 12:02:00 +01:00
|
|
|
|
;; potentially unbound top-level variables, and a list of the top-level
|
|
|
|
|
|
;; defines that have been encountered.
|
2009-10-06 23:39:56 +02:00
|
|
|
|
(define-record-type <toplevel-info>
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(make-toplevel-info refs defs)
|
2009-10-06 23:39:56 +02:00
|
|
|
|
toplevel-info?
|
|
|
|
|
|
(refs toplevel-info-refs) ;; ((VARIABLE-NAME . LOCATION) ...)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(defs toplevel-info-defs)) ;; (VARIABLE-NAME ...)
|
2009-10-06 23:39:56 +02:00
|
|
|
|
|
2009-10-22 22:33:53 +02:00
|
|
|
|
(define (goops-toplevel-definition proc args env)
|
2011-06-02 13:42:55 +02:00
|
|
|
|
;; If call of PROC to ARGS is a GOOPS top-level definition, return
|
2009-10-22 00:37:36 +02:00
|
|
|
|
;; the name of the variable being defined; otherwise return #f. This
|
|
|
|
|
|
;; assumes knowledge of the current implementation of `define-class' et al.
|
2009-10-22 22:33:53 +02:00
|
|
|
|
(define (toplevel-define-arg args)
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(match args
|
|
|
|
|
|
((($ <const> _ (and (? symbol?) exp)) _)
|
|
|
|
|
|
exp)
|
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
|
|
|
|
|
|
(match proc
|
|
|
|
|
|
(($ <module-ref> _ '(oop goops) 'toplevel-define! #f)
|
|
|
|
|
|
(toplevel-define-arg args))
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <toplevel-ref> _ _ 'toplevel-define!)
|
2009-10-22 22:33:53 +02:00
|
|
|
|
;; This may be the result of expanding one of the GOOPS macros within
|
|
|
|
|
|
;; `oop/goops.scm'.
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(and (eq? env (resolve-module '(oop goops)))
|
2009-10-22 22:33:53 +02:00
|
|
|
|
(toplevel-define-arg args)))
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(_ #f)))
|
2009-10-22 00:37:36 +02:00
|
|
|
|
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(define unbound-variable-analysis
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; Report possibly unbound variables in the given tree.
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(make-tree-analysis
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(lambda (x info env locs)
|
2013-05-28 12:06:30 -04:00
|
|
|
|
;; Going down into X.
|
|
|
|
|
|
(let* ((refs (toplevel-info-refs info))
|
|
|
|
|
|
(defs (toplevel-info-defs info))
|
|
|
|
|
|
(src (tree-il-src x)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(define (bound? name)
|
|
|
|
|
|
(or (and (module? env)
|
|
|
|
|
|
(module-variable env name))
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(vhash-assq name defs)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
|
|
|
|
|
(record-case x
|
|
|
|
|
|
((<toplevel-ref> name src)
|
|
|
|
|
|
(if (bound? name)
|
|
|
|
|
|
info
|
|
|
|
|
|
(let ((src (or src (find pair? locs))))
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(make-toplevel-info (vhash-consq name src refs)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
defs))))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
((<toplevel-set> name src)
|
|
|
|
|
|
(if (bound? name)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(make-toplevel-info refs defs)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(let ((src (find pair? locs)))
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(make-toplevel-info (vhash-consq name src refs)
|
2010-01-08 12:02:00 +01:00
|
|
|
|
defs))))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
((<toplevel-define> name)
|
2011-02-22 00:31:00 +01:00
|
|
|
|
(make-toplevel-info (vhash-delq name refs)
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(vhash-consq name #t defs)))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
2011-06-02 13:42:55 +02:00
|
|
|
|
((<call> proc args)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
;; Check for a dynamic top-level definition, as is
|
|
|
|
|
|
;; done by code expanded from GOOPS macros.
|
|
|
|
|
|
(let ((name (goops-toplevel-definition proc args
|
|
|
|
|
|
env)))
|
|
|
|
|
|
(if (symbol? name)
|
2011-02-22 00:31:00 +01:00
|
|
|
|
(make-toplevel-info (vhash-delq name refs)
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(vhash-consq name #t defs))
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(make-toplevel-info refs defs))))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
(else
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(make-toplevel-info refs defs)))))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(lambda (x info env locs)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
;; Leaving X's scope.
|
2010-01-11 01:19:16 +01:00
|
|
|
|
info)
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
|
|
|
|
|
(lambda (toplevel env)
|
|
|
|
|
|
;; Post-process the result.
|
2016-06-25 18:08:28 +02:00
|
|
|
|
(vlist-for-each (match-lambda
|
|
|
|
|
|
((name . loc)
|
|
|
|
|
|
(warning 'unbound-variable loc name)))
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(vlist-reverse (toplevel-info-refs toplevel))))
|
2009-11-06 10:42:45 +01:00
|
|
|
|
|
2010-02-02 23:59:34 +01:00
|
|
|
|
(make-toplevel-info vlist-null vlist-null)))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
|
2016-06-25 18:08:28 +02:00
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Macro use-before-definition analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
|
|
;; <macro-use-info> records are used during tree traversal in search of
|
|
|
|
|
|
;; possibly uses of macros before they are defined. They contain a list
|
|
|
|
|
|
;; of references to top-level variables, and a list of the top-level
|
|
|
|
|
|
;; macro definitions that have been encountered. Any definition which
|
|
|
|
|
|
;; is a macro should in theory be expanded out already; if that's not
|
|
|
|
|
|
;; the case, the program likely has a bug.
|
|
|
|
|
|
(define-record-type <macro-use-info>
|
|
|
|
|
|
(make-macro-use-info uses defs)
|
|
|
|
|
|
macro-use-info?
|
|
|
|
|
|
(uses macro-use-info-uses) ;; ((VARIABLE-NAME . LOCATION) ...)
|
|
|
|
|
|
(defs macro-use-info-defs)) ;; ((VARIABLE-NAME . LOCATION) ...)
|
|
|
|
|
|
|
|
|
|
|
|
(define macro-use-before-definition-analysis
|
|
|
|
|
|
;; Report possibly unbound variables in the given tree.
|
|
|
|
|
|
(make-tree-analysis
|
|
|
|
|
|
(lambda (x info env locs)
|
|
|
|
|
|
;; Going down into X.
|
|
|
|
|
|
(define (nearest-loc src)
|
|
|
|
|
|
(or src (find pair? locs)))
|
|
|
|
|
|
(define (add-use name src)
|
|
|
|
|
|
(match info
|
|
|
|
|
|
(($ <macro-use-info> uses defs)
|
|
|
|
|
|
(make-macro-use-info (vhash-consq name src uses) defs))))
|
|
|
|
|
|
(define (add-def name src)
|
|
|
|
|
|
(match info
|
|
|
|
|
|
(($ <macro-use-info> uses defs)
|
|
|
|
|
|
(make-macro-use-info uses (vhash-consq name src defs)))))
|
|
|
|
|
|
(define (macro? x)
|
|
|
|
|
|
(match x
|
|
|
|
|
|
(($ <primcall> _ 'make-syntax-transformer) #t)
|
|
|
|
|
|
(_ #f)))
|
|
|
|
|
|
(match x
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <toplevel-ref> src mod name)
|
2016-06-25 18:08:28 +02:00
|
|
|
|
(add-use name (nearest-loc src)))
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <toplevel-set> src mod name)
|
2016-06-25 18:08:28 +02:00
|
|
|
|
(add-use name (nearest-loc src)))
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <toplevel-define> src mod name (? macro?))
|
2016-06-25 18:08:28 +02:00
|
|
|
|
(add-def name (nearest-loc src)))
|
|
|
|
|
|
(_ info)))
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (x info env locs)
|
|
|
|
|
|
;; Leaving X's scope.
|
|
|
|
|
|
info)
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (info env)
|
|
|
|
|
|
;; Post-process the result.
|
|
|
|
|
|
(match info
|
|
|
|
|
|
(($ <macro-use-info> uses defs)
|
|
|
|
|
|
(vlist-for-each
|
|
|
|
|
|
(match-lambda
|
|
|
|
|
|
((name . use-loc)
|
|
|
|
|
|
(when (vhash-assq name defs)
|
|
|
|
|
|
(warning 'macro-use-before-definition use-loc name))))
|
|
|
|
|
|
(vlist-reverse (macro-use-info-uses info))))))
|
|
|
|
|
|
|
|
|
|
|
|
(make-macro-use-info vlist-null vlist-null)))
|
|
|
|
|
|
|
2009-11-07 18:32:26 +01:00
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; Arity analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2009-11-08 01:02:08 +01:00
|
|
|
|
;; <arity-info> records contain information about lexical definitions of
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; procedures currently in scope, top-level procedure definitions that have
|
|
|
|
|
|
;; been encountered, and calls to top-level procedures that have been
|
|
|
|
|
|
;; encountered.
|
|
|
|
|
|
(define-record-type <arity-info>
|
|
|
|
|
|
(make-arity-info toplevel-calls lexical-lambdas toplevel-lambdas)
|
|
|
|
|
|
arity-info?
|
2011-06-02 13:42:55 +02:00
|
|
|
|
(toplevel-calls toplevel-procedure-calls) ;; ((NAME . CALL) ...)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(lexical-lambdas lexical-lambdas) ;; ((GENSYM . DEFINITION) ...)
|
|
|
|
|
|
(toplevel-lambdas toplevel-lambdas)) ;; ((NAME . DEFINITION) ...)
|
|
|
|
|
|
|
2011-06-02 13:42:55 +02:00
|
|
|
|
(define (validate-arity proc call lexical?)
|
|
|
|
|
|
;; Validate the argument count of CALL, a tree-il call of
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; PROC, emitting a warning in case of argument count mismatch.
|
|
|
|
|
|
|
2009-11-08 01:02:08 +01:00
|
|
|
|
(define (filter-keyword-args keywords allow-other-keys? args)
|
|
|
|
|
|
;; Filter keyword arguments from ARGS and return the resulting list.
|
|
|
|
|
|
;; KEYWORDS is the list of allowed keywords, and ALLOW-OTHER-KEYS?
|
|
|
|
|
|
;; specified whethere keywords not listed in KEYWORDS are allowed.
|
|
|
|
|
|
(let loop ((args args)
|
|
|
|
|
|
(result '()))
|
|
|
|
|
|
(if (null? args)
|
|
|
|
|
|
(reverse result)
|
|
|
|
|
|
(let ((arg (car args)))
|
|
|
|
|
|
(if (and (const? arg)
|
|
|
|
|
|
(or (memq (const-exp arg) keywords)
|
|
|
|
|
|
(and allow-other-keys?
|
|
|
|
|
|
(keyword? (const-exp arg)))))
|
|
|
|
|
|
(loop (if (pair? (cdr args))
|
|
|
|
|
|
(cddr args)
|
|
|
|
|
|
'())
|
|
|
|
|
|
result)
|
|
|
|
|
|
(loop (cdr args)
|
|
|
|
|
|
(cons arg result)))))))
|
|
|
|
|
|
|
2009-11-08 17:53:14 +01:00
|
|
|
|
(define (arities proc)
|
|
|
|
|
|
;; Return the arities of PROC, which can be either a tree-il or a
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; procedure.
|
|
|
|
|
|
(define (len x)
|
|
|
|
|
|
(or (and (or (null? x) (pair? x))
|
|
|
|
|
|
(length x))
|
|
|
|
|
|
0))
|
2013-11-19 19:11:40 +01:00
|
|
|
|
(cond ((program? proc)
|
2010-04-17 15:17:24 +02:00
|
|
|
|
(values (procedure-name proc)
|
2009-11-08 17:53:14 +01:00
|
|
|
|
(map (lambda (a)
|
2013-10-18 18:41:59 +02:00
|
|
|
|
(list (length (or (assq-ref a 'required) '()))
|
|
|
|
|
|
(length (or (assq-ref a 'optional) '()))
|
|
|
|
|
|
(and (assq-ref a 'rest) #t)
|
|
|
|
|
|
(map car (or (assq-ref a 'keyword) '()))
|
|
|
|
|
|
(assq-ref a 'allow-other-keys?)))
|
|
|
|
|
|
(program-arguments-alists proc))))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
((procedure? proc)
|
2012-05-21 18:06:34 +02:00
|
|
|
|
(if (struct? proc)
|
|
|
|
|
|
;; An applicable struct.
|
|
|
|
|
|
(arities (struct-ref proc 0))
|
|
|
|
|
|
;; An applicable smob.
|
|
|
|
|
|
(let ((arity (procedure-minimum-arity proc)))
|
|
|
|
|
|
(values (procedure-name proc)
|
|
|
|
|
|
(list (list (car arity) (cadr arity) (caddr arity)
|
|
|
|
|
|
#f #f))))))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(else
|
2009-11-08 17:53:14 +01:00
|
|
|
|
(let loop ((name #f)
|
|
|
|
|
|
(proc proc)
|
|
|
|
|
|
(arities '()))
|
|
|
|
|
|
(if (not proc)
|
|
|
|
|
|
(values name (reverse arities))
|
|
|
|
|
|
(record-case proc
|
2009-12-11 11:49:14 +01:00
|
|
|
|
((<lambda-case> req opt rest kw alternate)
|
|
|
|
|
|
(loop name alternate
|
2009-11-08 17:53:14 +01:00
|
|
|
|
(cons (list (len req) (len opt) rest
|
|
|
|
|
|
(and (pair? kw) (map car (cdr kw)))
|
|
|
|
|
|
(and (pair? kw) (car kw)))
|
|
|
|
|
|
arities)))
|
|
|
|
|
|
((<lambda> meta body)
|
|
|
|
|
|
(loop (assoc-ref meta 'name) body arities))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(values #f #f))))))))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
|
2011-06-02 13:42:55 +02:00
|
|
|
|
(let ((args (call-args call))
|
|
|
|
|
|
(src (tree-il-src call)))
|
2009-11-08 17:53:14 +01:00
|
|
|
|
(call-with-values (lambda () (arities proc))
|
|
|
|
|
|
(lambda (name arities)
|
|
|
|
|
|
(define matches?
|
|
|
|
|
|
(find (lambda (arity)
|
|
|
|
|
|
(pmatch arity
|
|
|
|
|
|
((,req ,opt ,rest? ,kw ,aok?)
|
|
|
|
|
|
(let ((args (if (pair? kw)
|
|
|
|
|
|
(filter-keyword-args kw aok? args)
|
|
|
|
|
|
args)))
|
|
|
|
|
|
(if (and req opt)
|
|
|
|
|
|
(let ((count (length args)))
|
|
|
|
|
|
(and (>= count req)
|
|
|
|
|
|
(or rest?
|
|
|
|
|
|
(<= count (+ req opt)))))
|
|
|
|
|
|
#t)))
|
|
|
|
|
|
(else #t)))
|
|
|
|
|
|
arities))
|
|
|
|
|
|
|
|
|
|
|
|
(if (not matches?)
|
|
|
|
|
|
(warning 'arity-mismatch src
|
|
|
|
|
|
(or name (with-output-to-string (lambda () (write proc))))
|
|
|
|
|
|
lexical?)))))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
#t)
|
|
|
|
|
|
|
|
|
|
|
|
(define arity-analysis
|
|
|
|
|
|
;; Report arity mismatches in the given tree.
|
|
|
|
|
|
(make-tree-analysis
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(lambda (x info env locs)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; Down into X.
|
|
|
|
|
|
(define (extend lexical-name val info)
|
|
|
|
|
|
;; If VAL is a lambda, add NAME to the lexical-lambdas of INFO.
|
|
|
|
|
|
(let ((toplevel-calls (toplevel-procedure-calls info))
|
|
|
|
|
|
(lexical-lambdas (lexical-lambdas info))
|
|
|
|
|
|
(toplevel-lambdas (toplevel-lambdas info)))
|
|
|
|
|
|
(record-case val
|
|
|
|
|
|
((<lambda> body)
|
|
|
|
|
|
(make-arity-info toplevel-calls
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(vhash-consq lexical-name val
|
|
|
|
|
|
lexical-lambdas)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
toplevel-lambdas))
|
|
|
|
|
|
((<lexical-ref> gensym)
|
|
|
|
|
|
;; lexical alias
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(let ((val* (vhash-assq gensym lexical-lambdas)))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(if (pair? val*)
|
|
|
|
|
|
(extend lexical-name (cdr val*) info)
|
|
|
|
|
|
info)))
|
|
|
|
|
|
((<toplevel-ref> name)
|
|
|
|
|
|
;; top-level alias
|
|
|
|
|
|
(make-arity-info toplevel-calls
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(vhash-consq lexical-name val
|
|
|
|
|
|
lexical-lambdas)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
toplevel-lambdas))
|
|
|
|
|
|
(else info))))
|
|
|
|
|
|
|
|
|
|
|
|
(let ((toplevel-calls (toplevel-procedure-calls info))
|
|
|
|
|
|
(lexical-lambdas (lexical-lambdas info))
|
|
|
|
|
|
(toplevel-lambdas (toplevel-lambdas info)))
|
|
|
|
|
|
|
|
|
|
|
|
(record-case x
|
|
|
|
|
|
((<toplevel-define> name exp)
|
|
|
|
|
|
(record-case exp
|
|
|
|
|
|
((<lambda> body)
|
|
|
|
|
|
(make-arity-info toplevel-calls
|
|
|
|
|
|
lexical-lambdas
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(vhash-consq name exp toplevel-lambdas)))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
((<toplevel-ref> name)
|
|
|
|
|
|
;; alias for another toplevel
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(let ((proc (vhash-assq name toplevel-lambdas)))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(make-arity-info toplevel-calls
|
|
|
|
|
|
lexical-lambdas
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(vhash-consq (toplevel-define-name x)
|
|
|
|
|
|
(if (pair? proc)
|
|
|
|
|
|
(cdr proc)
|
|
|
|
|
|
exp)
|
|
|
|
|
|
toplevel-lambdas))))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(else info)))
|
2010-05-02 11:22:23 +02:00
|
|
|
|
((<let> gensyms vals)
|
|
|
|
|
|
(fold extend info gensyms vals))
|
|
|
|
|
|
((<letrec> gensyms vals)
|
|
|
|
|
|
(fold extend info gensyms vals))
|
|
|
|
|
|
((<fix> gensyms vals)
|
|
|
|
|
|
(fold extend info gensyms vals))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
|
2011-06-02 13:42:55 +02:00
|
|
|
|
((<call> proc args src)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(record-case proc
|
|
|
|
|
|
((<lambda> body)
|
|
|
|
|
|
(validate-arity proc x #t)
|
|
|
|
|
|
info)
|
|
|
|
|
|
((<toplevel-ref> name)
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(make-arity-info (vhash-consq name x toplevel-calls)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
lexical-lambdas
|
|
|
|
|
|
toplevel-lambdas))
|
|
|
|
|
|
((<lexical-ref> gensym)
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(let ((proc (vhash-assq gensym lexical-lambdas)))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
(if (pair? proc)
|
|
|
|
|
|
(record-case (cdr proc)
|
|
|
|
|
|
((<toplevel-ref> name)
|
|
|
|
|
|
;; alias to toplevel
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(make-arity-info (vhash-consq name x toplevel-calls)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
lexical-lambdas
|
|
|
|
|
|
toplevel-lambdas))
|
|
|
|
|
|
(else
|
|
|
|
|
|
(validate-arity (cdr proc) x #t)
|
|
|
|
|
|
info))
|
|
|
|
|
|
|
|
|
|
|
|
;; If GENSYM wasn't found, it may be because it's an
|
|
|
|
|
|
;; argument of the procedure being compiled.
|
|
|
|
|
|
info)))
|
|
|
|
|
|
(else info)))
|
|
|
|
|
|
(else info))))
|
|
|
|
|
|
|
2010-01-08 12:02:00 +01:00
|
|
|
|
(lambda (x info env locs)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
;; Up from X.
|
|
|
|
|
|
(define (shrink name val info)
|
|
|
|
|
|
;; Remove NAME from the lexical-lambdas of INFO.
|
|
|
|
|
|
(let ((toplevel-calls (toplevel-procedure-calls info))
|
|
|
|
|
|
(lexical-lambdas (lexical-lambdas info))
|
|
|
|
|
|
(toplevel-lambdas (toplevel-lambdas info)))
|
|
|
|
|
|
(make-arity-info toplevel-calls
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(if (vhash-assq name lexical-lambdas)
|
|
|
|
|
|
(vlist-tail lexical-lambdas)
|
|
|
|
|
|
lexical-lambdas)
|
2009-11-07 18:32:26 +01:00
|
|
|
|
toplevel-lambdas)))
|
|
|
|
|
|
|
|
|
|
|
|
(let ((toplevel-calls (toplevel-procedure-calls info))
|
|
|
|
|
|
(lexical-lambdas (lexical-lambdas info))
|
|
|
|
|
|
(toplevel-lambdas (toplevel-lambdas info)))
|
|
|
|
|
|
(record-case x
|
2010-05-02 11:22:23 +02:00
|
|
|
|
((<let> gensyms vals)
|
|
|
|
|
|
(fold shrink info gensyms vals))
|
|
|
|
|
|
((<letrec> gensyms vals)
|
|
|
|
|
|
(fold shrink info gensyms vals))
|
|
|
|
|
|
((<fix> gensyms vals)
|
|
|
|
|
|
(fold shrink info gensyms vals))
|
2009-11-07 18:32:26 +01:00
|
|
|
|
|
|
|
|
|
|
(else info))))
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (result env)
|
|
|
|
|
|
;; Post-processing: check all top-level procedure calls that have been
|
|
|
|
|
|
;; encountered.
|
|
|
|
|
|
(let ((toplevel-calls (toplevel-procedure-calls result))
|
|
|
|
|
|
(toplevel-lambdas (toplevel-lambdas result)))
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(vlist-for-each
|
2011-06-02 13:42:55 +02:00
|
|
|
|
(lambda (name+call)
|
|
|
|
|
|
(let* ((name (car name+call))
|
|
|
|
|
|
(call (cdr name+call))
|
2010-02-03 00:00:05 +01:00
|
|
|
|
(proc
|
|
|
|
|
|
(or (and=> (vhash-assq name toplevel-lambdas) cdr)
|
|
|
|
|
|
(and (module? env)
|
|
|
|
|
|
(false-if-exception
|
|
|
|
|
|
(module-ref env name)))))
|
|
|
|
|
|
(proc*
|
|
|
|
|
|
;; handle toplevel aliases
|
|
|
|
|
|
(if (toplevel-ref? proc)
|
|
|
|
|
|
(let ((name (toplevel-ref-name proc)))
|
|
|
|
|
|
(and (module? env)
|
|
|
|
|
|
(false-if-exception
|
|
|
|
|
|
(module-ref env name))))
|
|
|
|
|
|
proc)))
|
2012-05-12 15:58:23 +02:00
|
|
|
|
(cond ((lambda? proc*)
|
2012-05-21 19:20:27 +02:00
|
|
|
|
(validate-arity proc* call #t))
|
2012-05-12 15:58:23 +02:00
|
|
|
|
((procedure? proc*)
|
2012-05-21 19:20:27 +02:00
|
|
|
|
(validate-arity proc* call #f)))))
|
2010-02-03 00:00:05 +01:00
|
|
|
|
toplevel-calls)))
|
|
|
|
|
|
|
|
|
|
|
|
(make-arity-info vlist-null vlist-null vlist-null)))
|
2010-10-08 16:25:32 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
|
;;; `format' argument analysis.
|
|
|
|
|
|
;;;
|
|
|
|
|
|
|
2010-10-10 19:08:11 +02:00
|
|
|
|
(define &syntax-error
|
|
|
|
|
|
;; The `throw' key for syntax errors.
|
|
|
|
|
|
(gensym "format-string-syntax-error"))
|
|
|
|
|
|
|
2010-10-08 16:25:32 +02:00
|
|
|
|
(define (format-string-argument-count fmt)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
;; Return the minimum and maxium number of arguments that should
|
|
|
|
|
|
;; follow format string FMT (or, ahem, a good estimate thereof) or
|
|
|
|
|
|
;; `any' if the format string can be followed by any number of
|
|
|
|
|
|
;; arguments.
|
|
|
|
|
|
|
|
|
|
|
|
(define (drop-group chars end)
|
|
|
|
|
|
;; Drop characters from CHARS until "~END" is encountered.
|
|
|
|
|
|
(let loop ((chars chars)
|
|
|
|
|
|
(tilde? #f))
|
|
|
|
|
|
(if (null? chars)
|
2010-10-10 19:08:11 +02:00
|
|
|
|
(throw &syntax-error 'unterminated-iteration)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(if tilde?
|
|
|
|
|
|
(if (eq? (car chars) end)
|
|
|
|
|
|
(cdr chars)
|
|
|
|
|
|
(loop (cdr chars) #f))
|
|
|
|
|
|
(if (eq? (car chars) #\~)
|
|
|
|
|
|
(loop (cdr chars) #t)
|
|
|
|
|
|
(loop (cdr chars) #f))))))
|
|
|
|
|
|
|
|
|
|
|
|
(define (digit? char)
|
|
|
|
|
|
;; Return true if CHAR is a digit, #f otherwise.
|
|
|
|
|
|
(memq char '(#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (previous-number chars)
|
|
|
|
|
|
;; Return the previous series of digits found in CHARS.
|
|
|
|
|
|
(let ((numbers (take-while digit? chars)))
|
|
|
|
|
|
(and (not (null? numbers))
|
|
|
|
|
|
(string->number (list->string (reverse numbers))))))
|
|
|
|
|
|
|
|
|
|
|
|
(let loop ((chars (string->list fmt))
|
|
|
|
|
|
(state 'literal)
|
|
|
|
|
|
(params '())
|
|
|
|
|
|
(conditions '())
|
|
|
|
|
|
(end-group #f)
|
|
|
|
|
|
(min-count 0)
|
|
|
|
|
|
(max-count 0))
|
2010-10-08 16:25:32 +02:00
|
|
|
|
(if (null? chars)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(if end-group
|
2010-10-10 19:08:11 +02:00
|
|
|
|
(throw &syntax-error 'unterminated-conditional)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(values min-count max-count))
|
|
|
|
|
|
(case state
|
|
|
|
|
|
((tilde)
|
|
|
|
|
|
(case (car chars)
|
2013-01-19 17:05:27 +00:00
|
|
|
|
((#\~ #\% #\& #\t #\T #\_ #\newline #\( #\) #\! #\| #\/ #\q #\Q)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(loop (cdr chars) 'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
min-count max-count))
|
2013-01-19 17:05:27 +00:00
|
|
|
|
((#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9 #\, #\: #\@ #\+ #\- #\#)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(loop (cdr chars)
|
|
|
|
|
|
'tilde (cons (car chars) params)
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
min-count max-count))
|
|
|
|
|
|
((#\v #\V) (loop (cdr chars)
|
|
|
|
|
|
'tilde (cons (car chars) params)
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
(+ 1 min-count)
|
|
|
|
|
|
(+ 1 max-count)))
|
2014-08-26 23:40:22 +02:00
|
|
|
|
((#\p #\P) (let* ((colon? (memq #\: params))
|
|
|
|
|
|
(min-count (if colon?
|
|
|
|
|
|
(max 1 min-count)
|
|
|
|
|
|
(+ 1 min-count))))
|
|
|
|
|
|
(loop (cdr chars) 'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
min-count
|
|
|
|
|
|
(if colon?
|
|
|
|
|
|
(max max-count min-count)
|
|
|
|
|
|
(+ 1 max-count)))))
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
((#\[)
|
|
|
|
|
|
(loop chars 'literal '() '()
|
|
|
|
|
|
(let ((selector (previous-number params))
|
|
|
|
|
|
(at? (memq #\@ params)))
|
|
|
|
|
|
(lambda (chars conds)
|
|
|
|
|
|
;; end of group
|
|
|
|
|
|
(let ((mins (map car conds))
|
|
|
|
|
|
(maxs (map cdr conds))
|
|
|
|
|
|
(sel? (and selector
|
|
|
|
|
|
(< selector (length conds)))))
|
|
|
|
|
|
(if (and (every number? mins)
|
|
|
|
|
|
(every number? maxs))
|
|
|
|
|
|
(loop chars 'literal '() conditions end-group
|
|
|
|
|
|
(+ min-count
|
|
|
|
|
|
(if sel?
|
|
|
|
|
|
(car (list-ref conds selector))
|
|
|
|
|
|
(+ (if at? 0 1)
|
|
|
|
|
|
(if (null? mins)
|
|
|
|
|
|
0
|
|
|
|
|
|
(apply min mins)))))
|
|
|
|
|
|
(+ max-count
|
|
|
|
|
|
(if sel?
|
|
|
|
|
|
(cdr (list-ref conds selector))
|
|
|
|
|
|
(+ (if at? 0 1)
|
|
|
|
|
|
(if (null? maxs)
|
|
|
|
|
|
0
|
|
|
|
|
|
(apply max maxs))))))
|
2010-10-10 19:08:11 +02:00
|
|
|
|
(values 'any 'any))))) ;; XXX: approximation
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
0 0))
|
|
|
|
|
|
((#\;)
|
2010-10-10 19:08:11 +02:00
|
|
|
|
(if end-group
|
|
|
|
|
|
(loop (cdr chars) 'literal '()
|
|
|
|
|
|
(cons (cons min-count max-count) conditions)
|
|
|
|
|
|
end-group
|
|
|
|
|
|
0 0)
|
|
|
|
|
|
(throw &syntax-error 'unexpected-semicolon)))
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
((#\])
|
|
|
|
|
|
(if end-group
|
|
|
|
|
|
(end-group (cdr chars)
|
|
|
|
|
|
(reverse (cons (cons min-count max-count)
|
|
|
|
|
|
conditions)))
|
2010-10-10 19:08:11 +02:00
|
|
|
|
(throw &syntax-error 'unexpected-conditional-termination)))
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
((#\{) (if (memq #\@ params)
|
|
|
|
|
|
(values min-count 'any)
|
|
|
|
|
|
(loop (drop-group (cdr chars) #\})
|
|
|
|
|
|
'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
(+ 1 min-count) (+ 1 max-count))))
|
|
|
|
|
|
((#\*) (if (memq #\@ params)
|
|
|
|
|
|
(values 'any 'any) ;; it's unclear what to do here
|
|
|
|
|
|
(loop (cdr chars)
|
|
|
|
|
|
'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
(+ (or (previous-number params) 1)
|
|
|
|
|
|
min-count)
|
|
|
|
|
|
(+ (or (previous-number params) 1)
|
|
|
|
|
|
max-count))))
|
2013-01-19 17:05:27 +00:00
|
|
|
|
((#\? #\k #\K)
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
;; We don't have enough info to determine the exact number
|
|
|
|
|
|
;; of args, but we could determine a lower bound (TODO).
|
|
|
|
|
|
(values 'any 'any))
|
2013-01-19 17:05:27 +00:00
|
|
|
|
((#\^)
|
|
|
|
|
|
(values min-count 'any))
|
2012-02-03 16:52:15 +01:00
|
|
|
|
((#\h #\H)
|
|
|
|
|
|
(let ((argc (if (memq #\: params) 2 1)))
|
|
|
|
|
|
(loop (cdr chars) 'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
(+ argc min-count)
|
|
|
|
|
|
(+ argc max-count))))
|
2013-01-19 17:05:27 +00:00
|
|
|
|
((#\')
|
|
|
|
|
|
(if (null? (cdr chars))
|
|
|
|
|
|
(throw &syntax-error 'unexpected-termination)
|
|
|
|
|
|
(loop (cddr chars) 'tilde (cons (cadr chars) params)
|
|
|
|
|
|
conditions end-group min-count max-count)))
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(else (loop (cdr chars) 'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
(+ 1 min-count) (+ 1 max-count)))))
|
|
|
|
|
|
((literal)
|
|
|
|
|
|
(case (car chars)
|
|
|
|
|
|
((#\~) (loop (cdr chars) 'tilde '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
min-count max-count))
|
|
|
|
|
|
(else (loop (cdr chars) 'literal '()
|
|
|
|
|
|
conditions end-group
|
|
|
|
|
|
min-count max-count))))
|
|
|
|
|
|
(else (error "computer bought the farm" state))))))
|
2010-10-08 16:25:32 +02:00
|
|
|
|
|
2012-02-19 23:54:18 +01:00
|
|
|
|
(define (proc-ref? exp proc special-name env)
|
|
|
|
|
|
"Return #t when EXP designates procedure PROC in ENV. As a last
|
|
|
|
|
|
resort, return #t when EXP refers to the global variable SPECIAL-NAME."
|
2012-05-12 16:11:51 +02:00
|
|
|
|
|
|
|
|
|
|
(define special?
|
|
|
|
|
|
(cut eq? <> special-name))
|
|
|
|
|
|
|
2012-02-19 23:54:18 +01:00
|
|
|
|
(match exp
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <toplevel-ref> _ _ (? special?))
|
2019-09-12 21:45:26 +02:00
|
|
|
|
;; Allow top-levels like: (define G_ (cut gettext <> "my-domain")).
|
2012-05-12 16:11:51 +02:00
|
|
|
|
#t)
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <toplevel-ref> _ _ name)
|
2012-03-02 17:46:28 +01:00
|
|
|
|
(let ((var (module-variable env name)))
|
2012-05-12 16:11:51 +02:00
|
|
|
|
(and var (variable-bound? var)
|
|
|
|
|
|
(eq? (variable-ref var) proc))))
|
|
|
|
|
|
(($ <module-ref> _ _ (? special?))
|
|
|
|
|
|
#t)
|
2012-02-19 23:08:49 +01:00
|
|
|
|
(($ <module-ref> _ module name public?)
|
2012-03-02 17:46:28 +01:00
|
|
|
|
(let* ((mod (if public?
|
|
|
|
|
|
(false-if-exception (resolve-interface module))
|
2012-05-12 15:31:28 +02:00
|
|
|
|
(resolve-module module #:ensure #f)))
|
2012-03-02 17:46:28 +01:00
|
|
|
|
(var (and mod (module-variable mod name))))
|
|
|
|
|
|
(and var (variable-bound? var) (eq? (variable-ref var) proc))))
|
2012-05-12 16:11:51 +02:00
|
|
|
|
(($ <lexical-ref> _ (? special?))
|
2012-05-12 15:31:28 +02:00
|
|
|
|
#t)
|
2012-02-19 23:08:49 +01:00
|
|
|
|
(_ #f)))
|
|
|
|
|
|
|
2019-09-12 21:45:26 +02:00
|
|
|
|
(define gettext? (cut proc-ref? <> gettext 'G_ <>))
|
2012-02-19 23:54:18 +01:00
|
|
|
|
(define ngettext? (cut proc-ref? <> ngettext 'N_ <>))
|
|
|
|
|
|
|
2012-02-19 23:08:49 +01:00
|
|
|
|
(define (const-fmt x env)
|
2012-02-19 23:54:18 +01:00
|
|
|
|
;; Return the literal format string for X, or #f.
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(match x
|
2012-02-19 23:54:18 +01:00
|
|
|
|
(($ <const> _ (? string? exp))
|
2011-04-14 16:53:18 +02:00
|
|
|
|
exp)
|
2012-02-23 14:10:22 +01:00
|
|
|
|
(($ <call> _ (? (cut gettext? <> env))
|
2012-02-19 23:08:49 +01:00
|
|
|
|
(($ <const> _ (? string? fmt))))
|
2019-09-12 21:45:26 +02:00
|
|
|
|
;; Gettexted literals, like `(G_ "foo")'.
|
2011-09-06 00:18:36 +02:00
|
|
|
|
fmt)
|
2012-02-23 14:10:22 +01:00
|
|
|
|
(($ <call> _ (? (cut ngettext? <> env))
|
2012-02-19 23:54:18 +01:00
|
|
|
|
(($ <const> _ (? string? fmt)) ($ <const> _ (? string?)) _ ..1))
|
|
|
|
|
|
;; Plural gettextized literals, like `(N_ "singular" "plural" n)'.
|
|
|
|
|
|
|
|
|
|
|
|
;; TODO: Check whether the singular and plural strings have the
|
|
|
|
|
|
;; same format escapes.
|
|
|
|
|
|
fmt)
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(_ #f)))
|
2011-04-14 16:04:18 +02:00
|
|
|
|
|
2010-10-08 16:25:32 +02:00
|
|
|
|
(define format-analysis
|
|
|
|
|
|
;; Report arity mismatches in the given tree.
|
|
|
|
|
|
(make-tree-analysis
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(lambda (x res env locs)
|
2010-10-08 16:25:32 +02:00
|
|
|
|
;; Down into X.
|
|
|
|
|
|
(define (check-format-args args loc)
|
|
|
|
|
|
(pmatch args
|
|
|
|
|
|
((,port ,fmt . ,rest)
|
2012-02-19 23:08:49 +01:00
|
|
|
|
(guard (const-fmt fmt env))
|
2010-10-10 18:10:18 +02:00
|
|
|
|
(if (and (const? port)
|
|
|
|
|
|
(not (boolean? (const-exp port))))
|
|
|
|
|
|
(warning 'format loc 'wrong-port (const-exp port)))
|
2012-02-19 23:08:49 +01:00
|
|
|
|
(let ((fmt (const-fmt fmt env))
|
Implement fancy format string analysis.
* module/language/tree-il/analyze.scm (format-string-argument-count):
Return two values, the minimum and maximum number of arguments.
Add support for most of `format' escapes, including conditionals.
(format-analysis): Adjust accordingly.
* module/system/base/message.scm (%warning-types)[format]: Take two
arguments, MIN and MAX, instead of EXPECTED. Display warning
accordingly.
* test-suite/tests/tree-il.test ("warnings")["format"]("~%, ~~, ~&, ~t,
~_, and ~\\n", "~{...~}", "~{...~}, too many args", "~@{...~}",
"~@{...~}, too few args", "~(...~)", "~v", "~v:@y", "~*", "~?",
"complex 1", "complex 2", "complex 3"): New tests.
("conditionals"): New test prefix.
2010-10-10 17:13:21 +02:00
|
|
|
|
(count (length rest)))
|
2012-02-19 23:54:18 +01:00
|
|
|
|
(catch &syntax-error
|
|
|
|
|
|
(lambda ()
|
|
|
|
|
|
(let-values (((min max)
|
|
|
|
|
|
(format-string-argument-count fmt)))
|
|
|
|
|
|
(and min max
|
|
|
|
|
|
(or (and (or (eq? min 'any) (>= count min))
|
|
|
|
|
|
(or (eq? max 'any) (<= count max)))
|
|
|
|
|
|
(warning 'format loc 'wrong-format-arg-count
|
|
|
|
|
|
fmt min max count)))))
|
|
|
|
|
|
(lambda (_ key)
|
|
|
|
|
|
(warning 'format loc 'syntax-error key fmt)))))
|
2010-10-10 18:10:18 +02:00
|
|
|
|
((,port ,fmt . ,rest)
|
2011-04-14 16:04:18 +02:00
|
|
|
|
(if (and (const? port)
|
|
|
|
|
|
(not (boolean? (const-exp port))))
|
2012-01-26 00:36:39 +01:00
|
|
|
|
(warning 'format loc 'wrong-port (const-exp port)))
|
2012-02-19 23:54:18 +01:00
|
|
|
|
|
|
|
|
|
|
(match fmt
|
|
|
|
|
|
(($ <const> loc* (? (negate string?) fmt))
|
|
|
|
|
|
(warning 'format (or loc* loc) 'wrong-format-string fmt))
|
|
|
|
|
|
|
|
|
|
|
|
;; Warn on non-literal format strings, unless they refer to
|
|
|
|
|
|
;; a lexical variable named "fmt".
|
|
|
|
|
|
(($ <lexical-ref> _ fmt)
|
|
|
|
|
|
#t)
|
|
|
|
|
|
((? (negate const?))
|
|
|
|
|
|
(warning 'format loc 'non-literal-format-string))))
|
2010-10-10 18:10:18 +02:00
|
|
|
|
(else
|
|
|
|
|
|
(warning 'format loc 'wrong-num-args (length args)))))
|
2010-10-08 16:25:32 +02:00
|
|
|
|
|
2012-01-26 00:35:46 +01:00
|
|
|
|
(define (check-simple-format-args args loc)
|
|
|
|
|
|
;; Check the arguments to the `simple-format' procedure, which is
|
|
|
|
|
|
;; less capable than that of (ice-9 format).
|
|
|
|
|
|
|
|
|
|
|
|
(define allowed-chars
|
|
|
|
|
|
'(#\A #\S #\a #\s #\~ #\%))
|
|
|
|
|
|
|
|
|
|
|
|
(define (format-chars fmt)
|
|
|
|
|
|
(let loop ((chars (string->list fmt))
|
|
|
|
|
|
(result '()))
|
|
|
|
|
|
(match chars
|
|
|
|
|
|
(()
|
|
|
|
|
|
(reverse result))
|
|
|
|
|
|
((#\~ opt rest ...)
|
|
|
|
|
|
(loop rest (cons opt result)))
|
|
|
|
|
|
((_ rest ...)
|
|
|
|
|
|
(loop rest result)))))
|
|
|
|
|
|
|
|
|
|
|
|
(match args
|
|
|
|
|
|
((port ($ <const> _ (? string? fmt)) _ ...)
|
|
|
|
|
|
(let ((opts (format-chars fmt)))
|
|
|
|
|
|
(or (every (cut memq <> allowed-chars) opts)
|
|
|
|
|
|
(begin
|
|
|
|
|
|
(warning 'format loc 'simple-format fmt
|
|
|
|
|
|
(find (negate (cut memq <> allowed-chars)) opts))
|
|
|
|
|
|
#f))))
|
2012-02-19 23:54:18 +01:00
|
|
|
|
((port (= (cut const-fmt <> env) (? string? fmt)) args ...)
|
|
|
|
|
|
(check-simple-format-args `(,port ,(make-const loc fmt) ,args) loc))
|
2012-01-26 00:35:46 +01:00
|
|
|
|
(_ #t)))
|
|
|
|
|
|
|
2010-10-08 16:25:32 +02:00
|
|
|
|
(define (resolve-toplevel name)
|
|
|
|
|
|
(and (module? env)
|
|
|
|
|
|
(false-if-exception (module-ref env name))))
|
|
|
|
|
|
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(match x
|
Add "mod" field to tree-il toplevel ref, set, define
Add "mod" field to <toplevel-ref>, <toplevel-set>, and
<toplevel-define>, indicating the expander's idea of what the current
module is when a toplevel variable is accessed or created. This will
help in later optimizations.
* libguile/expand.c (TOPLEVEL_REF, TOPLEVEL_SET, TOPLEVEL_DEFINE)
(expand, expand_define, expand_set_x, convert_assignment):
* libguile/expand.h (SCM_EXPANDED_TOPLEVEL_REF_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_REF, SCM_EXPANDED_TOPLEVEL_SET_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_SET, SCM_EXPANDED_TOPLEVEL_DEFINE_FIELD_NAMES):
(SCM_MAKE_EXPANDED_TOPLEVEL_DEFINE):
* module/ice-9/compile-psyntax.scm (translate-literal-syntax-objects):
* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm:
* module/language/tree-il.scm:
* module/language/tree-il.scm (parse-tree-il, make-tree-il-folder):
(pre-post-order):
* module/language/tree-il/analyze.scm (goops-toplevel-definition):
(macro-use-before-definition-analysis, proc-ref?, format-analysis):
* module/language/tree-il/compile-cps.scm (convert):
* module/language/tree-il/debug.scm (verify-tree-il):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/fix-letrec.scm (free-variables):
* module/language/tree-il/peval.scm (peval):
* test-suite/tests/tree-il.test: Adapt uses.
2019-08-16 09:08:43 +02:00
|
|
|
|
(($ <call> src ($ <toplevel-ref> _ _ name) args)
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(let ((proc (resolve-toplevel name)))
|
2012-01-26 00:35:46 +01:00
|
|
|
|
(if (or (and (eq? proc (@ (guile) simple-format))
|
|
|
|
|
|
(check-simple-format-args args
|
|
|
|
|
|
(or src (find pair? locs))))
|
|
|
|
|
|
(eq? proc (@ (ice-9 format) format)))
|
|
|
|
|
|
(check-format-args args (or src (find pair? locs))))))
|
2012-01-30 19:59:08 +01:00
|
|
|
|
(($ <call> src ($ <module-ref> _ '(ice-9 format) 'format) args)
|
2012-01-26 00:35:46 +01:00
|
|
|
|
(check-format-args args (or src (find pair? locs))))
|
2012-01-30 19:59:08 +01:00
|
|
|
|
(($ <call> src ($ <module-ref> _ '(guile)
|
|
|
|
|
|
(or 'format 'simple-format))
|
2012-01-26 00:35:46 +01:00
|
|
|
|
args)
|
|
|
|
|
|
(and (check-simple-format-args args
|
|
|
|
|
|
(or src (find pair? locs)))
|
|
|
|
|
|
(check-format-args args (or src (find pair? locs)))))
|
2011-09-06 00:18:36 +02:00
|
|
|
|
(_ #t))
|
2010-10-08 16:25:32 +02:00
|
|
|
|
#t)
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (x _ env locs)
|
|
|
|
|
|
;; Up from X.
|
|
|
|
|
|
#t)
|
|
|
|
|
|
|
|
|
|
|
|
(lambda (_ env)
|
|
|
|
|
|
;; Post-processing.
|
|
|
|
|
|
#t)
|
|
|
|
|
|
|
|
|
|
|
|
#t))
|
2020-05-08 14:48:47 +02:00
|
|
|
|
|
|
|
|
|
|
(define %warning-passes
|
|
|
|
|
|
`(#(unused-variable 3 ,unused-variable-analysis)
|
|
|
|
|
|
#(unused-toplevel 2 ,unused-toplevel-analysis)
|
|
|
|
|
|
#(shadowed-toplevel 2 ,shadowed-toplevel-analysis)
|
|
|
|
|
|
#(unbound-variable 1 ,unbound-variable-analysis)
|
|
|
|
|
|
#(macro-use-before-definition 1 ,macro-use-before-definition-analysis)
|
|
|
|
|
|
#(arity-mismatch 1 ,arity-analysis)
|
|
|
|
|
|
#(format 1 ,format-analysis)))
|
|
|
|
|
|
|
|
|
|
|
|
(define (make-analyzer warning-level warnings)
|
|
|
|
|
|
(define (enabled-for-level? level)
|
|
|
|
|
|
(match warning-level
|
|
|
|
|
|
((? boolean?) warning-level)
|
|
|
|
|
|
((? exact-integer?) (>= warning-level level))))
|
|
|
|
|
|
(let ((analyses (filter-map (match-lambda
|
|
|
|
|
|
(#(kind level analysis)
|
|
|
|
|
|
(and (or (enabled-for-level? level)
|
|
|
|
|
|
(memq kind warnings))
|
|
|
|
|
|
analysis)))
|
|
|
|
|
|
%warning-passes)))
|
|
|
|
|
|
(lambda (exp env)
|
|
|
|
|
|
(analyze-tree analyses exp env))))
|