Changeset 14815 for release/1.6


Ignore:
Timestamp:
Jun 6, 2011, 9:46:37 PM (8 years ago)
Author:
rme
Message:

Merge r14814 (%parse-token fix) from trunk.

Location:
release/1.6/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.6/source

  • release/1.6/source/level-0/l0-misc.lisp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • release/1.6/source/level-1/l1-reader.lisp

    r14381 r14815  
    24732473                    (let* ((pkg (if explicit-package (pkg-arg explicit-package) *package*)))
    24742474                      (if (or double-colon (eq pkg *keyword-package*))
    2475                         (without-interrupts
    2476                          (multiple-value-bind (symbol access internal-offset external-offset)
    2477                                               (%find-symbol string len pkg)
    2478                            (if access
    2479                              symbol
    2480                              (%add-symbol (%string-from-token tb) pkg internal-offset external-offset))))
     2475                        (with-package-lock (pkg)
     2476                          (multiple-value-bind (symbol access internal-offset external-offset)
     2477                              (%find-symbol string len pkg)
     2478                            (if access
     2479                              symbol
     2480                              (%add-symbol (%string-from-token tb) pkg internal-offset external-offset))))
    24812481                        (multiple-value-bind (found symbol) (%get-htab-symbol string len (pkg.etab pkg))
    24822482                          (if found
Note: See TracChangeset for help on using the changeset viewer.