diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 9 | ||||
-rw-r--r-- | src/interp/bootlex.lisp | 4 | ||||
-rw-r--r-- | src/interp/daase.lisp | 2 | ||||
-rw-r--r-- | src/interp/macros.lisp | 6 | ||||
-rw-r--r-- | src/interp/preparse.lisp | 4 | ||||
-rw-r--r-- | src/interp/spad.lisp | 2 | ||||
-rw-r--r-- | src/interp/vmlisp.lisp | 2 |
7 files changed, 20 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 44350ede..70ddd044 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2010-05-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/daase.lisp ($ConstructorCache): Declare. + * interp/bootlex.lisp: Fix use of SETELT. + * interp/macros.lisp: Likewise. + * interp/preparse.lisp: Likewise. + * interp/spad.lisp: Likewise. + * interp/vmlisp.lisp: Likewise. + +2010-05-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/ast.boot (shoeCompTran1): Handle %Leave expressions. * boot/parser.boot (bpReturn): Parse leave-expressions too. * interp/mark.boot (markInsertBodyParts): properly escape Boot diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp index f430ffe1..811657e7 100644 --- a/src/interp/bootlex.lisp +++ b/src/interp/bootlex.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007-2009, Gabriel Dos Reis. +;; Copyright (C) 2007-2010, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -363,7 +363,7 @@ or the chracters ?, !, ' or %" (do ((i 0 (1+ i)) (k (maxindex x))) ((> i k)) - (if (LET ((Y (LASSOC (ELT X I) AL))) (SETELT X I Y)) + (if (LET ((Y (LASSOC (ELT X I) AL))) (SETF (ELT X I) Y)) (TRANSLABEL1 (ELT X I) AL)))) ((ATOM X) NIL) ((LET ((Y (LASSOC (FIRST X) AL))) diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp index 10c02fd7..1a72602a 100644 --- a/src/interp/daase.lisp +++ b/src/interp/daase.lisp @@ -327,6 +327,8 @@ (defvar *asharpflags* "-O -laxiom -Fasy -Flsp" "library compiler flags") +(defvar |$ConstructorCache| nil) + (defun asharp (file &optional (flags *asharpflags*)) "call the asharp compiler" (|runProgram| diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp index 217cf844..e9fff330 100644 --- a/src/interp/macros.lisp +++ b/src/interp/macros.lisp @@ -346,7 +346,7 @@ "Something unearthly and VM-specific with respect to streams." (let (v) (if *eof* (fail) (progn (SETQ V (ELT (LASTATOM STRM) 1)) - (SETELT V 3 (SIZE (ELT V 0))))))) + (SETF (ELT V 3) (SIZE (ELT V 0))))))) (DEFUN STRMBLANKLINE (STRM) "Something diabolical and VM-specific with respect to streams." @@ -481,7 +481,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (let (V) (if (STREAM-EOF STRM) (FAIL)) (SETQ V (LASTATOM STRM)) - (SETELT V 4 RECNO) + (SETF (ELT V 4) RECNO) (SETQ *EOF* (STREAM-EOF STRM)) strm)) @@ -492,7 +492,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (let (V) (if (STREAM-EOF STRM) (FAIL)) (SETQ V (LASTATOM STRM)) - (SETELT V 4 RECNO) + (SETF (ELT V 4) RECNO) (read-char STRM) (SETQ *EOF* (STREAM-EOF STRM)) strm)) diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index cee7a6e2..cdf104b7 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007-2008, Gabriel Dos Reis. +;; Copyright (C) 2007-2010, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -406,6 +406,6 @@ (defun ADDCLOSE (LINE CHAR) (cond ((char= (FETCHCHAR LINE (MAXINDEX LINE)) #\; ) - (SETELT LINE (MAXINDEX LINE) CHAR) + (SETF (ELT LINE (MAXINDEX LINE)) CHAR) (if (char= CHAR #\;) LINE (suffix #\; LINE))) ((suffix char LINE)))) diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp index 3565ee15..722588a5 100644 --- a/src/interp/spad.lisp +++ b/src/interp/spad.lisp @@ -216,7 +216,7 @@ (defun STRINGREST (X) (if (EQ (SIZE X) 1) (make-string 0) (SUBSTRING X 1 NIL))) (defun STREAM2UC (STRM) - (LET ((X (ELT (LASTATOM STRM) 1))) (SETELT X 0 (LC2UC (ELT X 0))))) + (LET ((X (ELT (LASTATOM STRM) 1))) (SETF (ELT X 0) (LC2UC (ELT X 0))))) (defun NEWNAMTRANS (X) (COND diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp index f14d4898..b63a7094 100644 --- a/src/interp/vmlisp.lisp +++ b/src/interp/vmlisp.lisp @@ -1315,7 +1315,7 @@ (IDENTP A) (NUMP A) (AND (consp A) (EQ (car A) 'QUOTE))) - `((SETELT ,sv ,i ,a))) + `((SETF (ELT ,sv ,i) ,a))) ( (OR (consp A) (simple-vector-p A)) `((setq ,w (ELT ,sv ,i)) ,@(RCQGENEXP W A QFLAG)))) |