mit-scheme.git
19 years agoFix bug: explicitly-defined record unparsers installed during cold
Chris Hanson [Mon, 24 Oct 2005 05:31:07 +0000 (05:31 +0000)]
Fix bug: explicitly-defined record unparsers installed during cold
load weren't being seen.

19 years agoFix bug in parser optimizer whereby local bindings for the buffer
Taylor R. Campbell [Mon, 24 Oct 2005 05:07:38 +0000 (05:07 +0000)]
Fix bug in parser optimizer whereby local bindings for the buffer
pointer would be eliminated due to ostensible lack of reference, even
if the user code contained references to them, because the reference
counter won't descend into the user code.  Also, reintroduce the new
rule, which was previously removed, for turning redundant bindings of
the buffer pointer into aliases.  Cases affected independently by each
optimization should now be covered correctly & safely.

19 years agoLENGTH operation is valid for both input _and_ output files.
Chris Hanson [Mon, 24 Oct 2005 02:51:23 +0000 (02:51 +0000)]
LENGTH operation is valid for both input _and_ output files.

19 years agoLENGTH operation is valid for both input _and_ output files.
Chris Hanson [Mon, 24 Oct 2005 02:47:47 +0000 (02:47 +0000)]
LENGTH operation is valid for both input _and_ output files.

19 years agoExport KEEP-MATCHING-ITEMS!.
Chris Hanson [Mon, 24 Oct 2005 02:30:08 +0000 (02:30 +0000)]
Export KEEP-MATCHING-ITEMS!.

19 years agoFix bug #14354: use email address and ctime() string in message
Chris Hanson [Mon, 24 Oct 2005 02:23:41 +0000 (02:23 +0000)]
Fix bug #14354: use email address and ctime() string in message
separator of FCC files, because they are supposed to be unix-mail
files.  Also add "Date" and "From" headers, and don't output a newline
before the first message in a file.

19 years agoFix bug #12430: do auto-fill line break _before_ inserting new char.
Chris Hanson [Mon, 24 Oct 2005 01:55:50 +0000 (01:55 +0000)]
Fix bug #12430: do auto-fill line break _before_ inserting new char.

19 years agoFix bug #11850: change port type predicates to return #T when true.
Chris Hanson [Mon, 24 Oct 2005 01:45:41 +0000 (01:45 +0000)]
Fix bug #11850: change port type predicates to return #T when true.

19 years agoFix bug #14361: IMAIL use of backslashes in symbol names was broken by
Chris Hanson [Mon, 24 Oct 2005 01:26:40 +0000 (01:26 +0000)]
Fix bug #14361: IMAIL use of backslashes in symbol names was broken by
change to reader syntax for symbols.

19 years agoUse new argument to TEST-FOR-IO-ON-CHANNEL.
Chris Hanson [Sun, 23 Oct 2005 21:10:02 +0000 (21:10 +0000)]
Use new argument to TEST-FOR-IO-ON-CHANNEL.

19 years agoFix copyright date.
Chris Hanson [Sun, 23 Oct 2005 21:03:52 +0000 (21:03 +0000)]
Fix copyright date.

19 years agoAdd optional BLOCK? argument to TEST-FOR-IO-ON-CHANNEL.
Chris Hanson [Sun, 23 Oct 2005 21:01:06 +0000 (21:01 +0000)]
Add optional BLOCK? argument to TEST-FOR-IO-ON-CHANNEL.

19 years agoFix bug #14844: Edwin tutorial causes an internal error if window is
Chris Hanson [Sun, 23 Oct 2005 20:41:22 +0000 (20:41 +0000)]
Fix bug #14844: Edwin tutorial causes an internal error if window is
too small.  Also fix pagination by restyling.

19 years agoFix problem with modeline being wrong for "added" files.
Chris Hanson [Fri, 21 Oct 2005 17:20:39 +0000 (17:20 +0000)]
Fix problem with modeline being wrong for "added" files.

19 years agoAnother pass on SVN integration. This one seems to perform basic
Chris Hanson [Fri, 21 Oct 2005 02:46:59 +0000 (02:46 +0000)]
Another pass on SVN integration.  This one seems to perform basic
operations correctly.

19 years agoInitial draft of subversion back end.
Chris Hanson [Wed, 19 Oct 2005 05:31:55 +0000 (05:31 +0000)]
Initial draft of subversion back end.

