Merge branch 'master' into fix-format-interrupt

euslisp · Oct 8, 2019 · 1250d3f · 1250d3f
2 parents 09585bf + e9bda60
commit 1250d3f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,9 @@ references:
   setup-tex: &setup-tex
     run:
       name: Setup TeX
-      command: sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils
+      command: |-
+        sudo apt-get update
+        sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils
   setup-eus: &setup-eus
     run:
       name: Setup EusLisp

diff --git a/lib/llib/unittest.l b/lib/llib/unittest.l
@@ -232,19 +232,17 @@
            (trace ,name))))
 
     (defmacro assert (pred &optional (message "") &rest args)
-      (let
-        ((ret (gensym)))
-       `(let* (failure (ret ,pred))
-	  ;; lisp::step could not work with macros..
-	  ;;     (if (and (listp ',pred) (functionp (car ',pred)))
-	  ;;	 (setq ret (lisp::step ,pred))
-	  ;;       (setq ret ,pred))
-	  ;;
-	  (if (not ret)
-	      ;; escape <> for xml
-	      (send *unit-test* :increment-failure ',pred (format nil ,message ,@args)
-		    (escape-xml-string (subseq (send *error-output* :buffer) 0 (or (position 0 (send *error-output* :buffer)) (length (send *error-output* :buffer)))))))
-	  )))
+      `(let (failure (ret ,pred))
+         ;; lisp::step could not work with macros..
+         ;;     (if (and (listp ',pred) (functionp (car ',pred)))
+         ;;	 (setq ret (lisp::step ,pred))
+         ;;       (setq ret ,pred))
+         ;;
+         (if (not ret)
+             ;; escape <> for xml
+             (send *unit-test* :increment-failure ',pred (format nil ,message ,@args)
+                   (escape-xml-string (subseq (send *error-output* :buffer) 0 (or (position 0 (send *error-output* :buffer)) (length (send *error-output* :buffer)))))))
+         ))
 
 
     t))

diff --git a/lisp/l/eusstart.l b/lisp/l/eusstart.l
@@ -35,7 +35,7 @@
   ;; LEO
   (export '(self class))
   ;; classnames, variable names are exported by 'basicclass'
-  (export '(string float-vector interger-vector bit-vector))
+  (export '(string float-vector integer-vector bit-vector))
   ;; feature constants
   (export '(vax sun apollo mips sun3 sun4 news sanyo bsd4_2 sunos4
 		sunos4.1 system5 coff alpha thread))

diff --git a/lisp/l/exports.l b/lisp/l/exports.l
@@ -32,7 +32,7 @@
   ;; LEO
   (export '(self class))
   ;; classnames, variable names are exported by 'basicclass'
-  (export '(string float-vector interger-vector bit-vector))
+  (export '(string float-vector integer-vector bit-vector))
   ;; feature constants
   (export '(vax sun apollo mips sun3 sun4 news sanyo bsd4_2 sunos4
 		sunos4.1 system5 coff alpha thread))