Mercurial > emacs
changeset 58652:5f04991ece3d
Remove dummy autoloading functions from autoloads.
(calc-load-everything, math-defsimplify): Replace dummy autoloading
functions by require statements.
(math-defsimplify): Move to calc-alg.el, added to autoloads.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Tue, 30 Nov 2004 17:06:07 +0000 |
| parents | 05765b6fc9cd |
| children | 1fd405160ceb |
| files | lisp/calc/calc-ext.el |
| diffstat | 1 files changed, 76 insertions(+), 99 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc-ext.el Tue Nov 30 17:04:40 2004 +0000 +++ b/lisp/calc/calc-ext.el Tue Nov 30 17:06:07 2004 +0000 @@ -649,7 +649,7 @@ (autoload func (car x)))) (cdr x)))) '( - ("calc-alg" calc-Need-calc-alg calc-has-rules + ("calc-alg" calc-has-rules math-defsimplify calc-modify-simplify-mode calcFunc-collect calcFunc-esimplify calcFunc-islin calcFunc-islinnt calcFunc-lin calcFunc-linnt calcFunc-simplify calcFunc-subst math-beforep @@ -657,13 +657,13 @@ math-expr-contains-count math-expr-depends math-expr-height math-expr-subst math-expr-weight math-integer-plus math-is-linear math-is-multiple math-is-polynomial math-linear-in math-multiple-of -math-need-std-simps math-poly-depends math-poly-mix math-poly-mul +math-poly-depends math-poly-mix math-poly-mul math-poly-simplify math-poly-zerop math-polynomial-base math-polynomial-p math-recompile-eval-rules math-simplify math-simplify-exp math-simplify-extended math-simplify-sqrt math-to-simple-fraction) - ("calcalg2" calc-Need-calc-alg-2 calcFunc-asum calcFunc-deriv + ("calcalg2" calcFunc-asum calcFunc-deriv calcFunc-ffinv calcFunc-finv calcFunc-fsolve calcFunc-gpoly calcFunc-integ calcFunc-poly calcFunc-prod calcFunc-roots calcFunc-solve calcFunc-sum calcFunc-table calcFunc-taylor @@ -672,7 +672,7 @@ math-poly-all-roots math-prod-rec math-reject-solution math-solve-eqn math-solve-for math-sum-rec math-try-integral) - ("calcalg3" calc-Need-calc-alg-3 calcFunc-efit calcFunc-fit + ("calcalg3" calcFunc-efit calcFunc-fit calcFunc-fitdummy calcFunc-fitparam calcFunc-fitvar calcFunc-hasfitparams calcFunc-hasfitvars calcFunc-maximize calcFunc-minimize calcFunc-ninteg calcFunc-polint calcFunc-ratint @@ -680,7 +680,7 @@ calcFunc-xfit math-find-minimum math-find-root math-ninteg-evaluate math-ninteg-midpoint math-ninteg-romberg math-poly-interp) - ("calc-arith" calc-Need-calc-arith calcFunc-abs calcFunc-abssqr + ("calc-arith" calcFunc-abs calcFunc-abssqr calcFunc-add calcFunc-ceil calcFunc-decr calcFunc-deven calcFunc-dimag calcFunc-dint calcFunc-div calcFunc-dnatnum calcFunc-dneg calcFunc-dnonneg calcFunc-dnonzero calcFunc-dnumint calcFunc-dodd @@ -706,7 +706,7 @@ math-quarter-integer math-round math-setup-declarations math-sqr math-sqr-float math-trunc-fancy math-trunc-special) - ("calc-bin" calc-Need-calc-bin calcFunc-and calcFunc-ash + ("calc-bin" calcFunc-and calcFunc-ash calcFunc-clip calcFunc-diff calcFunc-lsh calcFunc-not calcFunc-or calcFunc-rash calcFunc-rot calcFunc-rsh calcFunc-xor math-clip math-compute-max-digits math-convert-radix-digits math-float-parts @@ -715,7 +715,7 @@ math-format-radix math-format-radix-float math-integer-log2 math-power-of-2 math-radix-float-power) - ("calc-comb" calc-Need-calc-comb calc-report-prime-test + ("calc-comb" calc-report-prime-test calcFunc-choose calcFunc-dfact calcFunc-egcd calcFunc-fact calcFunc-gcd calcFunc-lcm calcFunc-moebius calcFunc-nextprime calcFunc-perm calcFunc-prevprime calcFunc-prfac calcFunc-prime @@ -723,28 +723,28 @@ calcFunc-totient math-init-random-base math-member math-prime-test math-random-base) - ("calccomp" calc-Need-calc-comp calcFunc-cascent calcFunc-cdescent + ("calccomp" calcFunc-cascent calcFunc-cdescent calcFunc-cheight calcFunc-cwidth math-comp-ascent math-comp-descent math-comp-height math-comp-width math-compose-expr math-composition-to-string math-stack-value-offset-fancy math-vector-is-string math-vector-to-string) - ("calc-cplx" calc-Need-calc-cplx calcFunc-arg calcFunc-conj + ("calc-cplx" calcFunc-arg calcFunc-conj calcFunc-im calcFunc-polar calcFunc-re calcFunc-rect math-complex math-fix-circular math-imaginary math-imaginary-i math-normalize-polar math-polar math-want-polar) - ("calc-embed" calc-Need-calc-embed calc-do-embedded + ("calc-embed" calc-do-embedded calc-do-embedded-activate calc-embedded-evaluate-expr calc-embedded-modes-change calc-embedded-var-change) - ("calc-fin" calc-Need-calc-fin calc-to-percentage calcFunc-ddb + ("calc-fin" calc-to-percentage calcFunc-ddb calcFunc-fv calcFunc-fvb calcFunc-fvl calcFunc-irr calcFunc-irrb calcFunc-nper calcFunc-nperb calcFunc-nperl calcFunc-npv calcFunc-npvb calcFunc-pmt calcFunc-pmtb calcFunc-pv calcFunc-pvb calcFunc-pvl calcFunc-rate calcFunc-rateb calcFunc-ratel calcFunc-sln calcFunc-syd) - ("calc-forms" calc-Need-calc-forms calcFunc-badd calcFunc-bsub + ("calc-forms" calcFunc-badd calcFunc-bsub calcFunc-date calcFunc-day calcFunc-dsadj calcFunc-hms calcFunc-holiday calcFunc-hour calcFunc-incmonth calcFunc-incyear calcFunc-intv calcFunc-julian calcFunc-makemod calcFunc-minute @@ -759,11 +759,11 @@ math-setup-add-holidays math-setup-holidays math-setup-year-holidays math-sort-intv math-to-business-day math-to-hms) - ("calc-frac" calc-Need-calc-frac calc-add-fractions + ("calc-frac" calc-add-fractions calc-div-fractions calc-mul-fractions calcFunc-fdiv calcFunc-frac math-make-frac) - ("calc-funcs" calc-Need-calc-funcs calc-prob-dist calcFunc-bern + ("calc-funcs" calc-prob-dist calcFunc-bern calcFunc-besJ calcFunc-besY calcFunc-beta calcFunc-betaB calcFunc-betaI calcFunc-erf calcFunc-erfc calcFunc-euler calcFunc-gamma calcFunc-gammaG calcFunc-gammaP calcFunc-gammaQ @@ -772,20 +772,18 @@ calcFunc-utpf calcFunc-utpn calcFunc-utpp calcFunc-utpt math-bernoulli-number math-gammap1-raw) - ("calc-graph" calc-Need-calc-graph calc-graph-show-tty) - - ("calc-help" calc-Need-calc-help) - - ("calc-incom" calc-Need-calc-incom calc-digit-dots) - - ("calc-keypd" calc-Need-calc-keypd calc-do-keypad + ("calc-graph" calc-graph-show-tty) + + ("calc-incom" calc-digit-dots) + + ("calc-keypd" calc-do-keypad calc-keypad-x-left-click calc-keypad-x-middle-click calc-keypad-x-right-click) - ("calc-lang" calc-Need-calc-lang calc-set-language + ("calc-lang" calc-set-language math-read-big-balance math-read-big-rec) - ("calc-map" calc-Need-calc-map calc-get-operator calcFunc-accum + ("calc-map" calc-get-operator calcFunc-accum calcFunc-afixp calcFunc-anest calcFunc-apply calcFunc-call calcFunc-fixp calcFunc-inner calcFunc-map calcFunc-mapa calcFunc-mapc calcFunc-mapd calcFunc-mapeq calcFunc-mapeqp calcFunc-mapeqr @@ -796,11 +794,11 @@ math-calcFunc-to-var math-multi-subst math-multi-subst-rec math-var-to-calcFunc) - ("calc-mtx" calc-Need-calc-mat calcFunc-det calcFunc-lud calcFunc-tr + ("calc-mtx" calcFunc-det calcFunc-lud calcFunc-tr math-col-matrix math-lud-solve math-matrix-inv-raw math-matrix-lud math-mul-mat-vec math-mul-mats math-row-matrix) - ("calc-math" calc-Need-calc-math calcFunc-alog calcFunc-arccos + ("calc-math" calcFunc-alog calcFunc-arccos calcFunc-arccosh calcFunc-arcsin calcFunc-arcsincos calcFunc-arcsinh calcFunc-arctan calcFunc-arctan2 calcFunc-arctanh calcFunc-cos calcFunc-cosh calcFunc-deg calcFunc-exp calcFunc-exp10 calcFunc-expm1 @@ -815,9 +813,9 @@ math-sin-cos-raw math-sin-raw math-sqrt math-sqrt-float math-sqrt-raw math-tan-raw math-to-radians math-to-radians-2) - ("calc-mode" calc-Need-calc-mode math-get-modes-vec) - - ("calc-poly" calc-Need-calc-poly calcFunc-apart calcFunc-expand + ("calc-mode" math-get-modes-vec) + + ("calc-poly" calcFunc-apart calcFunc-expand calcFunc-expandpow calcFunc-factor calcFunc-factors calcFunc-nrat calcFunc-pcont calcFunc-pdeg calcFunc-pdiv calcFunc-pdivide calcFunc-pdivrem calcFunc-pgcd calcFunc-plead calcFunc-pprim @@ -830,7 +828,7 @@ math-poly-gcd-frac-list math-poly-modulus-rec math-ratpoly-p math-to-ratpoly math-to-ratpoly-rec) - ("calc-prog" calc-Need-calc-prog calc-default-formula-arglist + ("calc-prog" calc-default-formula-arglist calc-execute-kbd-macro calc-finish-user-syntax-edit calc-fix-token-name calc-fix-user-formula calc-read-parse-table calc-read-parse-table-part calc-subsetp calc-write-parse-table @@ -843,7 +841,7 @@ math-do-defmath math-handle-for math-handle-foreach math-normalize-logical-op math-return) - ("calc-rewr" calc-Need-calc-rewr calcFunc-match calcFunc-matches + ("calc-rewr" calcFunc-match calcFunc-matches calcFunc-matchnot calcFunc-rewrite calcFunc-vmatches math-apply-rewrites math-compile-patterns math-compile-rewrites math-flatten-lands math-match-patterns math-rewrite @@ -851,43 +849,37 @@ ("calc-rules" calc-CommuteRules calc-DistribRules calc-FactorRules calc-FitRules calc-IntegAfterRules calc-InvertRules calc-JumpRules -calc-MergeRules calc-Need-calc-rules calc-NegateRules +calc-MergeRules calc-NegateRules calc-compile-rule-set) - ("calc-sel" calc-Need-calc-sel calc-auto-selection + ("calc-sel" calc-auto-selection calc-delete-selection calc-encase-atoms calc-find-assoc-parent-formula calc-find-parent-formula calc-find-sub-formula calc-prepare-selection calc-preserve-point calc-replace-selections calc-replace-sub-formula calc-roll-down-with-selections calc-roll-up-with-selections calc-sel-error) - ("calcsel2" calc-Need-calc-sel-2) - - ("calc-stat" calc-Need-calc-stat calc-vector-op calcFunc-agmean + ("calc-stat" calc-vector-op calcFunc-agmean calcFunc-vcorr calcFunc-vcount calcFunc-vcov calcFunc-vflat calcFunc-vgmean calcFunc-vhmean calcFunc-vmax calcFunc-vmean calcFunc-vmeane calcFunc-vmedian calcFunc-vmin calcFunc-vpcov calcFunc-vprod calcFunc-vpsdev calcFunc-vpvar calcFunc-vsdev calcFunc-vsum calcFunc-vvar math-flatten-many-vecs) - ("calc-store" calc-Need-calc-store calc-read-var-name + ("calc-store" calc-read-var-name calc-store-value calc-var-name) - ("calc-stuff" calc-Need-calc-stuff calc-explain-why calcFunc-clean + ("calc-stuff" calc-explain-why calcFunc-clean calcFunc-pclean calcFunc-pfloat calcFunc-pfrac) - ("calc-trail" calc-Need-calc-trail) - - ("calc-undo" calc-Need-calc-undo) - - ("calc-units" calc-Need-calc-units calcFunc-usimplify + ("calc-units" calcFunc-usimplify math-build-units-table math-build-units-table-buffer math-check-unit-name math-convert-temperature math-convert-units math-extract-units math-remove-units math-simplify-units math-single-units-in-expr-p math-to-standard-units math-units-in-expr-p) - ("calc-vec" calc-Need-calc-vec calcFunc-append calcFunc-appendrev + ("calc-vec" calcFunc-append calcFunc-appendrev calcFunc-arrange calcFunc-cnorm calcFunc-cons calcFunc-cross calcFunc-ctrn calcFunc-cvec calcFunc-diag calcFunc-find calcFunc-getdiag calcFunc-grade calcFunc-head calcFunc-histogram @@ -906,7 +898,7 @@ math-map-vec-2 math-mat-col math-mimic-ident math-prepare-set math-read-brackets math-reduce-cols math-reduce-vec math-transpose) - ("calc-yank" calc-Need-calc-yank calc-alg-edit calc-clean-newlines + ("calc-yank" calc-alg-edit calc-clean-newlines calc-do-grab-rectangle calc-do-grab-region calc-finish-stack-edit calc-force-refresh calc-locate-cursor-element calc-show-edit-buffer) @@ -1655,47 +1647,45 @@ (defun calc-load-everything () (interactive) - (require 'calc-macs) ; calc-macs.el - (calc-record-list nil) ; calc-misc.el - (math-read-exprs "0") ; calc-aent.el - -;;;; (Loads here) - (calc-Need-calc-alg-2) - (calc-Need-calc-alg-3) - (calc-Need-calc-alg) - (calc-Need-calc-arith) - (calc-Need-calc-bin) - (calc-Need-calc-comb) - (calc-Need-calc-comp) - (calc-Need-calc-cplx) - (calc-Need-calc-embed) - (calc-Need-calc-fin) - (calc-Need-calc-forms) - (calc-Need-calc-frac) - (calc-Need-calc-funcs) - (calc-Need-calc-graph) - (calc-Need-calc-help) - (calc-Need-calc-incom) - (calc-Need-calc-keypd) - (calc-Need-calc-lang) - (calc-Need-calc-map) - (calc-Need-calc-mat) - (calc-Need-calc-math) - (calc-Need-calc-mode) - (calc-Need-calc-poly) - (calc-Need-calc-prog) - (calc-Need-calc-rewr) - (calc-Need-calc-rules) - (calc-Need-calc-sel-2) - (calc-Need-calc-sel) - (calc-Need-calc-stat) - (calc-Need-calc-store) - (calc-Need-calc-stuff) - (calc-Need-calc-trail) - (calc-Need-calc-undo) - (calc-Need-calc-units) - (calc-Need-calc-vec) - (calc-Need-calc-yank) + (require 'calc-aent) + (require 'calc-alg) + (require 'calc-arith) + (require 'calc-bin) + (require 'calc-comb) + (require 'calc-cplx) + (require 'calc-embed) + (require 'calc-fin) + (require 'calc-forms) + (require 'calc-frac) + (require 'calc-funcs) + (require 'calc-graph) + (require 'calc-help) + (require 'calc-incom) + (require 'calc-keypd) + (require 'calc-lang) + (require 'calc-macs) + (require 'calc-map) + (require 'calc-math) + (require 'calc-misc) + (require 'calc-mode) + (require 'calc-mtx) + (require 'calc-poly) + (require 'calc-prog) + (require 'calc-rewr) + (require 'calc-rules) + (require 'calc-sel) + (require 'calc-stat) + (require 'calc-store) + (require 'calc-stuff) + (require 'calc-trail) + (require 'calc-undo) + (require 'calc-units) + (require 'calc-vec) + (require 'calc-yank) + (require 'calcalg2) + (require 'calcalg3) + (require 'calccomp) + (require 'calcsel2) (message "All parts of Calc are now loaded")) @@ -2581,20 +2571,6 @@ (cons (car x) (mapcar 'math-evaluate-expr-rec (cdr x)))))) x)) -(defmacro math-defsimplify (funcs &rest code) - (append '(progn (math-need-std-simps)) - (mapcar (function - (lambda (func) - (list 'put (list 'quote func) ''math-simplify - (list 'nconc - (list 'get (list 'quote func) ''math-simplify) - (list 'list - (list 'function - (append '(lambda (math-simplify-expr)) - code))))))) - (if (symbolp funcs) (list funcs) funcs)))) -(put 'math-defsimplify 'lisp-indent-hook 1) - (defun math-any-floats (expr) (if (Math-primp expr) (math-floatp expr) @@ -3353,5 +3329,6 @@ (run-hooks 'calc-ext-load-hook) (provide 'calc-ext) + ;;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e ;;; calc-ext.el ends here