19 years agoExport DEFINE-GUARANTEE to global environment.
Chris Hanson [Thu, 29 Sep 2005 19:16:39 +0000 (19:16 +0000)]
Export DEFINE-GUARANTEE to global environment.

19 years agoIn HASH-TABLE/COUNT, rehash the table if it needs it -- this is the
Chris Hanson [Thu, 29 Sep 2005 19:15:54 +0000 (19:15 +0000)]
In HASH-TABLE/COUNT, rehash the table if it needs it -- this is the
only way to guarantee an accurate count.

19 years agoProvide default MIME type of "application/octet-stream" for otherwise
Chris Hanson [Tue, 20 Sep 2005 19:23:15 +0000 (19:23 +0000)]
Provide default MIME type of "application/octet-stream" for otherwise
unrecognized file types.

19 years agoChange IE content type to be "text/html".
Chris Hanson [Sat, 17 Sep 2005 01:20:50 +0000 (01:20 +0000)]
Change IE content type to be "text/html".

19 years agoAllow "iso8859-" character sets.
Chris Hanson [Tue, 13 Sep 2005 14:19:26 +0000 (14:19 +0000)]
Allow "iso8859-" character sets.

19 years agoStandardize guarantees in record package.
Chris Hanson [Thu, 8 Sep 2005 19:12:49 +0000 (19:12 +0000)]
Standardize guarantees in record package.

19 years agoAdd unparser methods to URI record types.
Chris Hanson [Thu, 8 Sep 2005 18:51:30 +0000 (18:51 +0000)]
Add unparser methods to URI record types.

19 years agoIgnore attempt to link variable to itself.
Chris Hanson [Thu, 8 Sep 2005 02:31:19 +0000 (02:31 +0000)]
Ignore attempt to link variable to itself.

19 years agoDon't allow linking a variable to itself.
Chris Hanson [Thu, 8 Sep 2005 02:02:04 +0000 (02:02 +0000)]
Don't allow linking a variable to itself.

19 years agoAdd support for "Content-Transfer-Encoding: x-uuencode".
Chris Hanson [Wed, 7 Sep 2005 19:24:28 +0000 (19:24 +0000)]
Add support for "Content-Transfer-Encoding: x-uuencode".

19 years agoAdd decoder for uuencoded files.
Chris Hanson [Wed, 7 Sep 2005 19:20:09 +0000 (19:20 +0000)]
Add decoder for uuencoded files.

19 years agoDon't ever try MAP_FIXED unless we _know_ that the address range is
Chris Hanson [Mon, 22 Aug 2005 01:15:07 +0000 (01:15 +0000)]
Don't ever try MAP_FIXED unless we _know_ that the address range is
available.

19 years agoAdd updated support for valgrind.
Chris Hanson [Mon, 22 Aug 2005 01:07:05 +0000 (01:07 +0000)]
Add updated support for valgrind.

19 years agoEliminate some remnants of the "stacklet" design.
Chris Hanson [Sat, 20 Aug 2005 01:57:37 +0000 (01:57 +0000)]
Eliminate some remnants of the "stacklet" design.

19 years agoTry to prevent circular entity-reference chains from occurring.
Chris Hanson [Fri, 12 Aug 2005 13:17:30 +0000 (13:17 +0000)]
Try to prevent circular entity-reference chains from occurring.

19 years agoChange FLO:RANDOM-UNIT (and consequently RANDOM) to exclude zero when
Chris Hanson [Wed, 10 Aug 2005 18:16:59 +0000 (18:16 +0000)]
Change FLO:RANDOM-UNIT (and consequently RANDOM) to exclude zero when
generating floating-point random numbers.  Change initialization to
destructively modify *RANDOM-STATE* and DEFAULT-RANDOM-SOURCE.  Fix
bug: COPY-RANDOM-STATE! was copying the target to the source.

19 years agoEliminate some now-unused bindings.
Chris Hanson [Fri, 5 Aug 2005 20:04:19 +0000 (20:04 +0000)]
Eliminate some now-unused bindings.

19 years agoEliminate support for compiled C code.
Chris Hanson [Fri, 5 Aug 2005 20:03:05 +0000 (20:03 +0000)]
Eliminate support for compiled C code.

