Changeset 14815 for release/1.6

Timestamp:

Jun 6, 2011, 9:46:37 PM (10 years ago)

Author:

rme

Message:

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

Location:

release/1.6/source

Files:

• . (modified) (1 prop)
• level-0/l0-misc.lisp (modified) (1 prop)
• level-1/l1-reader.lisp (modified) (1 diff)

release/1.6/source/level-1/l1-reader.lisp

@@ -2473 +2473 @@
                     (let* ((pkg (if explicit-package (pkg-arg explicit-package) *package*)))
                       (if (or double-colon (eq pkg *keyword-package*))
-                        (without-interrupts
-                         (multiple-value-bind (symbol access internal-offset external-offset)
-                                              (%find-symbol string len pkg)
-                           (if access
-                             symbol
-                             (%add-symbol (%string-from-token tb) pkg internal-offset external-offset))))
+                        (with-package-lock (pkg)
+                          (multiple-value-bind (symbol access internal-offset external-offset)
+                              (%find-symbol string len pkg)
+                            (if access
+                              symbol
+                              (%add-symbol (%string-from-token tb) pkg internal-offset external-offset))))
                         (multiple-value-bind (found symbol) (%get-htab-symbol string len (pkg.etab pkg))
                           (if found