Changeset 14310 for branches/qres/ccl


Ignore:
Timestamp:
Sep 28, 2010, 11:14:17 PM (9 years ago)
Author:
rme
Message:

Merge r14309 from trunk.

Location:
branches/qres/ccl
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/qres/ccl

  • branches/qres/ccl/compiler

  • branches/qres/ccl/compiler/nx1.lisp

    r14308 r14310  
    5252    (let* ((ctype (handler-case (values-specifier-type (nx-target-type typespec) env)
    5353                    (parse-unknown-type (c)
    54                       (when whine
    55                         (nx1-whine :unknown-type-in-declaration (parse-unknown-type-specifier c)))
    56                       *wild-type*)
     54                      (if whine
     55                        (progn
     56                          (nx1-whine :unknown-type-in-declaration
     57                                     (parse-unknown-type-specifier c))
     58                          *wild-type*)
     59                        (specifier-type typespec env)))
    5760                    (program-error (c)
    58                       (when whine
    59                         (nx1-whine :invalid-type typespec c))
    60                       *wild-type*)))
     61                      (if whine
     62                        (progn
     63                          (nx1-whine :invalid-type typespec c)
     64                          *wild-type*)
     65                        (specifier-type typespec)))))
    6166           (new (ctype-spec ctype)))
    6267      (nx-target-type (type-specifier (if new (specifier-type new) ctype))))))
  • branches/qres/ccl/lib

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/qres/ccl/lisp-kernel

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.