19 years agoFix fencepost error in handling of port width.
Chris Hanson [Thu, 4 Aug 2005 02:14:48 +0000 (02:14 +0000)]
Fix fencepost error in handling of port width.

19 years agoEliminate binding for primitive GC-SPACE-STATUS, since that binding is
Chris Hanson [Sun, 31 Jul 2005 02:59:37 +0000 (02:59 +0000)]
Eliminate binding for primitive GC-SPACE-STATUS, since that binding is
now in the global environment.

19 years agoUpdate copyright dates.
Chris Hanson [Sun, 31 Jul 2005 02:58:39 +0000 (02:58 +0000)]
Update copyright dates.

19 years agoEliminate use of primitive GET-NEXT-CONSTANT, which is to be removed
Chris Hanson [Sun, 31 Jul 2005 02:55:18 +0000 (02:55 +0000)]
Eliminate use of primitive GET-NEXT-CONSTANT, which is to be removed
from the microcode.  Instead use GC-SPACE-STATUS to implement
CONSTANT-SPACE/IN-USE.

19 years agoDon't use mmap_heap_malloc unless HEAP_IN_LOW_MEMORY is defined.
Chris Hanson [Sun, 24 Jul 2005 05:21:11 +0000 (05:21 +0000)]
Don't use mmap_heap_malloc unless HEAP_IN_LOW_MEMORY is defined.

19 years agoRewrite mmap_heap_malloc to search "/proc/NNNN/maps" for a suitable
Chris Hanson [Sun, 24 Jul 2005 05:19:44 +0000 (05:19 +0000)]
Rewrite mmap_heap_malloc to search "/proc/NNNN/maps" for a suitable
address.  Also, don't use mmap_heap_malloc unless HEAP_IN_LOW_MEMORY
is defined.

19 years agoUse 'OS_malloc' for default definition of 'HEAP_MALLOC', because the
Chris Hanson [Sun, 24 Jul 2005 05:10:03 +0000 (05:10 +0000)]
Use 'OS_malloc' for default definition of 'HEAP_MALLOC', because the
latter isn't allowed to return the null pointer.

19 years agoFix copyright date.
Chris Hanson [Sun, 24 Jul 2005 05:08:55 +0000 (05:08 +0000)]
Fix copyright date.

19 years agoRewrite 'strcmp_ci' to use 'toupper' from STDC rather than
Chris Hanson [Sun, 24 Jul 2005 05:08:30 +0000 (05:08 +0000)]
Rewrite 'strcmp_ci' to use 'toupper' from STDC rather than
non-standardized '_toupper'.

19 years agoDon't bother including <string.h> at all; instead trust that "ux.h"
Chris Hanson [Sun, 24 Jul 2005 05:06:40 +0000 (05:06 +0000)]
Don't bother including <string.h> at all; instead trust that "ux.h"
will do the right thing.

19 years agoUse OBJECT-GC-TYPE rather than PRIMITIVE-OBJECT-GC-TYPE.
Chris Hanson [Tue, 19 Jul 2005 03:49:26 +0000 (03:49 +0000)]
Use OBJECT-GC-TYPE rather than PRIMITIVE-OBJECT-GC-TYPE.

19 years agoRemove unused LOAD-PACKED-BINARIES.
Chris Hanson [Tue, 19 Jul 2005 03:48:44 +0000 (03:48 +0000)]
Remove unused LOAD-PACKED-BINARIES.

19 years agoFix bug: %WITHIN-CONTINUATION was being used in "thread.scm", and my
Chris Hanson [Sun, 17 Jul 2005 02:27:05 +0000 (02:27 +0000)]
Fix bug: %WITHIN-CONTINUATION was being used in "thread.scm", and my
last change broke the interface.

19 years agoFix some syntax errors only visible on Win32.
Chris Hanson [Sun, 17 Jul 2005 02:12:50 +0000 (02:12 +0000)]
Fix some syntax errors only visible on Win32.

19 years agoFix problem with decrementing of string length variable.
Chris Hanson [Sat, 16 Jul 2005 03:46:42 +0000 (03:46 +0000)]
Fix problem with decrementing of string length variable.

19 years agoEliminate non-reentrant continuations. Microcode 14.17 will drop
Chris Hanson [Sat, 16 Jul 2005 03:44:22 +0000 (03:44 +0000)]
Eliminate non-reentrant continuations.  Microcode 14.17 will drop
support for them.

