fic bug in guilemod

parent ffdde0ee
......@@ -174,8 +174,8 @@ PSSOURCES = \
logic/guile-log/guile-prolog/vm/vm-imprint.scm \
logic/guile-log/guile-prolog/vm/vm-unify.scm \
logic/guile-log/guile-prolog/vm/vm-goal.scm \
logic/guile-log/guile-prolog/vm-compiler.scm \
language/prolog/modules/library/clpfd.pl
logic/guile-log/guile-prolog/vm-compiler.scm
# language/prolog/modules/library/clpfd.pl
# logic/guile-log/examples/kanren/type-inference.scm \
# logic/guile-log/imatch.scm \
......
......@@ -36,20 +36,22 @@
(define-C default-language
(lambda (file)
(define default ((C current-language)))
(if (C *do-extension-dispatch*)
(let ((ext (car (reverse (string-split file #\.)))))
(let lp ((l (C *extension-dispatches*)))
(if (pair? l)
(if (member ext (caar l))
(let ((r (cdar l)))
(if ((C language?) default)
(if (eq? ((C language-name) default) r)
default
r)
r))
(lp (cdr l)))
default)))
default)))
(pk file)
(pk
(if (C *do-extension-dispatch*)
(let ((ext (car (reverse (string-split file #\.)))))
(let lp ((l (C *extension-dispatches*)))
(if (pair? l)
(if (member ext (caar l))
(let ((r (cdar l)))
(if ((C language?) default)
(if (eq? ((C language-name) default) r)
default
r)
r))
(lp (cdr l)))
default)))
default))))
(define-exp-C %in-compile (make-fluid #f))
......@@ -237,24 +239,3 @@
loc))
(else
(emit port "~A: `format' warning~%" loc)))))))))
(define pload
(let ((guile-load (@ (guile) primitive-load-path)))
(lambda (p . q)
(let lp ((l *extension-dispatches*))
(if (pair? l)
(let lp2 ((u (caar l)))
(if (pair? u)
(aif it (%search-load-path (string-append p "." (car u)))
(apply guile-load it q)
(lp2 (cdr u)))
(lp (cdr l))))
(apply guile-load p q))))))
(define-set-G primitive-load-path pload)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment