From ba1a657e67629e6eff47468e04b1fad7f0599f66 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 14 Aug 2007 21:00:23 +0000 Subject: --- src/interp/Makefile.pamphlet | 12 +++--- src/interp/bookvol5.pamphlet | 14 ++----- src/scripts/axiom.in | 2 +- src/share/ChangeLog | 4 ++ src/share/doc/msgs/s2-us.msgs | 86 +++++++++++++++++++++---------------------- 5 files changed, 57 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index a5024ddb..8cfd56e7 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -65,7 +65,7 @@ COMPILE_LISP = $(DEPSYS) -- --compile --output=$@ $< \subsection{Autloload} -In order to minimize the size of the Axiom image at load time +In order to minimize the size of the OpenAxiom image at load time we put some of the compiled files into a separate directory that will be autoloaded on demand. This directory of code will be shipped with the final system and so it belongs in @@ -211,7 +211,7 @@ The [[depsys]] image is made of the following Lisp source files It is not needed for translating Boot codes to Common Lisp. \item[\File{axext\_l.lisp}] This file defines various macros and - functions for interoperability between Aldor and Axiom. Not needed + functions for interoperability between Aldor and OpenAxiom. Not needed for translating Boot codes to Common Lisp. \end{description} @@ -329,7 +329,7 @@ DEBUGSYS=$(axiom_build_bindir)/debugsys$(EXEEXT) These are the files that need to be compiled (in {\bf BOOTSYS}), loaded into a clean lisp image ({\bf LOADSYS}) and saved as -a runnable \Tool{Axiom} interpreter ({\bf SAVESYS}) usually named +a runnable \Tool{OpenAxiom} interpreter ({\bf SAVESYS}) usually named \Tool{interpsys}. Most of these files are translated from Boot to Common Lisp and then compiled. There are two exceptions, \File{bootfuns.lisp} @@ -579,7 +579,7 @@ ASAUTO= ${AUTO}/ax.$(FASLEXT) autoload_objects += $(ASAUTO) @ -Axiom versions are given as a string of the form: +OpenAxiom versions are given as a string of the form: "Sunday September 21, 2003 at 20:38:05 " which describe the day, date, and time of the build. This is used for reporting bugs. It is only partially useful @@ -589,7 +589,7 @@ and use the MD5 hash of that file as the version stamp. Ultimately though, this would be chasing the elusive "perfect information" idea. A new variable [[boot::*build-version*]] is set here and used by the -[[yearweek]] function to display the version number of the Axiom build. +[[yearweek]] function to display the version number of the OpenAxiom build. This information is set by hand in the top level Makefile. <>= TIMESTAMP=$(axiom_targetdir)/timestamp @@ -1095,7 +1095,7 @@ tail-recursive call. This happens when the last form in a function is a call to the same function. In general, we don't care so we set compiler::*suppress-compiler-notes* to true in order to reduce the noise. -Notice that when Axiom uses GCL as the Lisp platform, it is usually not +Notice that when OpenAxiom uses GCL as the Lisp platform, it is usually not a good idea to mess with GCL's internal variables. In particular, GCL has its own idea about what to do with [[si::*system-directory*]], which should not be set here just because we happen to save an GCL-based image. diff --git a/src/interp/bookvol5.pamphlet b/src/interp/bookvol5.pamphlet index 5a7bd281..c4bd1142 100644 --- a/src/interp/bookvol5.pamphlet +++ b/src/interp/bookvol5.pamphlet @@ -290,7 +290,7 @@ where the Lisp image has been started. The [[reroot]] function sets this variable to the value of [[$spadroot]] which itself has the value of the argument to the [[reroot]] function. Since the argument to the [[reroot]] function is -an string which represents an absolute pathname pointing to AXIOM the +an string which represents an absolute pathname pointing to OpenAxiom the net result is that the [[$current-directory]] is set to point to the shell [[AXIOM]] variable. @@ -1389,12 +1389,12 @@ S2IZ0076 do you really want to import everything from the frame %1b ? If so, please enter %b y %d or %b yes %d : S2IZ0077 - On your request, AXIOM will not import everything from frame %1b. + On your request, OpenAxiom will not import everything from frame %1b. S2IZ0078 Import from frame %1b is complete. Please issue %b )display all %d if you wish to see the contents of the current frame. S2IZ0079 - AXIOM cannot import %1b from frame %2b because it cannot be found. + OpenAxiom cannot import %1b from frame %2b because it cannot be found. @ \chapter{The Undo Mechanism} \section{)undo} @@ -1632,19 +1632,11 @@ DEBUGSYS=${OBJ}/${SYS}/bin/debugsys @ \chapter{Makefile.bookvol5} <<*>>= -LATEX=/usr/bin/latex -LISP=${AXIOM}/obj/linux/bin/lisp -TANGLE=/usr/local/bin/NOTANGLE -WEAVE=/usr/local/bin/NOWEAVE -delay all: bookvol5 @echo 0 done bookvol5: bookvol5.pamphlet - @echo 1 extracting the bookvol5reter - ${WEAVE} bookvol5.pamphlet >bookvol5.tex - ${LATEX} bookvol5.tex - ${LATEX} bookvol5.tex ${TANGLE} -R"Interpreter" bookvol5.pamphlet >bookvol5.lisp remake: diff --git a/src/scripts/axiom.in b/src/scripts/axiom.in index 3b1b7c3c..29d896bb 100644 --- a/src/scripts/axiom.in +++ b/src/scripts/axiom.in @@ -26,7 +26,7 @@ ## Where The Axiom system resides prefix=@prefix@ exec_prefix=@exec_prefix@ -AXIOM=@libdir@/axiom/target/@target@ +AXIOM=@libdir@/open-axiom/target/@target@ export AXIOM ## We adjust the value of PATH here because, currently, some Axiom diff --git a/src/share/ChangeLog b/src/share/ChangeLog index c24815fc..5b1fc53c 100644 --- a/src/share/ChangeLog +++ b/src/share/ChangeLog @@ -1,3 +1,7 @@ +2007-08-14 Gabriel Dos Reis + + * doc/msgs/s2-us.msgs: Consistently use OpenAxiom. + 2006-11-24 Gabriel Dos Reis * Makefile.pamphlet (all-share): New phony target. diff --git a/src/share/doc/msgs/s2-us.msgs b/src/share/doc/msgs/s2-us.msgs index 891734c4..955ffbd9 100644 --- a/src/share/doc/msgs/s2-us.msgs +++ b/src/share/doc/msgs/s2-us.msgs @@ -75,7 +75,7 @@ S2IB0008f Perhaps package-calling the operation or using coercions on the arguments will allow you to apply the operation. S2IB0009 - AXIOM will attempt to step through and interpret the code. + OpenAxiom will attempt to step through and interpret the code. S2IB0010 Cannot resolve type of value and declared partial type. S2IB0011 @@ -183,7 +183,7 @@ S2IF0008 S2IF0009 The domain %1bp does not belong to the category %2bp . S2IF0010 - %1b is not a known function. AXIOM will try to list its functions + %1b is not a known function. OpenAxiom will try to list its functions which contain %1b in their names. This is the same output you would get by issuing %ceon %b )what operations %1 %d %ceoff S2IF0011 @@ -316,7 +316,7 @@ S2IL0017 the selection: S2IL0018 Your request to cancel the selection has been accepted. You are now - being returned to the top level of AXIOM. + being returned to the top level of OpenAxiom. S2IL0019 %1b is not known to be a valid abbreviation for a constructor. If necessary, use the %b )abbreviation %d system command to create @@ -371,11 +371,11 @@ S2IM0009 be further processed. It would probably help if you declared the function. The functions/rules that were being analyzed were: %l %b %2 %d S2IM0010 - AXIOM cannot compile or interpret code for function %1b . + OpenAxiom cannot compile or interpret code for function %1b . S2IM0011 - AXIOM cannot determine the type for function %1b . Please declare it. + OpenAxiom cannot determine the type for function %1b . Please declare it. S2IM0012 - AXIOM cannot determine the type of %1b because it cannot analyze the + OpenAxiom cannot determine the type of %1b because it cannot analyze the non-recursive part, if that exists. This may be remedied by declaring the function. S2IM0013 @@ -401,22 +401,22 @@ S2IM0027 S2IP0001 The left-hand side of a %b => %d form must be a symbol. S2IP0002 - AXIOM cannot now process %b ! %d in the way you have used it. + OpenAxiom cannot now process %b ! %d in the way you have used it. Use parentheses, if appropriate. S2IP0003 Argument number %1b of %2bp must have type %3bp . S2IP0004 %1 macro %2b . S2IP0005 - %1b is not a valid identifier to use in AXIOM. + %1b is not a valid identifier to use in OpenAxiom. S2IR0001 Cannot resolve all the types in the list to be created. S2IR0002 - AXIOM cannot handle %b [ ] %d here. + OpenAxiom cannot handle %b [ ] %d here. S2IR0003 The types that cannot be resolved are: %1b S2IR0004 - AXIOM is confused by what you input. It cannot resolve the + OpenAxiom is confused by what you input. It cannot resolve the type %1bp with the partial type %2bp . Please make sure you have used the correct syntax. S2IR0005 @@ -436,7 +436,7 @@ S2IS0005 The index variable in an iterator must be a symbol and %1 is not one. S2IS0006 - AXIOM cannot iterate with %1b over your form now. + OpenAxiom cannot iterate with %1b over your form now. Perhaps you should try using a conversion to make sure your form is a list or stream, for example. S2IS0007 @@ -444,14 +444,14 @@ S2IS0007 S2IS0008 The step value in a loop must be a constant integer. S2IS0009 - AXIOM can only iterate over lists now and you supplied an + OpenAxiom can only iterate over lists now and you supplied an object of type %1bp . S2IS0010 Cannot resolve types in collect body. S2IS0011 Interpret-Code mode is not supported for stream bodies. S2IS0013 - AXIOM does not understand what you mean when you specify %b [ + OpenAxiom does not understand what you mean when you specify %b [ ] %d as having the type %1bp . S2IS0014 Cannot compile the declaration for %1b because its @@ -519,10 +519,10 @@ S2IS0039 If there is a tuple on the left-hand side of an assignment then there must also be one on the right-hand side. S2IS0040 - AXIOM cannot now handle assignments to scripted variables + OpenAxiom cannot now handle assignments to scripted variables with more than one script. You can use %b == %d however. S2IS0041 - AXIOM can now only handle undeclared %b Table %d + OpenAxiom can now only handle undeclared %b Table %d assignments with a single key. Try using the form %1b . S2IS0047 The %b return %d keyword can only be used within a function. @@ -550,7 +550,7 @@ S2IS0055 S2IS0056 Anonymous user functions created with %b +-> %d that are processed in interpret-code mode must have result target information available. - This information is not present so AXIOM cannot proceed any further. + This information is not present so OpenAxiom cannot proceed any further. This may be remedied by declaring the function. S2IS0057 All parameters to anonymous user maps must identifiers, possibly in @@ -584,7 +584,7 @@ S2IT0006 %1 The %b )trace %d option %b )only %d does not permit %2b as a legal option. S2IT0007 - %1 AXIOM does not understand the %b )trace %d option %2b which you used. + %1 OpenAxiom does not understand the %b )trace %d option %2b which you used. S2IT0008 %1 The %b )trace %d option %b )break %d can only have one or both of %b before %d and %b after %d as arguments. @@ -608,7 +608,7 @@ S2IT0016 S2IT0017 There are %1b problems with your %b )trace %d system command: S2IT0018 - AXIOM does not understand the use of %1b here. + OpenAxiom does not understand the use of %1b here. S2IT0019 If you use the %b )off %d option for %b )trace %d and you also use the %b )local %d or %b )ops %d option, you must specify the name @@ -629,7 +629,7 @@ S2IU0003 The %b )load %d system command is obsolete. Please use the %b )library %d command instead. S2IV0001 - %b )set streams calculate %d is used to tell AXIOM + %b )set streams calculate %d is used to tell OpenAxiom how many elements of a stream to calculate when a computation uses the stream. The value given after %b calculate %d must either be the word %b all %d or a positive integer. %l %l The current @@ -739,7 +739,7 @@ S2IZ0031 Please enter %b y %d or %b yes %d if you really want to leave the interactive environment and return to the operating system: S2IZ0032 - You have chosen to remain in the %b AXIOM %d + You have chosen to remain in the %b OpenAxiom %d interactive environment. S2IZ0033 You cannot %b )read %d the file %1b because your user-level is not is @@ -747,7 +747,7 @@ S2IZ0033 )set userlevel %d . S2IZ0034 You cannot %b )read %d the file %1b because it is not suitable for - reading by AXIOM. Note that files with file extension %b .spad %d + reading by OpenAxiom. Note that files with file extension %b .spad %d and %b .as %d can now only be compiled with the %b )compile %d system command. S2IZ0035 The file %1b will not be added to the list of working source files @@ -757,13 +757,13 @@ S2IZ0036 S2IZ0037 %1b requires and argument and you do not give one. S2IZ0038 - Compiling AXIOM source code from file %1b using old system compiler. + Compiling OpenAxiom source code from file %1b using old system compiler. S2IZ0038A - Compiling AXIOM source code from file %1b using AXIOM-XL compiler and + Compiling OpenAxiom source code from file %1b using AXIOM-XL compiler and options %b %ceon %2 %ceoff %d Use the system command %b )set compiler args %d to change these options. S2IZ0039 - Only AXIOM source files with file extensions + Only OpenAxiom source files with file extensions %b .as, .ao, .al, %d or %b .spad %d can be compiled. S2IZ0040 The %b )constructor %d option to %b )compile %d must also be @@ -790,7 +790,7 @@ S2IZ0044M for the mapping. For example, Mapping(T, A, B) denotes the class of mappings from (A, B) into T. %l - This constructor is a primitive in AXIOM. + This constructor is a primitive in OpenAxiom. For more information, use the HyperDoc Browser. S2IZ0044R Record(a:A,...,b:B) %l @@ -800,7 +800,7 @@ S2IZ0044R ... %l b, a selector, an element of domain Symbol %l B, a domain of category SetCategory %u %l - This constructor is a primitive in AXIOM. + This constructor is a primitive in OpenAxiom. The selectors a,...,b of a Record type must be distinct. %l %l In order for more information to be displayed about %1b , you must give it specific arguments. For example: %2b %l @@ -813,7 +813,7 @@ S2IZ0045T ... %l b, a tag, an element of domain Symbol %l B, a domain of category SetCategory %u %l - This constructor is a primitive in AXIOM. + This constructor is a primitive in OpenAxiom. In this tagged Union, tags a, ..., b must be distinct. %l %l In order for more information to be displayed about %1b , you must give it specific arguments. For example: %2b %l @@ -917,7 +917,7 @@ S2IZ0051 S2IZ0052 It is mostly likely a %b )set %d command. Please inspect the file. S2IZ0053 - AXIOM initialization: %1b + OpenAxiom initialization: %1b S2IZ0054 %1b is unknown to us, so no information is available. S2IZ0055 @@ -932,7 +932,7 @@ S2IZ0057 Since you did not respond with %b y %d or %b yes %d the list of abbreviations will not be displayed. S2IZ0058 - You have requested that all information about all AXIOM + You have requested that all information about all OpenAxiom operations (functions) be displayed. As there are several hundred operations, please confirm your request by typing %b y %d or %b yes %d and then pressing %b Enter %d : @@ -975,11 +975,11 @@ S2IZ0069C Bad file format in file %1b : a group name should not contain blanks. The improper group name is %2b S2IZ0070 - The current AXIOM default directory is %1b + The current OpenAxiom default directory is %1b S2IZ0071 - You cannot close this AXIOM session. + You cannot close this OpenAxiom session. S2IZ0072 - This is the last AXIOM session. Do you want to kill AXIOM? + This is the last OpenAxiom session. Do you want to kill OpenAxiom? S2IZ0073 %b )frame import %d must be followed by the frame name. The names of objects in that frame can then optionally follow the frame name. @@ -1002,12 +1002,12 @@ S2IZ0076 do you really want to import everything from the frame %1b ? If so, please enter %b y %d or %b yes %d : S2IZ0077 - On your request, AXIOM will not import everything from frame %1b . + On your request, OpenAxiom will not import everything from frame %1b . S2IZ0078 Import from frame %1b is complete. Please issue %b )display all %d if you wish to see the contents of the current frame. S2IZ0079 - AXIOM cannot import %1b from frame %2b because it cannot be found. + OpenAxiom cannot import %1b from frame %2b because it cannot be found. S2IZ0080 Unknown system command: %1b S2IZ0081 @@ -1015,7 +1015,7 @@ S2IZ0081 %b )compile %d system command. If you give the %b )translate %d option then you cannot also give the %b )new %d option. S2IZ0082 - The old AXIOM system compiler can only compile files with file extension + The old OpenAxiom system compiler can only compile files with file extension ".spad". S2IZ0083 The AXIOM-XL compiler can only compile files with file extensions ".as" or @@ -1026,7 +1026,7 @@ S2IZ0085 Warning: translation of an old-style source code ".spad" file to a new-style ".as" file changes the old system compiler. If you wish to use the old system compiler for regular compilation, you must exit and re-enter - AXIOM. + OpenAxiom. S2IZ0086 Cannot write to file with name %b %1 %d . S2IZ0087 @@ -1065,9 +1065,9 @@ S2GE0002 start a fresh system and then restart your computation. %l %l Note that you simply may not be able to perform your calculation in the amount of storage you have available to you. Ask your system - administrator if it is possible for you to run %b AXIOM %d in a + administrator if it is possible for you to run %b OpenAxiom %d in a larger virtual machine. %l %l - If you have questions, contact an AXIOM consultant. + If you have questions, contact an OpenAxiom consultant. S2GE0003 The cache for %1b cannot be cleared because that function is not privately clammed. @@ -1109,13 +1109,13 @@ S2GE0017 Unexpected error in call to system function %1b S2GL0001 %ceon - %b AXIOM Computer Algebra System %d %l + %b OpenAxiom: The Open Scientific Computation System %d %l %1 %ceoff S2GL0003A Issue %b )hd %d to start the Hyperdoc help system. S2GL0003B - Issue %b )quit %d to leave AXIOM and return to %1 . + Issue %b )quit %d to leave OpenAxiom and return to %1 . S2GL0003C Issue %b )help %x1 ? %d to see information about the %b )help %d command. S2GL0004 @@ -1156,9 +1156,9 @@ S2GL0018C S2GL0018D Issue %b )summary %d for a summary of useful system commands. S2GL0019 - Type %b (resume) %d to return to AXIOM and continue with the next + Type %b (resume) %d to return to OpenAxiom and continue with the next statement. Type %b (toplevel) %d to abort all input files and continue - with interactive AXIOM. + with interactive OpenAxiom. S2NR0001 The function %1b with signature %2 is missing from domain %3b S2NR0002 @@ -1247,7 +1247,7 @@ S2CN0002 The character %b %1 %d is greater than the radix. S2CN0003 - The character %b %1 %d is not an AXIOM character. + The character %b %1 %d is not an OpenAxiom character. S2CY0002 Improper syntax. -- cgit v1.2.3