emacs, branch scratch/timsort Emacs is the extensible, customizable, self-documenting real-time display editor. ; Fix typo 2022-03-18T13:26:54+00:00 Andrew G Cohen 2022-03-18T13:26:54+00:00 ac7d9e02229aa49ea936be5bf000fa015da7931c * test/src/fns-tests.el (fns-tests-sort): Compare with independently sorted list. 
* test/src/fns-tests.el (fns-tests-sort):  Compare with independently
sorted list.
Add another sorting unit test 2022-03-18T13:21:29+00:00 Andrew G Cohen 2022-03-18T13:21:29+00:00 186ec2f8d828559da3d53db9122a0be0848c03c3 * test/src/fns-tests.el (fns-tests-sort): Check for corruption should garbage-collection occur during sorting. 
* test/src/fns-tests.el (fns-tests-sort): Check for corruption should
garbage-collection occur during sorting.
Fix over-zealous assertions 2022-03-17T14:08:24+00:00 Mattias Engdegård 2022-03-17T14:08:24+00:00 43a339fe10df3952a5f1749403d7b8148554008a * src/sort.c (gallop_left, gallop_right): Don't test Lisp values for being nonzero; it only made sense when `key` was a pointer that had to be non-null. 
* src/sort.c (gallop_left, gallop_right): Don't test Lisp values for
being nonzero; it only made sense when `key` was a pointer that had to
be non-null.
; Fix mistake in last commit (use of wrong variable) 2022-03-17T10:27:59+00:00 Mattias Engdegård 2022-03-17T10:27:59+00:00 63c1f0d58d846095eac1bde726e0c72856a9deec 






Resolve sort predicate ahead of time
2022-03-17T09:35:57+00:00

Mattias Engdegård

2022-03-16T16:33:07+00:00

72a313d3922d109a4351a4dec15e903b2a70d0a3

* src/sort.c (tim_sort): If the sort predicate is a symbol, find the
corresponding function before starting the sort.  This is especially
beneficial if the predicate was an alias (`string<`, for example).





* src/sort.c (tim_sort): If the sort predicate is a symbol, find the
corresponding function before starting the sort.  This is especially
beneficial if the predicate was an alias (`string<`, for example).







Add more sorting unit tests
2022-03-17T08:50:11+00:00

Andrew G Cohen

2022-03-17T08:50:11+00:00

8ef42e085be82a88ed01dc449b26f8bc582c149e

* test/src/fns-tests.el (fns-tests-sort): New sorting unit tests.





* test/src/fns-tests.el (fns-tests-sort): New sorting unit tests.







; Minor improvements to timsort
2022-03-16T14:14:24+00:00

Andrew G Cohen

2022-03-16T14:06:49+00:00

9edfa27f9604f197ce47d86dc9ec07f14bfb7dde

* src/fns.c (sort_list, sort_vector): Improve documentation and
variable names.
(merge): Replace function inorder with direct use of call2.
* src/lisp.h: Remove inorder prototype.
* src/sort.c:
(struct reloc): Document the order field.
(inorder): Uppercase INLINE.
(binarysort): Move type declaration.
(needmem): New INLINE function.
(merge_lo, merge_hi): Use it.
(merge_getmem): Remove unnecessary if.
(tim_sort): Remove unnecessary if.
(reverse_vector): Shift instead of integer divide by 2.





* src/fns.c (sort_list, sort_vector): Improve documentation and
variable names.
(merge): Replace function inorder with direct use of call2.
* src/lisp.h: Remove inorder prototype.
* src/sort.c:
(struct reloc): Document the order field.
(inorder): Uppercase INLINE.
(binarysort): Move type declaration.
(needmem): New INLINE function.
(merge_lo, merge_hi): Use it.
(merge_getmem): Remove unnecessary if.
(tim_sort): Remove unnecessary if.
(reverse_vector): Shift instead of integer divide by 2.







Replace list and vector sorting with TIMSORT algorithm
2022-03-11T05:31:32+00:00

Andrew G Cohen

2022-03-10T01:30:00+00:00

e0470bcec76b94f93aed796abdcab14e2086fffc

* src/Makefile.in (base_obj): Add sort.o.
* src/deps.mk (fns.o): Add sort.c.
* src/lisp.h: Add prototypes for inorder, tim_sort.
* src/sort.c: New file providing tim_sort.
* src/fns.c:  Remove prototypes for removed routines.
(merge_vectors, sort_vector_inplace, sort_vector_copy): Remove.
(sort_list, sort_vector): Use tim_sort.





* src/Makefile.in (base_obj): Add sort.o.
* src/deps.mk (fns.o): Add sort.c.
* src/lisp.h: Add prototypes for inorder, tim_sort.
* src/sort.c: New file providing tim_sort.
* src/fns.c:  Remove prototypes for removed routines.
(merge_vectors, sort_vector_inplace, sort_vector_copy): Remove.
(sort_list, sort_vector): Use tim_sort.







Add optional GC marking function to specpdl unwind_ptr record
2022-03-05T10:31:32+00:00

Mattias Engdegård

2022-03-05T10:12:54+00:00

daf46703ce83cc652667e89aa50161a36e9a8575

Add a new `record_unwind_protect_ptr_mark` function for use with C data
structures that use the specpdl for clean-up but also contain possibly
unique references to Lisp objects.

* src/eval.c (record_unwind_protect_ptr_mark): New.
(record_unwind_protect_module, set_unwind_protect_ptr):
Set the mark function to NULL.
(mark_specpdl): Call the mark function if present.
* src/lisp.h (unwind_ptr): Add a mark function pointer to the
SPECPDL_UNWIND_PTR case.





Add a new `record_unwind_protect_ptr_mark` function for use with C data
structures that use the specpdl for clean-up but also contain possibly
unique references to Lisp objects.

* src/eval.c (record_unwind_protect_ptr_mark): New.
(record_unwind_protect_module, set_unwind_protect_ptr):
Set the mark function to NULL.
(mark_specpdl): Call the mark function if present.
* src/lisp.h (unwind_ptr): Add a mark function pointer to the
SPECPDL_UNWIND_PTR case.







Garbage Haiku tooltip frames on size change
2022-03-05T06:24:09+00:00

Po Lu

2022-03-05T06:23:30+00:00

8969953328a6cb5b7f131c2b7441e9d5d21191aa

* haikuterm.c (haiku_read_socket): If tooltip frame dimensions
actually changed, garbage the frame.





* haikuterm.c (haiku_read_socket): If tooltip frame dimensions
actually changed, garbage the frame.