~ chicken-core (chicken-5) eb4dc4aba8753330cb1e6e08494c8bf63a2c8abc


commit eb4dc4aba8753330cb1e6e08494c8bf63a2c8abc
Merge: 929fa71b ceedfdf7
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Feb 28 22:22:53 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Feb 28 22:22:53 2010 +0100

    resolved conflicts

diff --cc NEWS
index 1d7b570b,ffd1eea7..42670580
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,137 +1,108 @@@
 -4.3.7
++4.4.0
+ 
+ - the system can now be built with llvm-gcc and/or "clang" (the
+   LLVM C compiler which doesn't use the GNU C frontend)
+ - added new option `-trunk' to `chicken-install', which forces
+   building and installing the development version of extensions
+   in combination with `-t local'
+ - added new option `-deploy' to `chicken-install', which builds
+   extension for use in "deployed" applications (see below)
+ - added option `-deploy' to `csc', the compiler driver. With this
+   option `csc' can build fully self-contained application bundles
+   and double-clickable Macintosh GUI apps; see the "Deployment"
+   manual chapter for more information
+ - the directory given to the `-prefix' option of `chicken-install'
+   may now be a relative pathname.
 -
 -4.3.6
 -
+ - removed GUI-specific runtime library (`libchicken-gui') from
+   Windows build - GUI- and non-GUI applications now use the same
+   runtime library
 -- undocumented OPTIMIZE_FOR_SPEED build variable: it is generally
 -  unsafe to use -O3 in gcc version equal or later than 4.4 (thanks
 -  to Sven Hartrumpf for pointing this out)
+ - special forms of the foreign-function interface have been replaced
+   with an internal form and syntax to allow renaming and shadowing of
+   these forms
 -- the configuration file for `chicken-install' (`setup.defaults') has
 -  now a slightly enhanced format and allows to define arbitrary
 -  mappings from/to extensions - this is used to handle installation
 -  attempts of builtin library units
+ - the new `-private-repository' option in `csc' compiles executables
+   with the extension-repository path set to the directory from which
 -  the program was started - this is in anticipation of easy to use
 -  deployment options in forthcoming releases
++  the program was started
+ - `csc': deprecated the `-W' and `-windows' options, added `-gui' as
+   a platform-independent replacement
 -- `require-extension'/`use' accept import-specifications
++- `require-extension'/`use' accepts now import-specifications
+ - user-defined extension-specifiers and `set-extension-specifier!'
+   have been removed
+ - `delete-file[*]', `rename-file', `create-directory', `file-copy',
+   `file-move', `delete-directory' and `change-directory' return their
+   argument/destination filename on success
+ - added the missing procedure `condition-variable-name' to the
+   srfi-18 library unit (Thanks to Joerg Wittenberger)
+ - the `glob?' function from the `regex' unit has been deprecated
+ - added the procedure `scan-input-lines' to the `utils' library unit
+ - added new runtime option `-:g' which enables GC debugging output
+ - reclamation of unused symbols in "symbol-gc" mode (`-:w') now only
+   takes place for symbols with an empty property-list
 -- various bugfixes and cleaning up
 -
 -4.3.5
 -
+ - on Windows loading of code compiled with [non-]GUI runtime libraries
+   will fail and produce an error message when the loading executable
+   is linked with a different runtime system
+ - on Windows, GUI libraries were not correctly linked by `csc'
+ - unit posix: added setter for `file-modification-time'
 -
 -4.3.4
 -
+ - the banner shows the branchname of the build, unless it's "master"
+ - the `-no-install' option to `chicken-install' is ignored when
+   building/installing dependencies
+ - `chicken-uninstall' takes a glob instead of a regular expression as
+   argument
 -- fixed bug that caused the `unboxing' optimization to generate incorrect
 -  C code
+ - the rename and compare functions for low-level macro-definitions 
+   accept now arbitrary s-expressions and renames/compares them recursively
+ - `number->string' handles negative-numbers with bases different from 10
+   correctly (thanks to Peter Danenberg)
+ - removed deprecated `setup-install-flag' and `setup-verbose-flag' from
+   the `setup-api' module
 -
 -4.3.3
 -
 -- various mingw Makefile fixes (Thanks to Jim Ursetto)
+ - added new option `-repository' to `chicken-install' (Thanks to Christian
+   Kellermann)
+ - removed `chicken-setup' stub program
+ - fix to `csc' to use the correct library when fixing dynamic load paths
+   (Thanks to Derrell Piper)
+ - removed html documentation from distribution (the wiki manual will
+   now be installed)
+ - fixed bug in `reexport' which caused syntax not to be correctly
+   reexported
+ - previous assignments to a toplevel variable that are separated by
+   side effect free expressions are removed
+ - fixed windows version of `find-files' (thanks to Jim Ursetto)
+ - documentation for extensions is not installed automatically by
+   `chicken-install' anymore
 -
 -4.3.2
 -
+ - changed binary version from "4" to "5", because the new runtime
+   libraries are not binary-compatible with previous releases; this
+   means all eggs have to be reinstalled and existing programs be
+   recompiled!
+ - added unboxing pass to compiler which results in partially dramatical
+   performance improvements for unsafe floating-point-intensive code;
+   unboxing is enabled on optimization levels 4 and 5
+ - removed rest-argument-vector optimization as it could conflict
+   with inlining (thanks to Sven Hartrumpf)
 -- added `slatex' to tests
+ - renamed `pointer-offset' to `pointer+' and deprecated `pointer-offset'
+ - toplevel assignments that have no other side-effects can be eliminated
+   if it can be shown that the value is not used (the compiler will
+   generate a warning in this case)
+ - removed deprecated `-quiet' option in `chicken' program
+ - removed deprecated `run-time-macros' declaration
+ - removed deprecated `-v2' and `-v3' options in `csc' program
+ - removed deprecated `list-of' function (it is exclusively available
+   as `list-of?' now)
+ - removed deprecated `stat-...' functions in posix library unit
+ - removed deprecated `for-each-line' and `for-each-argv-line' procedures
+   in utils library unit
 -
 -4.3.1
 -
+ - added `fpinteger?' and `fpabs'
 -- fixes in types.db by Jim Ursetto
 -- `move-memory!' catches negative offsets now (Thanks to Jim Ursetto)
+ - deprecated `define-compiled-syntax'
+ - added new floating-point primitives `fpsin', `fpcos', `fptan',
+   `fpasin', `fpacos', `fpatan', `fpatan2', `fpexp', `fplog', 
+   `fpexpt' and `fpsqrt'
 -- heavy cleanup of floating math functions which gives much better performance
++- heavy cleanup of floating math functions which gives much better performance,
++  especially for code compiled in unsafe mode
+ - calling `assert' with a single argument shows the tested expression
+   on failure
++- various bugfixes and cleaning up
+ 
  4.3.0
  
 +- fixed bug in `move-memory!' that caused negative offsets to be accepted
 +  (thanks to Jim Ursetto)
  - removed tracing facility and apply-hook (see the "trace" egg
    for a replacement for tracing and breakpoints)
  - chicken-install(1): renamed `-host-extension' option to `-host'
diff --cc buildversion
index 6b7ff8b9,4b8dea47..7e7f33c2
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.3.0rc1
 -4.3.7
++4.3.7
diff --cc lolevel.scm
index 925448ad,fa0445f4..ba422395
--- a/lolevel.scm
+++ b/lolevel.scm
@@@ -1,6 -1,6 +1,10 @@@
  ;;;; lolevel.scm - Low-level routines for CHICKEN
  ;
++<<<<<<< HEAD:lolevel.scm
 +; Copyright (c) 2008, The Chicken Team
++=======
+ ; Copyright (c) 2008-2010, The Chicken Team
++>>>>>>> master:lolevel.scm
  ; Copyright (c) 2000-2007, Felix L. Winkelmann
  ; All rights reserved.
  ;
diff --cc manual/Data representation
index 3fff3123,fcbf0772..451ddbcf
--- a/manual/Data representation
+++ b/manual/Data representation
@@@ -1,6 -1,6 +1,7 @@@
+ [[toc:]]
  [[tags: manual]]
  
 +
  == Data representation
  
  There exist two different kinds of data objects in the CHICKEN system:
Trap