19 years agoUpdate copyright statement.
Chris Hanson [Fri, 15 Jul 2005 05:33:08 +0000 (05:33 +0000)]
Update copyright statement.

19 years agoImplement ULONG/FIXNUM conversion macros.
Chris Hanson [Fri, 15 Jul 2005 05:31:58 +0000 (05:31 +0000)]
Implement ULONG/FIXNUM conversion macros.

19 years agoImplement ULONG/FIXNUM conversion macros.
Chris Hanson [Fri, 15 Jul 2005 05:31:42 +0000 (05:31 +0000)]
Implement ULONG/FIXNUM conversion macros.

19 years agoChange some variables from signed to unsigned.
Chris Hanson [Fri, 15 Jul 2005 05:31:18 +0000 (05:31 +0000)]
Change some variables from signed to unsigned.

19 years agoDefine __inline__ for non-gcc, so we can use this anywhere.
Chris Hanson [Fri, 15 Jul 2005 04:23:36 +0000 (04:23 +0000)]
Define __inline__ for non-gcc, so we can use this anywhere.

19 years agoFix indentation of #; for single lines.
Chris Hanson [Thu, 14 Jul 2005 19:35:15 +0000 (19:35 +0000)]
Fix indentation of #; for single lines.

19 years agoFix typo/thinko: inclusion of <string.h> was conditionalized on
Chris Hanson [Sat, 9 Jul 2005 03:28:14 +0000 (03:28 +0000)]
Fix typo/thinko: inclusion of <string.h> was conditionalized on
_POSIX, which (a) should have been _POSIX_VERSION and (b) isn't the
right thing to conditionalize anyway.

19 years agoWork around illegal use of cast expressions in some of the macros.
Chris Hanson [Sat, 9 Jul 2005 03:26:45 +0000 (03:26 +0000)]
Work around illegal use of cast expressions in some of the macros.
GCC 4.0 signals them as errors and refuses to compile the code.  Note
that the obstack.h file in GNU libc has the same problem.

19 years agoDon't assume that __IA32__ implies support for native compiled code.
Chris Hanson [Mon, 4 Jul 2005 13:51:19 +0000 (13:51 +0000)]
Don't assume that __IA32__ implies support for native compiled code.

19 years agoAdd processor type for SVM.
Chris Hanson [Mon, 4 Jul 2005 13:49:29 +0000 (13:49 +0000)]
Add processor type for SVM.

19 years agoFix copyright dates.
Chris Hanson [Mon, 4 Jul 2005 02:40:44 +0000 (02:40 +0000)]
Fix copyright dates.

19 years agoNew primitives for manipulating objects:
Chris Hanson [Fri, 1 Jul 2005 19:38:39 +0000 (19:38 +0000)]
New primitives for manipulating objects:

    PRIMITIVE-DATUM->ADDRESS
    PRIMITIVE-ADDRESS->DATUM
    PRIMITIVE-MAKE-OBJECT
    PRIMITIVE-OBJECT->INTEGER
    PRIMITIVE-INTEGER->OBJECT

19 years agoImplement primitives to read and write arbitrary memory.
Chris Hanson [Thu, 30 Jun 2005 20:04:53 +0000 (20:04 +0000)]
Implement primitives to read and write arbitrary memory.

19 years agoImplement PRIMITIVE-OBJECT-ADDRESS.
Chris Hanson [Thu, 30 Jun 2005 20:04:22 +0000 (20:04 +0000)]
Implement PRIMITIVE-OBJECT-ADDRESS.

19 years agoTweak changes slightly.
Chris Hanson [Thu, 30 Jun 2005 17:44:31 +0000 (17:44 +0000)]
Tweak changes slightly.

19 years agoFix flonum comparison operations that were assuming that
Chris Hanson [Thu, 30 Jun 2005 17:39:12 +0000 (17:39 +0000)]
Fix flonum comparison operations that were assuming that

    (BOOLEAN=? (NOT (FLO:< X Y)) (FLO:>= X Y))

19 years agoFix SIGSEGV generated by M-x isearch-forward-regexp when input was
Chris Hanson [Mon, 27 Jun 2005 06:12:45 +0000 (06:12 +0000)]
Fix SIGSEGV generated by M-x isearch-forward-regexp when input was
"[^".

