024e32992c58
Merge
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Tue, 08 Mar 2022 22:02:54 -0500 |
parents | 652d3e91c0f9 (current diff) c15cbbfc3d37 (diff) |
children | cb2e07924093 |
branches/tags | (none) |
files | src/base.lisp src/math.lisp |
Changes
--- a/src/base.lisp Tue Mar 08 21:18:22 2022 -0500 +++ b/src/base.lisp Tue Mar 08 22:02:54 2022 -0500 @@ -61,20 +61,6 @@ (setf *stack* (car *previous*)))) -;;;; Misc --------------------------------------------------------------------- -(defun sh (command &key (input "") output) - (uiop:run-program command - :output (when output :string) - :input (make-string-input-stream input))) - -(defun pbcopy (object) - (sh '("pbcopy") :input (aesthetic-string object)) - (values)) - -(defun pbpaste () - (values (sh '("pbpaste") :output t))) - - ;;;; Help --------------------------------------------------------------------- (defun first-letter (command) (let ((ch (aref (symbol-name command) 0))) @@ -107,7 +93,7 @@ ~@ What happens when a form is read depends on the form:~@ ~@ - * Numbers are pushed onto the stack.~@ + * Numbers and characters are pushed onto the stack.~@ * Symbols run commands.~@ * Quoted forms are pushed onto the stack.~@ ~@ @@ -273,6 +259,14 @@ "Do nothing.") +;;;; Commands/Misc ------------------------------------------------------------ +(define-command char-code (char) + (push! (char-code char))) + +(define-command code-char (code) + (push! (code-char code))) + + ;;;; Special Forms ------------------------------------------------------------ (defgeneric special-form (symbol &rest body)) @@ -307,7 +301,7 @@ (with-errors-handled (catch :do-not-add-undo-state (etypecase input - ((or number string) (push! input)) + ((or number string character) (push! input)) (symbol (command input)) (cons (apply 'special-form input))) (save-stack))))
--- a/src/math.lisp Tue Mar 08 21:18:22 2022 -0500 +++ b/src/math.lisp Tue Mar 08 22:02:54 2022 -0500 @@ -88,6 +88,22 @@ (setf *print-base* n *read-base* n)) +(define-command bits (x) + "Pop the top of the stack and print its binary representation." + (unless (typep x '(integer 0 *)) + (error "BITS requires a nonnegative integer.")) + (format t "~v,'0,' ,4:B~%" + (let ((chunks (ceiling (integer-length x) 4))) + (+ (* 4 chunks) ; actual bits + (1- chunks))) ; comma chars + x)) + +(define-command hex (x) + "Pop the top of the stack and print its hex representation." + (unless (typep x '(integer 0 *)) + (error "HEX requires a nonnegative integer.")) + (format t "~X~%" x)) + (define-command base10 () "Set the print base and read base for numbers to base 10." (let ((pb *print-base*)