Commit 3547c65d authored by Dave Cooper's avatar Dave Cooper

fixed typo in push of version in initialize, fixed error in glime

parent 43b09066
......@@ -30,7 +30,7 @@
:type nil
:directory (butlast (pathname-directory glisp:*gdl-program-home*))
:defaults glisp:*gdl-program-home*))
(pushnew (make-keyword (format nil "gendl-~a" *gendl-version*) *features*))
(pushnew (make-keyword (format nil "gendl-~a" *gendl-version*)) *features*)
(glisp:set-genworks-source-home-if-known)
(glisp:set-default-float-format)
(glisp:set-defpackage-behavior)
......
......@@ -443,7 +443,12 @@ each returning a list of proposed messages.")
(defvar *this-the*)
;;
;; FLAG -- DJC added this ignore-errors
;;
(defun embedded-the-arglist ()
(ignore-errors
(let* ((whole-form *form-with-arglist*)
(*this-the* (or (this-the-from-form whole-form)
;; The gend:the form isn't embedded inside a define-object. Bail out.
......@@ -461,7 +466,7 @@ each returning a list of proposed messages.")
:provided-args nil
:allow-other-keys-p t
:rest 'reference-chain)
nil t))))
nil t)))))
;; 9.1. Analyse the current gendl:the form
......@@ -507,6 +512,7 @@ each returning a list of proposed messages.")
;; Try repeating the name of this function, many times, fast, and in a darkened room.
(defun this-the-from-form (form)
;; A bit like messages-in-this-form below, best done as a separate cycle.
(when (eq (car form) 'gendl:define-object)
......
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