19 years agoAnother clarification of SIGCONTEXT stuff, this time to incorporate
Chris Hanson [Mon, 27 Jun 2005 06:03:43 +0000 (06:03 +0000)]
Another clarification of SIGCONTEXT stuff, this time to incorporate
standardized context information from _POSIX_REALTIME_SIGNALS.

19 years agoChange configuration to handle PostgreSQL 8.0 includes.
Chris Hanson [Sun, 26 Jun 2005 05:36:52 +0000 (05:36 +0000)]
Change configuration to handle PostgreSQL 8.0 includes.

19 years agoRewrite the unix trap handler to simplify and clarify its logic.
Chris Hanson [Sun, 26 Jun 2005 04:35:35 +0000 (04:35 +0000)]
Rewrite the unix trap handler to simplify and clarify its logic.
Change the __linux__ code to recognize that the third argument to the
signal handler is a "ucontext_t *" and not a "struct sigcontext *" as
previously assumed.  (This will probably cause problems when used on
older linux systems.)

19 years agoGuarantee valid sp_register and Free _prior_ to execution of ffree
Chris Hanson [Sun, 26 Jun 2005 04:31:47 +0000 (04:31 +0000)]
Guarantee valid sp_register and Free _prior_ to execution of ffree
instruction which might raise SIGFPE.  This ensures that the trap
handler gets the right values for recovery.

19 years agoMake sure symbols are canonicalized in Edwin.
Chris Hanson [Fri, 24 Jun 2005 17:34:31 +0000 (17:34 +0000)]
Make sure symbols are canonicalized in Edwin.

19 years agoImplement GUARANTEE-VECTOR-OF-TYPE, VECTOR-OF-UNIQUE-SYMBOLS?, and
Chris Hanson [Thu, 16 Jun 2005 17:15:19 +0000 (17:15 +0000)]
Implement GUARANTEE-VECTOR-OF-TYPE, VECTOR-OF-UNIQUE-SYMBOLS?, and
GUARANTEE-VECTOR-OF-UNIQUE-SYMBOLS.

19 years agoAllow VECTOR-MAP to take multiple vector arguments. Implement
Chris Hanson [Tue, 14 Jun 2005 18:17:38 +0000 (18:17 +0000)]
Allow VECTOR-MAP to take multiple vector arguments.  Implement
VECTOR-FOR-EACH similarly.

19 years agoReally export URI->SYMBOL.
Chris Hanson [Mon, 13 Jun 2005 19:06:41 +0000 (19:06 +0000)]
Really export URI->SYMBOL.

19 years agoWhen processing "Eval" bindings, make sure buffer is selected.
Chris Hanson [Fri, 10 Jun 2005 01:51:23 +0000 (01:51 +0000)]
When processing "Eval" bindings, make sure buffer is selected.

19 years agoCan't use colon in local variable name.
Chris Hanson [Fri, 10 Jun 2005 01:50:46 +0000 (01:50 +0000)]
Can't use colon in local variable name.

19 years agoImplement buffer-local indentation support.
Chris Hanson [Fri, 10 Jun 2005 01:42:52 +0000 (01:42 +0000)]
Implement buffer-local indentation support.

19 years agoAdd comment to MATCHER:IPV6-ADDRESS explaining why it is written in
Chris Hanson [Sun, 5 Jun 2005 19:31:29 +0000 (19:31 +0000)]
Add comment to MATCHER:IPV6-ADDRESS explaining why it is written in
such a strange way.

19 years agoRename REXP-0*N to REXP-*N.
Chris Hanson [Sun, 5 Jun 2005 19:28:32 +0000 (19:28 +0000)]
Rename REXP-0*N to REXP-*N.

19 years agoUse new repetition constructs in matcher language.
Chris Hanson [Sat, 4 Jun 2005 23:48:25 +0000 (23:48 +0000)]
Use new repetition constructs in matcher language.

19 years agoRevert rule that eliminates unused pointer bindings, since the newer
Chris Hanson [Sat, 4 Jun 2005 23:44:05 +0000 (23:44 +0000)]
Revert rule that eliminates unused pointer bindings, since the newer
rule didn't catch all the interesting cases.

19 years agoRewrite pointer optimization to keep track of aliases for pointer
Chris Hanson [Sat, 4 Jun 2005 05:58:19 +0000 (05:58 +0000)]
Rewrite pointer optimization to keep track of aliases for pointer
references, and to canonicalize all pointer references to the
outermost alias.  This allows inner aliases to be elided.

