Relocated the definitions for the 1+ and 1- psmacros with the other math functions.

diff --git a/src/lib/ps-macro-lib.lisp b/src/lib/ps-macro-lib.lisp
index f1f73f0..a38b4e8 100644 (file)
--- a/src/lib/ps-macro-lib.lisp
+++ b/src/lib/ps-macro-lib.lisp
@@ -29,6 +29,8 @@
     (asinh (n) `((lambda (x) (return (log (+ x (sqrt (1+ (* x x))))))) ,n))
     (acosh (n) `((lambda (x) (return (* 2 (log (+ (sqrt (/ (1+ x) 2)) (sqrt (/ (1- x) 2))))))) ,n))
     (atanh (n) `((lambda (x) (return (/ (- (log (+ 1 x)) (log (- 1 x))) 2))) ,n))
+    (1+ (n) `(+ ,n 1))
+    (1- (n) `(- ,n 1))
     (abs (n) `(*math.abs ,n))
     (evenp (n) `(not (oddp ,n)))
     (oddp (n) `(% ,n 2))

diff --git a/src/special-forms.lisp b/src/special-forms.lisp
index e07d331..26f787c 100644 (file)
--- a/src/special-forms.lisp
+++ b/src/special-forms.lisp
@@ -108,12 +108,6 @@
   (declare (ignore expecting))
   (list 'unary-operator "~" (compile-parenscript-form x :expecting :expression) :prefix t))
 
-(defpsmacro 1- (form)
-  `(- ,form 1))
-
-(defpsmacro 1+ (form)
-  `(+ ,form 1))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; control structures
 (defun flatten-blocks (body)