diff options
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/define.boot | 2 | ||||
| -rw-r--r-- | src/interp/fnewmeta.lisp | 8 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index 543450d9..48225fb2 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1268,7 +1268,7 @@ spadCompileOrSetq (form is [nam,[lam,vl,body]]) == if vl is [:vl',E] and body is [nam',: =vl'] then LAM_,EVALANDFILEACTQ ['PUT,MKQ nam,MKQ 'SPADreplace,MKQ nam'] sayBrightly ['" ",:bright nam,'"is replaced by",:bright nam'] - else if (ATOM body or and/[ATOM x for x in body]) + else if (isAtomicForm body or and/[isAtomicForm x for x in body]) and vl is [:vl',E] and not CONTAINED(E,body) then macform := ['XLAM,vl',body] LAM_,EVALANDFILEACTQ ['PUT,MKQ nam,MKQ 'SPADreplace,MKQ macform] diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp index b4b3b789..0e248f83 100644 --- a/src/interp/fnewmeta.lisp +++ b/src/interp/fnewmeta.lisp @@ -961,8 +961,9 @@ (AND (MATCH-ADVANCE-STRING "'") (MUST (|PARSE-Sexpr1|)) (PUSH-REDUCTION '|PARSE-Sexpr1| (CONS 'QUOTE (CONS (POP-STACK-1) NIL)))) - (AND (MATCH-ADVANCE-STRING "-") (MUST (|PARSE-IntegerTok|)) - (PUSH-REDUCTION '|PARSE-Sexpr1| (MINUS (POP-STACK-1)))) + ;; next form disabled -- gdr, 2009-06-15. +; (AND (MATCH-ADVANCE-STRING "-") (MUST (|PARSE-IntegerTok|)) +; (PUSH-REDUCTION '|PARSE-Sexpr1| (MINUS (POP-STACK-1)))) (AND (MATCH-ADVANCE-STRING "[") (BANG FIL_TEST (OPTIONAL (STAR REPEATOR (|PARSE-Sexpr1|)))) (MUST (MATCH-ADVANCE-STRING "]")) @@ -995,7 +996,8 @@ (OR (AND (MATCH-STRING "$") (PUSH-REDUCTION '|PARSE-AnyId| (CURRENT-SYMBOL)) (ACTION (ADVANCE-TOKEN))) - (PARSE-KEYWORD)))) + (PARSE-KEYWORD) + (|PARSE-OperatorFunctionName|)))) (DEFUN |PARSE-Sequence| () diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index ca24779d..2723e7d6 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -1195,7 +1195,7 @@ LargeMatrixp(u,width, dist) == op:=CAAR u op = 'MATRIX => largeMatrixAlist u --We already know the structure is more than 'width' wide - MEMQ(op,'(LET RARROW SEGMENT _- CONCAT CONCATB PAREN BRACKET BRACE)) => + MEMQ(op,'(%LET RARROW SEGMENT _- CONCAT CONCATB PAREN BRACKET BRACE)) => --Each of these prints the arguments in a width 3 smaller dist:=dist-3 width:=width-3 |