From 31048c62fa634a693ba107971569545ef3f2df3e Mon Sep 17 00:00:00 2001 From: Eric Swenson Date: Tue, 18 Apr 2023 16:57:36 -0700 Subject: [PATCH] Added missing function $taylorp to JM;SIMP. Also made JM;SIMP virtually identical to LISPM version. Resolves #2188. --- src/jm/{simp.834 => simp.835} | 13 +++++++++---- src/jpg/{comm2.56 => comm2.57} | 0 2 files changed, 9 insertions(+), 4 deletions(-) rename src/jm/{simp.834 => simp.835} (99%) rename src/jpg/{comm2.56 => comm2.57} (100%) diff --git a/src/jm/simp.834 b/src/jm/simp.835 similarity index 99% rename from src/jm/simp.834 rename to src/jm/simp.835 index bcf05e4f..5cc8126d 100644 --- a/src/jm/simp.834 +++ b/src/jm/simp.835 @@ -14,7 +14,9 @@ BIGFLOATZERO BIGFLOATONE $ASSUMESCALAR $SUBNUMSIMP OPERS-LIST *OPERS-LIST WFLAG $DONTFACTOR *N *OUT *IN VARLIST GENVAR $FACTORFLAG RADCANP) - (*EXPR PSQUOREM1 PNTHROOTP) + (*EXPR PSQUOREM1 PNTHROOTP %especial csign oper-apply sumpls sumtimes + srf mevenp moddp demoivre pdis rischint sinint context-unwinder + $defint pgcdexpon pexpon*// psimp pdivide pterm) (*LEXPR FMAPL1 $LIMIT OUTERMAP1 $RATSIMP $EXPAND) (FIXNUM FMAPLVL L1 L2 XN NARGS I (SIGNUM1)) (NOTYPE N) @@ -242,6 +244,9 @@ (DEFMFUN $RATP (X) (AND (NOT (ATOM X)) (EQ (CAAR X) 'MRAT))) +(defmfun $taylorp (x) + (and (not (atom x)) (eq (caar x) 'mrat) (memq 'trunc (cdar x)) t)) + (DEFMFUN SPECREPCHECK (E) (IF (SPECREPP E) (SPECDISREP E) E)) ;; Note that the following two functions are carefully coupled. @@ -411,7 +416,7 @@ (DEFMFUN SIMPLIFYA (X Y) (COND ((ATOM X) (COND ((AND (EQ X '$%PI) $NUMER) %PI-VAL) (T X))) - ((NOT $SIMP) X) + ((NOT $SIMP) X) ((ATOM (CAR X)) (COND ((AND (CDR X) (ATOM (CDR X))) (MERROR "~%~S is a cons with an atomic cdr - SIMPLIFYA" X)) @@ -2066,7 +2071,7 @@ (DEFUN RATQU (A B) (RATQUOTIENT (RATFIX A) (RATFIX B))) (DEFUN RATFIX (A) (COND ((EQUAL A (RATNUMERATOR A)) (CONS A 1)) (T A))) - + (DEFUN RATDIVIDE (F G) (LET* (((FNUM . FDEN) (RATFIX F)) ((GNUM . GDEN) (RATFIX G)) @@ -2104,6 +2109,7 @@ (DEFMFUN *KAR (X) (IF (NOT (ATOM X)) (CAR X))) ;MATCOEF is obsolete, only needed for old SAVE files. - JPG 5/12/80 +#-NIL (declare (*expr ratcoef)) #-NIL (DEFUN MATCOEF FEXPR (L) (RATDISREP (RATCOEF (MEVAL (CAR L)) (MEVAL (CADR L))))) @@ -2127,4 +2133,3 @@ ; Undeclarations for the file: (DECLARE (NOTYPE L1 L2 XN NARGS I)) - diff --git a/src/jpg/comm2.56 b/src/jpg/comm2.57 similarity index 100% rename from src/jpg/comm2.56 rename to src/jpg/comm2.57