Also, change RUN-OPTIMIZATIONS so it runs optimizers repeatedly until
no optimizations are performed.

19 years agoFix typo in previous revision.
Chris Hanson [Sat, 4 Jun 2005 04:02:41 +0000 (04:02 +0000)]
Fix typo in previous revision.

19 years agoImplement N*M, N*N, *N, and N* patterns.
Chris Hanson [Sat, 4 Jun 2005 03:42:46 +0000 (03:42 +0000)]
Implement N*M, N*N, *N, and N* patterns.

19 years agoFix a bunch of problems with the optimizer. Simplify and expand the
Chris Hanson [Sat, 4 Jun 2005 03:41:50 +0000 (03:41 +0000)]
Fix a bunch of problems with the optimizer.  Simplify and expand the
optimizer's debugging support.

19 years agoUse lower case for output of hexadecimal digits.
Chris Hanson [Fri, 3 Jun 2005 13:32:27 +0000 (13:32 +0000)]
Use lower case for output of hexadecimal digits.

19 years agoUse lower case for output of hexadecimal digits.
Chris Hanson [Fri, 3 Jun 2005 03:01:58 +0000 (03:01 +0000)]
Use lower case for output of hexadecimal digits.

19 years agoSimplify code generation for partial parser.
Chris Hanson [Wed, 1 Jun 2005 05:13:07 +0000 (05:13 +0000)]
Simplify code generation for partial parser.

19 years agoDon't store the buffer in the partial-uri record.
Chris Hanson [Wed, 1 Jun 2005 05:08:21 +0000 (05:08 +0000)]
Don't store the buffer in the partial-uri record.

19 years agoAnother round of work on the partial URI parser. More clarifications,
Chris Hanson [Wed, 1 Jun 2005 05:00:15 +0000 (05:00 +0000)]
Another round of work on the partial URI parser.  More clarifications,
plus separate entry points for partial parsing of absolute URIs.

19 years agoChange partial URI parser to save erroneous characters and make them
Chris Hanson [Tue, 31 May 2005 20:12:31 +0000 (20:12 +0000)]
Change partial URI parser to save erroneous characters and make them
available by calling PARTIAL-URI-EXTRA on the result.  Rewrite the
state-machine compiler for clarification.

19 years agoGeneralize ->URI variants to accept more inputs.
Chris Hanson [Mon, 30 May 2005 18:49:38 +0000 (18:49 +0000)]
Generalize ->URI variants to accept more inputs.

19 years agoSupport conversions between symbols and wide strings.
Chris Hanson [Mon, 30 May 2005 18:49:01 +0000 (18:49 +0000)]
Support conversions between symbols and wide strings.

19 years agoAdd support for partial URI parsing. This is useful for completion.
Chris Hanson [Mon, 30 May 2005 04:42:36 +0000 (04:42 +0000)]
Add support for partial URI parsing.  This is useful for completion.

19 years agoImplement GET-OUTPUT-STRING!, which gets the accumulated output from
Chris Hanson [Mon, 30 May 2005 04:10:47 +0000 (04:10 +0000)]
Implement GET-OUTPUT-STRING!, which gets the accumulated output from
an string output port and resets the accumulator to zero.  Change
GET-OUTPUT-STRING so it doesn't reset the accumulator.

19 years agoComplete rewrite of URI support to comply with RFC 3986.
Chris Hanson [Mon, 30 May 2005 02:48:55 +0000 (02:48 +0000)]
Complete rewrite of URI support to comply with RFC 3986.

19 years agoAdd expressions to implement limited repeating patterns.
Chris Hanson [Mon, 30 May 2005 02:46:52 +0000 (02:46 +0000)]
Add expressions to implement limited repeating patterns.

19 years agoImplement MERGE-URIS and BASE-URI?. Change path representation to
Chris Hanson [Thu, 26 May 2005 17:43:20 +0000 (17:43 +0000)]
Implement MERGE-URIS and BASE-URI?.  Change path representation to
have marker for absolute rather than relative.  Disallow #F as path;
use '() instead.

19 years agoRearrange for readability.
Chris Hanson [Thu, 26 May 2005 13:24:32 +0000 (13:24 +0000)]
Rearrange for readability.