From: Robert D. <rob...@us...> - 2012-04-30 15:15:04
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Maxima, A Computer Algebra System". The branch, master has been updated via a1181064983bb74412c60be27a57a6e05a7b1a3b (commit) from 43155e043111b4ce4cb3305e4bd9f1d1cdc8a885 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a1181064983bb74412c60be27a57a6e05a7b1a3b Author: robert_dodier <rob...@us...> Date: Mon Apr 30 09:14:33 2012 -0600 Separate global variable initialization from CL-USER:RUN and move it into a new function, INITIALIZE-RUNTIME-GLOBALS, which is called by CL-USER:RUN. Programs which replace the read-eval-print loop can call INITIALIZE-RUNTIME-GLOBALS so that they start with the same state as CL-USER:RUN. diff --git a/src/init-cl.lisp b/src/init-cl.lisp index c0f17f4..78527ad 100644 --- a/src/init-cl.lisp +++ b/src/init-cl.lisp @@ -546,6 +546,17 @@ When one changes, the other does too." (defun cl-user::run () "Run Maxima in its own package." (in-package :maxima) + (initialize-runtime-globals) + (let ((input-stream *standard-input*) + (batch-flag nil)) + (catch 'to-lisp + (setf (values input-stream batch-flag) + (process-maxima-args input-stream batch-flag)) + (loop + (with-simple-restart (macsyma-quit "Maxima top-level") + (macsyma-top-level input-stream batch-flag)))))) + +(defun initialize-runtime-globals () (setf *load-verbose* nil) (setf *debugger-hook* #'maxima-lisp-debugger) ;; See discussion on the maxima list @@ -568,30 +579,23 @@ When one changes, the other does too." ;; variable. Hence we need to set it here to get our desired ;; behavior. (setf *read-default-float-format* 'double-float)) - (let ((input-stream *standard-input*) - (batch-flag nil)) - #+allegro - (progn - (set-readtable-for-macsyma) - (setf *read-default-float-format* 'lisp::double-float)) - (catch 'to-lisp - (initialize-real-and-run-time) - (intl::setlocale) - (set-locale-subdir) - (adjust-character-encoding) - (set-pathnames) - (when (boundp '*maxima-prefix*) - (push (pathname (concatenate 'string *maxima-prefix* - (if *maxima-layout-autotools* - "/share/locale/" - "/locale/"))) - intl::*locale-directories*)) - (setf (values input-stream batch-flag) - (process-maxima-args input-stream batch-flag)) - (loop - (with-simple-restart (macsyma-quit "Maxima top-level") - (macsyma-top-level input-stream batch-flag)))))) + #+allegro + (progn + (set-readtable-for-macsyma) + (setf *read-default-float-format* 'lisp::double-float)) + + (initialize-real-and-run-time) + (intl::setlocale) + (set-locale-subdir) + (adjust-character-encoding) + (set-pathnames) + (when (boundp '*maxima-prefix*) + (push (pathname (concatenate 'string *maxima-prefix* + (if *maxima-layout-autotools* + "/share/locale/" + "/locale/"))) + intl::*locale-directories*))) (defun adjust-character-encoding () (ignore-errors ----------------------------------------------------------------------- Summary of changes: src/init-cl.lisp | 50 +++++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 23 deletions(-) hooks/post-receive -- Maxima, A Computer Algebra System |