diff options
| -rw-r--r-- | src/boot/ast.boot | 2 | ||||
| -rw-r--r-- | src/boot/strap/ast.clisp | 2 | ||||
| -rw-r--r-- | src/boot/strap/scanner.clisp | 18 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 3 | ||||
| -rw-r--r-- | src/utils/storage.H | 4 |
5 files changed, 14 insertions, 15 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot index dbe1231c..50edc59c 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -736,7 +736,7 @@ defQuoteId x== x is ["QUOTE",:.] and IDENTP second x bfSmintable x== - integer? x or cons? x and first x in '(SIZE LENGTH char) + integer? x or cons? x and first x in '(SIZE LENGTH char QENUM) bfQ(l,r)== bfSmintable l or bfSmintable r => ["EQL",l,r] diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 64b6e0f4..2a14fe82 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -1186,7 +1186,7 @@ (DEFUN |bfSmintable| (|x|) (OR (INTEGERP |x|) - (AND (CONSP |x|) (MEMQ (CAR |x|) '(SIZE LENGTH |char|))))) + (AND (CONSP |x|) (MEMQ (CAR |x|) '(SIZE LENGTH |char| QENUM))))) (DEFUN |bfQ| (|l| |r|) (COND diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index d0fb9800..9fcb1bef 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -49,7 +49,7 @@ (SETQ |$sz| (LENGTH |$ln|)) (COND ((NULL |$n|) T) - ((EQUAL (QENUM |$ln| |$n|) |shoeTAB|) + ((EQL (QENUM |$ln| |$n|) |shoeTAB|) (SETQ |a| (MAKE-FULL-CVEC (- 7 (REM |$n| 8)) " ")) (SETF (ELT |$ln| |$n|) (ELT " " 0)) (SETQ |$ln| (CONCAT |a| |$ln|)) @@ -269,11 +269,11 @@ (COND ((< |$n| |$sz|) (COND - ((EQUAL (QENUM |$ln| |$n|) |shoePLUSCOMMENT|) + ((EQL (QENUM |$ln| |$n|) |shoePLUSCOMMENT|) (SETQ |www| (+ |$n| 1)) (COND ((NOT (< |www| |$sz|)) NIL) - (T (EQUAL (QENUM |$ln| |www|) |shoePLUSCOMMENT|)))) + (T (EQL (QENUM |$ln| |www|) |shoePLUSCOMMENT|)))) (T NIL))) (T NIL))))) @@ -284,11 +284,11 @@ (COND ((< |$n| |$sz|) (COND - ((EQUAL (QENUM |$ln| |$n|) |shoeMINUSCOMMENT|) + ((EQL (QENUM |$ln| |$n|) |shoeMINUSCOMMENT|) (SETQ |www| (+ |$n| 1)) (COND ((NOT (< |www| |$sz|)) NIL) - (T (EQUAL (QENUM |$ln| |www|) |shoeMINUSCOMMENT|)))) + (T (EQL (QENUM |$ln| |www|) |shoeMINUSCOMMENT|)))) (T NIL))) (T NIL))))) @@ -402,7 +402,7 @@ (SETQ |endid| (|shoeIdEnd| |$ln| |$n|)) (COND ((OR (EQUAL |endid| |l|) - (NOT (EQUAL (QENUM |$ln| |endid|) |shoeESCAPE|))) + (NOT (EQL (QENUM |$ln| |endid|) |shoeESCAPE|))) (SETQ |$n| |endid|) (LIST |b| (SUBSTRING |$ln| |n1| (- |endid| |n1|)))) (T (SETQ |str| (SUBSTRING |$ln| |n1| (- |endid| |n1|))) @@ -440,7 +440,7 @@ (T (SETQ |$n| (+ |$n| 1))))) (COND ((OR (EQUAL |$n| |l|) - (NOT (EQUAL (QENUM |$ln| |$n|) |shoeESCAPE|))) + (NOT (EQL (QENUM |$ln| |$n|) |shoeESCAPE|))) (COND ((AND (EQUAL |n| |$n|) |zro|) "0") (T (SUBSTRING |$ln| |n| (- |$n| |n|))))) @@ -472,10 +472,10 @@ (SETQ |a| (|shoeInteger|)) (COND ((NOT (< |$n| |$sz|)) (|shoeLeafInteger| |a|)) - ((AND |$floatok| (EQUAL (QENUM |$ln| |$n|) |shoeDOT|)) + ((AND |$floatok| (EQL (QENUM |$ln| |$n|) |shoeDOT|)) (SETQ |n| |$n|) (SETQ |$n| (+ |$n| 1)) (COND - ((AND (< |$n| |$sz|) (EQUAL (QENUM |$ln| |$n|) |shoeDOT|)) + ((AND (< |$n| |$sz|) (EQL (QENUM |$ln| |$n|) |shoeDOT|)) (SETQ |$n| |n|) (|shoeLeafInteger| |a|)) (T (SETQ |w| (|shoeInteger1| T)) (|shoeExponent| |a| |w|)))) (T (|shoeLeafInteger| |a|))))))) diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index 0b7eb64b..1d17a095 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -1325,6 +1325,5 @@ (COND ((OR (|%hasFeature| :ECL) (|%hasFeature| :GCL)) NIL) (T (|loadNativeModule| - (CONCAT (|systemLibraryDirectory|) "libopen-axiom-core" - |$NativeModuleExt|))))) + (CONCAT "libopen-axiom-core" |$NativeModuleExt|))))) diff --git a/src/utils/storage.H b/src/utils/storage.H index ad8eaa09..47015ed9 100644 --- a/src/utils/storage.H +++ b/src/utils/storage.H @@ -32,7 +32,7 @@ // --% Author: Gabriel Dos Reis // --% Description: // --% Memory management facility. Acquire raw memory directly -// --% directly for the host OS. Provide random access read to +// --% from the host OS. Provide random access read to // --% files through file mapping. #ifndef OPENAXIOM_STORAGE_INCLUDED @@ -252,7 +252,7 @@ namespace OpenAxiom { template<typename T> Arena<T>::~Arena() { - // Destroy objects in the reverse order of their + // Release storage in the reverse order of their // their allocation. while (store != 0) { Storage* current = store; |