src/module-parse.lisp (code): Hoist complex sub-items out of main parser.

[sod] / src / parser / streams-impl.lisp

diff --git a/src/parser/streams-impl.lisp b/src/parser/streams-impl.lisp
index f14bf3191785193b6483a2ef3fd4cef065a4853e..b3bb424ff54ec7cbec3b09973b2a8090d94045d9 100644 (file)
--- a/src/parser/streams-impl.lisp
+++ b/src/parser/streams-impl.lisp
@@ -224,8 +224,8 @@ (defmethod stream-pathname ((stream position-aware-stream))
    present back to a user.  Secondly, a name can be attached to a stream
    which doesn't actually have a file backing it."
 
    present back to a user.  Secondly, a name can be attached to a stream
    which doesn't actually have a file backing it."
 

-  (with-slots (file) stream
-    (or file (call-next-method))))
+  (or (position-aware-stream-file stream)
+      (call-next-method)))

 
 (defmethod file-location ((stream position-aware-stream))
   (multiple-value-bind (line column) (stream-line-and-column stream)
 
 (defmethod file-location ((stream position-aware-stream))
   (multiple-value-bind (line column) (stream-line-and-column stream)