diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-07 01:54:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-07 01:54:26 +0000 |
| commit | 33fa7f6fef294b319a1482e4fc2646f15e8cdd54 (patch) | |
| tree | db888f35f9640ec28ac9f7eb0adff3180ae158a8 /src/interp/preparse.lisp | |
| parent | baa2d50e5a11158ac998dfc0f3c8d5293666f77a (diff) | |
| download | open-axiom-33fa7f6fef294b319a1482e4fc2646f15e8cdd54.tar.gz | |
* interp/sys-globals.boot ($insideCompTypeOf): Remove.
* interp/preparse.lisp (INITIAL-SUBSTRING): Remove.
* interp/g-util.boot (stringPrefix?): Remove.
* interp/compiler.boot (compTypeOf): Remove.
(comp3): Don't call it.
Diffstat (limited to 'src/interp/preparse.lisp')
| -rw-r--r-- | src/interp/preparse.lisp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index 120656b1..dc4836ba 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -219,10 +219,6 @@ (dolist (X L) (format t "~5d. ~a~%" (car x) (cdr x))) (format t "~%")))) -(DEFUN INITIAL-SUBSTRING (PATTERN LINE) - (let ((ind (mismatch PATTERN LINE))) - (OR (NULL IND) (EQL IND (SIZE PATTERN))))) - (DEFUN SKIP-IFBLOCK (X) (PROG (LINE IND) (DCQ (IND . LINE) (preparseReadLine1 X)) @@ -230,19 +226,19 @@ (IF (ZEROP (SIZE LINE)) (RETURN (SKIP-IFBLOCK X))) (COND ((CHAR= (ELT LINE 0) #\) ) (COND - ((INITIAL-SUBSTRING ")if" LINE) + ((|stringPrefix?| ")if" LINE) (COND ((EVAL (|string2BootTree| (|storeBlanks!| LINE 3))) (RETURN (preparseReadLine X))) ('T (RETURN (SKIP-IFBLOCK X))))) - ((INITIAL-SUBSTRING ")elseif" LINE) + ((|stringPrefix?| ")elseif" LINE) (COND ((EVAL (|string2BootTree| (|storeBlanks!| LINE 7))) (RETURN (preparseReadLine X))) ('T (RETURN (SKIP-IFBLOCK X))))) - ((INITIAL-SUBSTRING ")else" LINE) + ((|stringPrefix?| ")else" LINE) (RETURN (preparseReadLine X))) - ((INITIAL-SUBSTRING ")endif" LINE) + ((|stringPrefix?| ")endif" LINE) (RETURN (preparseReadLine X))) - ((INITIAL-SUBSTRING ")fin" LINE) + ((|stringPrefix?| ")fin" LINE) (RETURN (CONS IND NIL)))))) (RETURN (SKIP-IFBLOCK X)) ) ) @@ -250,9 +246,9 @@ (PROG (LINE IND) (DCQ (IND . LINE) (preparseReadLine1 X)) (COND ((NOT (STRINGP LINE)) (RETURN (CONS IND LINE))) - ((INITIAL-SUBSTRING LINE ")endif") + ((|stringPrefix?| LINE ")endif") (RETURN (preparseReadLine X))) - ((INITIAL-SUBSTRING LINE ")fin") (RETURN (CONS IND NIL))) + ((|stringPrefix?| LINE ")fin") (RETURN (CONS IND NIL))) ('T (RETURN (SKIP-TO-ENDIF X)))))) (DEFUN preparseReadLine (X) @@ -263,17 +259,17 @@ (RETURN (CONS IND LINE)))) (COND ((CHAR= (ELT LINE 0) #\) ) (COND - ((INITIAL-SUBSTRING ")if" LINE) + ((|stringPrefix?| ")if" LINE) (COND ((EVAL (|string2BootTree| (|storeBlanks!| LINE 3))) (RETURN (preparseReadLine X))) ('T (RETURN (SKIP-IFBLOCK X))))) - ((INITIAL-SUBSTRING ")elseif" LINE) + ((|stringPrefix?| ")elseif" LINE) (RETURN (SKIP-TO-ENDIF X))) - ((INITIAL-SUBSTRING ")else" LINE) + ((|stringPrefix?| ")else" LINE) (RETURN (SKIP-TO-ENDIF X))) - ((INITIAL-SUBSTRING ")endif" LINE) + ((|stringPrefix?| ")endif" LINE) (RETURN (preparseReadLine X))) - ((INITIAL-SUBSTRING ")fin" LINE) + ((|stringPrefix?| ")fin" LINE) (SETQ *EOF* T) (RETURN (CONS IND NIL)) ) ))) (RETURN (CONS IND LINE)) )) |