Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

10 changed files:

Changes:

  • src/benchmarks/gabriel/bmarks.lisp
    ... ... @@ -444,7 +444,7 @@
    444 444
     	    (equal (times x (add1 y))
    
    445 445
     		   (if (numberp y)
    
    446 446
     		       (plus x (times x y))
    
    447
    -		       (fix x)))
    
    447
    +		       (fix x)))
    
    448 448
     	    (equal (nth (nil)
    
    449 449
     			i)
    
    450 450
     		   (if (zerop i)
    
    ... ... @@ -1375,7 +1375,7 @@ Why, pray tell?
    1375 1375
     			  (t (puzzle-remove i j))))))))))
    
    1376 1376
     
    
    1377 1377
     (defun definepiece (iclass ii jj kk)
    
    1378
    -  (declare (fixnum ii jj kk))
    
    1378
    +  (declare (fixnum ii jj kk))
    
    1379 1379
       (let ((index 0))
    
    1380 1380
         (declare (fixnum index))
    
    1381 1381
         (do ((i 0 (1+ i)))
    
    ... ... @@ -1991,7 +1991,7 @@ Why, pray tell?
    1991 1991
       (cond ((not (< y x)) z)
    
    1992 1992
     	(t (tak77 (tak49 (the fixnum (1- x)) y z)
    
    1993 1993
     		  (tak47 (the fixnum (1- y)) z x)
    
    1994
    -		  (tak9 (the fixnum (1- z)) x y)))))
    
    1994
    +		  (tak9 (the fixnum (1- z)) x y)))))
    
    1995 1995
     (defun tak77 (x y z) 
    
    1996 1996
       (declare (fixnum x y z))
    
    1997 1997
       (cond ((not (< y x)) z)
    
    ... ... @@ -2131,7 +2131,7 @@ Why, pray tell?
    2131 2131
     		 (tak0 (the fixnum (1- y)) z x)
    
    2132 2132
     		 (tak0 (the fixnum (1- z)) x y)))))
    
    2133 2133
     
    
    2134
    -(defun time-takr ()
    
    2134
    +(defun time-takr ()
    
    2135 2135
       (time (tak0 18 12 6)))
    
    2136 2136
     |#
    
    2137 2137
     
    
    ... ... @@ -2308,7 +2308,7 @@ Why, pray tell?
    2308 2308
         count))
    
    2309 2309
     
    
    2310 2310
     (defun init-traverse()
    
    2311
    -  (prog1 nil (setq root (create-structure 100.))))
    
    2311
    +  (prog1 nil (setq root (create-structure 100.))))
    
    2312 2312
     
    
    2313 2313
     (defun run-traverse ()
    
    2314 2314
       (do ((i 50. (the fixnum (1- i))))
    

  • src/benchmarks/soar/default.soar
    ... ... @@ -702,4 +702,4 @@
    702 702
       (preference <q> ^role operator ^value reject
    
    703 703
     	^goal <g4> ^problem-space <p> ^state <s>))
    
    704 704
     
    
    705
    -nil
    705
    +nil

  • src/benchmarks/soar/soar.lisp
    ... ... @@ -192,7 +192,7 @@
    192 192
         (and (eq ce 1.) (go ph2))
    
    193 193
         (setq x (cdr x))
    
    194 194
         (and (eq ce 2.) (go ph2))
    
    195
    -    (setq x (cdr x))
    
    195
    +    (setq x (cdr x))
    
    196 196
         (and (eq ce 3.) (go ph2))
    
    197 197
         (setq x (cdr x))
    
    198 198
         (and (eq ce 4.) (go ph2))
    
    ... ... @@ -902,7 +902,7 @@
    902 902
       (prog nil
    
    903 903
         top  (and (not nl) (return nil))
    
    904 904
         (setq *sendtocall* nil)
    
    905
    -    (setq *last-node* (car nl))
    
    905
    +    (setq *last-node* (car nl))
    
    906 906
         (apply (caar nl) (cdar nl))		;; %%% here's the apply cdar nl must 
    
    907 907
         					;; be the *cN* item, caar nl is test
    
    908 908
         (setq nl (cdr nl))
    
    ... ... @@ -1480,7 +1480,7 @@
    1480 1480
         (setq v (car vlist))
    
    1481 1481
         (setq ind (cadr vlist))
    
    1482 1482
         (setq vlist (cddr vlist))
    
    1483
    -    (setq r (ce-gelm *data-matched* ind))
    
    1483
    +    (setq r (ce-gelm *data-matched* ind))
    
    1484 1484
         (setq *ce-variable-memory*
    
    1485 1485
     	  (cons (cons v r) *ce-variable-memory*))
    
    1486 1486
         (go top))) 
    
    ... ... @@ -2649,7 +2649,7 @@
    2649 2649
     )
    
    2650 2650
     
    
    2651 2651
     (defun soarclearprops (sym)
    
    2652
    -	(setf (symbol-plist sym)  () )
    
    2652
    +	(setf (symbol-plist sym)  () )
    
    2653 2653
     )
    
    2654 2654
     
    
    2655 2655
     (defun soarmachinetype ()
    
    ... ... @@ -3733,7 +3733,7 @@
    3733 3733
       (use-result-array))
    
    3734 3734
     
    
    3735 3735
     (defun remove-condition-trash (condition)
    
    3736
    -  (prog (return-condition pand-flag disjunction-flag)
    
    3736
    +  (prog (return-condition pand-flag disjunction-flag)
    
    3737 3737
             (setq return-condition nil)
    
    3738 3738
             (setq pand-flag nil)
    
    3739 3739
             (setq disjunction-flag nil)
    
    ... ... @@ -4588,7 +4588,7 @@
    4588 4588
             (setq out (p-conds-to-sp (sppwm1 (append '(^ identifier) (list object)))))
    
    4589 4589
             (setq out1 nil)
    
    4590 4590
             (soarmapc
    
    4591
    -         #'(lambda (x)
    
    4591
    +         #'(lambda (x)
    
    4592 4592
                  (cond ((eq prefflag (eq (car x) 'preference))
    
    4593 4593
                         (ppline x)
    
    4594 4594
                         (soarpush x out1)
    
    ... ... @@ -4780,7 +4780,7 @@
    4780 4780
             (cond ((atom x) (soarwarn "Atomic Action" x) (return nil)))
    
    4781 4781
             (setq a (setq *action-type* (car x)))
    
    4782 4782
             (cond ((eq a 'bind) (check-bind x))
    
    4783
    -              ((eq a 'cbind) (check-cbind x))
    
    4783
    +              ((eq a 'cbind) (check-cbind x))
    
    4784 4784
                   ((eq a 'call2) (return nil))
    
    4785 4785
                   ((eq a 'tabstop) (check-bind x))
    
    4786 4786
                   ((eq a 'decide) (check-decide))
    
    ... ... @@ -6299,7 +6299,7 @@
    6299 6299
             (return array)))
    
    6300 6300
     
    
    6301 6301
     (defun process-decide (phase-set)
    
    6302
    -  (accum-stats)
    
    6302
    +  (accum-stats)
    
    6303 6303
       (setq *new-chunks* nil)
    
    6304 6304
       (soarmapcar #'classify-decide phase-set)
    
    6305 6305
       (process-context-stack *context-stack*))
    

  • src/hemlock/command.lisp
    ... ... @@ -311,7 +311,7 @@
    311 311
       window, up one screenfull.  If P is supplied then scroll that
    
    312 312
       many lines."
    
    313 313
       (if p
    
    314
    -      (scroll-window window (- p))
    
    314
    +      (scroll-window window (- p))
    
    315 315
           (let ((height (- (window-height window)))
    
    316 316
     	    (overlap (- (value scroll-overlap))))
    
    317 317
     	(scroll-window window (if (>= height overlap) 
    

  • src/hemlock/linimage.lisp
    ... ... @@ -361,7 +361,7 @@
    361 361
           ;; If we we didn't wrap then display some losers...
    
    362 362
           (if xpos
    
    363 363
     	  (display-losing-chars open-chars index left-open-pos dest xpos
    
    364
    -				width string underhang string-get-rep
    
    364
    +				width string underhang string-get-rep
    
    365 365
     				(and done-p (= index left-open-pos)))
    
    366 366
     	  (update-and-punt dis-line width nil 0 index)))
    
    367 367
          (t
    

  • src/hemlock/netnews.lisp
    ... ... @@ -530,9 +530,10 @@
    530 530
     
    
    531 531
     (defsetf nn-last-read-message-number %set-nn-last-read-message-number)
    
    532 532
     
    
    533
    -(defconstant nntp-eof ".
    "
    
    534
    -  "NNTP marks the end of a textual response with this.  NNTP also recognizes
    
    535
    -   this as the end of a post.")
    
    533
    +(defconstant nntp-eof
    
    534
    +  (coerce '(#\. #\return) 'string)
    
    535
    +  "NNTP marks the end of a textual response with this.  NNTP also
    
    536
    +  recognizes this as the end of a post.")
    
    536 537
     
    
    537 538
     ;;; This macro binds a variable to each successive line of input from NNTP
    
    538 539
     ;;; and exits when it sees the NNTP end-of-file-marker, a period by itself on
    

  • src/hemlock/ring.lisp
    ... ... @@ -98,7 +98,7 @@
    98 98
          (t
    
    99 99
           (setf (ring-first ring) new)))
    
    100 100
         (shiftf (aref vec first) nil)))
    
    101
    -
    
    101
    +
    
    102 102
     
    
    103 103
     ;;; ring-length  --  Public
    
    104 104
     ;;;
    
    ... ... @@ -116,7 +116,7 @@
    116 116
     ;;;    Do modulo arithmetic to find the correct element.
    
    117 117
     ;;;
    
    118 118
     (defun ring-ref (ring index)
    
    119
    -  (declare (fixnum index))
    
    119
    +  (declare (fixnum index))
    
    120 120
       "Return the index'th element of a ring.  This can be set with Setf."
    
    121 121
       (let ((first (ring-first ring)))
    
    122 122
         (declare (fixnum first))
    

  • src/hemlock/search1.lisp
    ... ... @@ -58,7 +58,7 @@
    58 58
     ;;;
    
    59 59
     ;;;    This macro is used to define a new kind of search pattern.  Kind
    
    60 60
     ;;; is the kind of search pattern to define.  Lambda-list is the argument 
    
    61
    -;;; list for the expert-function to be built and forms it's body.
    
    61
    +;;; list for the expert-function to be built and forms it's body.
    
    62 62
     ;;; The arguments passed are the direction, the pattern, and either
    
    63 63
     ;;; an old search-pattern of the same type or nil.  Documentation
    
    64 64
     ;;; is put on the search-pattern-documentation property of the kind
    

  • src/hemlock/search2.lisp
    ... ... @@ -83,7 +83,7 @@
    83 83
     
    
    84 84
     ;;; Create-Character-Set  --  Internal
    
    85 85
     ;;;
    
    86
    -;;;    Create-Character-Set returns a character-set which will search
    
    86
    +;;;    Create-Character-Set returns a character-set which will search
    
    87 87
     ;;; for no character.
    
    88 88
     ;;;
    
    89 89
     (defun create-character-set ()
    

  • src/hemlock/winimage.lisp
    ... ... @@ -307,7 +307,7 @@
    307 307
            TOP
    
    308 308
     	(cond ((null line)
    
    309 309
     	       (go DONE))
    
    310
    -	      ((eq (line-%chars line) (dis-line-old-chars (car current)))
    
    310
    +	      ((eq (line-%chars line) (dis-line-old-chars (car current)))
    
    311 311
     	       (go STEP)))
    
    312 312
     	;;
    
    313 313
     	;; We found a suspect line.