Commit e3e41a26 authored by Dave Cooper's avatar Dave Cooper

fixed glisp:match-regexp with proper args to cl-pprc:scan

parent 4ba0467d
......@@ -30,16 +30,16 @@
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun set-genworks-source-home-if-known ()
(when (find-package :asdf)
(multiple-value-bind (base-home error)
(ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base"))
(if (typep error 'error)
(warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%")
(setq *genworks-source-home*
(make-pathname :name nil
:type nil
:directory (butlast (butlast (pathname-directory base-home)))
:defaults base-home)))))))
(when (find-package :asdf)
(multiple-value-bind (base-home error)
(ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base"))
(if (typep error 'error)
(warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%")
(setq *genworks-source-home*
(make-pathname :name nil
:type nil
:directory (butlast (butlast (pathname-directory base-home)))
:defaults base-home)))))))
(set-genworks-source-home-if-known)
......
......@@ -441,11 +441,11 @@ the \"current\" error."
(when (or newlines-special case-fold return shortest)
(error "keyword arguments :newlines-special, :case-fold, :return, and :shortest
are no longer supported by glisp:match-regexp.~%"))
#+allegro (excl:match-regexp string-or-regexp string-to-match :start start :end end)
(#+allegro excl:match-regexp
#-allegro cl-ppcre:scan string-or-regexp string-to-match
:start start
:end end))
#-allegro (let ((end-default (or end (length string-to-match))))
(cl-ppcre:scan string-or-regexp string-to-match :start start :end end-default)))
......
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