inclusion of library from the exe path

1 files changed, 5 insertions, 2 deletions

diff --git a/cl-forth.lisp b/cl-forth.lisp
index f816e33..faa48a6 100644
--- a/cl-forth.lisp
+++ b/cl-forth.lisp
@@ -155,7 +155,7 @@
         ;; (parser-parse-tokens parser makrodef)
         (setf (tokens parser) (append makrodef (tokens parser)))
         (error "parse-token: token has unknown identifier: ~a"
-               (read-token parser)))))
+               token))))
 
 ;; (defmethod parser-parse-tokens ((parser parser) tokens)
 ;;   (iter (for makro-op in-vector)
@@ -215,8 +215,11 @@
             (push tok makrodef)))))
 
 (defmethod parse-op ((parser parser) token (id (eql :kütüphane)))
+  "Library and the executable must be in the same location, no other search is made currently."
   (let ((file (car (read-token parser))))
-    (setf (tokens parser) (append (lex-file file) (tokens parser)))))
+    (setf (tokens parser)
+          (append (lex-file (merge-pathnames file sb-ext:*core-pathname*))
+                  (tokens parser)))))
 
 (defun parse-tokens (tokens)
   (let ((parser (make-parser tokens)))