Changeset 12034


Ignore:
Timestamp:
May 12, 2009, 5:34:56 PM (10 years ago)
Author:
gb
Message:

In NX-RECORD-XREF-INFO, sleaze around reference to (possibly undefined)
%ADD-XREF-ENTRY.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/nx0.lisp

    r11901 r12034  
    273273;; Cross-referencing
    274274(defun nx-record-xref-info (relation name)
    275   (when (fboundp '%add-xref-entry)
    276     (funcall '%add-xref-entry relation *nx-cur-func-name* name)))
     275  (let* ((axe (fboundp '%add-xref-entry)))
     276    (when axe
     277      (funcall axe relation *nx-cur-func-name* name))))
    277278
    278279
     
    19141915
    19151916;;; Wimpy.
    1916 (defun nx1-call-result-type (sym &optional (args nil args-p) spread-p)
     1917(defun nx1-call-result-type (sym &optional (args nil args-p) spread-p global-only)
    19171918  (let* ((env *nx-lexical-environment*)
    19181919         (global-def nil)
     
    19241925               (symbolp sym)
    19251926               (not (find-ftype-decl sym env))
    1926                (not (setq lexenv-def (nth-value 1 (nx-lexical-finfo sym))))
     1927               (or global-only
     1928                   (not (setq lexenv-def (nth-value 1 (nx-lexical-finfo sym)))))
    19271929               (null (setq defenv-def (retrieve-environment-function-info sym env)))
    19281930               (neq sym *nx-global-function-name*)
     
    19341936    (when (and args-p
    19351937               (not spread-p)
    1936                (setq somedef (cdr (assq sym *format-arg-functions*)))
     1938               (setq somedef (unless lexenv-def (cdr (assq sym *format-arg-functions*))))
    19371939               (setq somedef (nthcdr somedef args))
    19381940               (stringp (car somedef)))
Note: See TracChangeset for help on using the changeset viewer.