cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[Git][cmucl/cmucl][issue-240-set-diff-with-hash-table] Refactoring of list to hashtable to its own function
by Raymond Toy (＠rtoy) 14 Jun '23

14 Jun '23

Raymond Toy pushed to branch issue-240-set-diff-with-hash-table at cmucl / cmucl Commits: 5e47bcfc by Raymond Toy at 2023-06-14T09:08:48-07:00 Refactoring of list to hashtable to its own function Move the code for converting a list to a hash table to its own function. Also support using a key function. Update set-difference to use this new function. - - - - - 1 changed file: - src/code/list.lisp Changes: ===================================== src/code/list.lisp ===================================== @@ -745,6 +745,41 @@ (cons item list))) +;; Convert a list to a hashtable. Given 2 lists, find the shorter of +;; the two lists and add the shorter list to a hashtable. +(defun list-to-hashtable (list1 list2 &key test test-not key) + ;; Don't currently support test-not when converting a list to a hashtable + (unless test-not + (let ((hash-test (let ((test-fn (if (and (symbolp test) + (fboundp test)) + (fdefinition test) + test))) + (cond ((eql test-fn #'eq) 'eq) + ((eql test-fn #'eql) 'eql) + ((eql test-fn #'equal) 'equal) + ((eql test-fn #'equalp) 'equalp))))) + (unless hash-test + (return-from list-to-hashtable (values nil nil))) + (multiple-value-bind (len shorter-list) + (do ((length 0 (1+ length)) + (l1 list1 (cdr l1)) + (l2 list2 (cdr l2))) + ((cond ((null l1) + (return (values length list1))) + ((null l2) + (return (values length list2)))))) + (when (< len 15) + (return-from list-to-hashtable (values nil nil))) + (flet ((build-hash (len list) + (let ((hashtable (make-hash-table :test test :size len))) + (dolist (item list) + (setf (gethash (apply-key key item) hashtable) item)) + hashtable))) + (cond ((eq shorter-list list2) + (values (build-hash len list2) list2)) + ((eq shorter-list list1) + (values (build-hash len list1) list1)))))))) + ;;; UNION -- Public. ;;; ;;; This function assumes list2 is the result, adding to it from list1 as @@ -812,53 +847,37 @@ (setq list1 (Cdr list1)))) res)) -(defun set-difference (list1 list2 &key key - (test #'eql testp) (test-not nil notp)) +(defun set-difference (list1 list2 &key key (test #'eql testp) (test-not nil notp)) "Returns the elements of list1 which are not in list2." (declare (inline member)) (if (and testp notp) (error "Test and test-not both supplied.")) - (flet ((default-impl (list1 list2) - (if (null list2) + (multiple-value-bind (hashtable shorter-list) + (list-to-hashtable list1 list2 :key key :test test :test-not test-not) + (cond ((null hashtable) + ;; Default implementation because we didn't create the hash + ;; table. + (if (null list2) list1 (let ((res nil)) (dolist (elt list1) (if (not (with-set-keys (member (apply-key key elt) list2))) (push elt res))) - res)))) - (cond ((and testp (null key) - (member test (list #'eq #'eql #'equal #'equalp))) - (multiple-value-bind (len shorter-list) - (do ((length 0 (1+ length)) - (l1 list1 (cdr l1)) - (l2 list2 (cdr l2))) - ((cond ((null l1) - (return (values length list1))) - ((null l2) - (return (values length list2)))))) - (when (< len 20) - (return-from set-difference (default-impl list1 list2))) - (flet ((build-hash (len list) - (let ((hashtable (make-hash-table :test test :size len))) - (dolist (item list) - (setf (gethash item hashtable) t)) - hashtable))) - (cond ((eq shorter-list list2) - (let ((hashtable (build-hash len list2)) - diff) - (dolist (item list1) - (unless (gethash item hashtable) - (push item diff))) - diff)) - ((eq shorter-list list1) - (let ((hashtable (build-hash len list1))) - (dolist (item list2) - (when (gethash item hashtable) - (remhash item hashtable))) - (loop for item being the hash-keys of hashtable - collect item))))))) - (t - (default-impl list1 list2))))) + res))) + ((eq shorter-list list2) + ;; list2 was placed in hash table. + (let (diff) + (dolist (item list1) + (unless (gethash (apply-key key item) hashtable) + (push item diff))) + diff)) + ((eq shorter-list list1) + ;; list1 was placed in the hash table. + (dolist (item list2) + (when (gethash (apply-key key item) hashtable) + (remhash item hashtable))) + (loop for item being the hash-values of hashtable + collect item))))) (defun nset-difference (list1 list2 &key key View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5e47bcfc5129d5d7b47b110… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5e47bcfc5129d5d7b47b110… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-240-set-diff-with-hash-table
by Raymond Toy (＠rtoy) 13 Jun '23

13 Jun '23

Raymond Toy pushed new branch issue-240-set-diff-with-hash-table at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-240-set-diff-with-h… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] make the additional command part of a single command line invocation
by Jon Boone (＠jboone) 08 Jun '23

08 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 11ec47e8 by Jon Boone at 2023-06-07T22:33:48-04:00 make the additional command part of a single command line invocation - - - - - 1 changed file: - src/lisp/GNUmakefile Changes: ===================================== src/lisp/GNUmakefile ===================================== @@ -106,7 +106,7 @@ LOCALE_DIRS = $(patsubst %, i18n/locale/%/LC_MESSAGES, $(LOCALES)) # FreeBSD, it moves the line to after the Language-Team line. This # makes things messy. Hence, sort and diff. translations: - echo "making translations" + echo "making translations"; \ for pot in ../../src/i18n/locale/*.pot; do \ for po in $(LOCALE_DIRS); do \ d=`dirname $$pot`; \ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/11ec47e882e6c08e12a47a7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/11ec47e882e6c08e12a47a7… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] adds translations diagnostic ouput to GNUmakefile
by Jon Boone (＠jboone) 08 Jun '23

08 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: cb69ee79 by Jon Boone at 2023-06-07T22:21:17-04:00 adds translations diagnostic ouput to GNUmakefile - - - - - 1 changed file: - src/lisp/GNUmakefile Changes: ===================================== src/lisp/GNUmakefile ===================================== @@ -106,6 +106,7 @@ LOCALE_DIRS = $(patsubst %, i18n/locale/%/LC_MESSAGES, $(LOCALES)) # FreeBSD, it moves the line to after the Language-Team line. This # makes things messy. Hence, sort and diff. translations: + echo "making translations" for pot in ../../src/i18n/locale/*.pot; do \ for po in $(LOCALE_DIRS); do \ d=`dirname $$pot`; \ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/cb69ee793b7eb1c1e0842b5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/cb69ee793b7eb1c1e0842b5… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] adding diagnostic message about POT
by Jon Boone (＠jboone) 08 Jun '23

08 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: c24b478b by Jon Boone at 2023-06-07T21:14:45-04:00 adding diagnostic message about POT - - - - - 1 changed file: - bin/build.sh Changes: ===================================== bin/build.sh ===================================== @@ -246,6 +246,7 @@ if [ "${BUILD_POT}" = "yes" ]; then fi BUILD=3 +echo "MAKE_TARGET = ${MAKE_TARGET}" buildit # Asdf and friends are part of the base install, so we need to build View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c24b478baec3bde7afc58e6… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c24b478baec3bde7afc58e6… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] revert to using clang, but leave the option to not use it
by Jon Boone (＠jboone) 08 Jun '23

08 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: c2a36a08 by Jon Boone at 2023-06-07T21:08:55-04:00 revert to using clang, but leave the option to not use it - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -46,8 +46,8 @@ linux:build: #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp # Regular build using the cross-compiled result or snapshot - ls -laR snapshot/lib/cmucl/lib/locale - # - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp - - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp + - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp + # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - ls -laR linux-4/i18n/locale - bin/make-dist.sh -I dist linux-4 - ls -laR dist/lib/cmucl/lib/locale View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c2a36a0827e245984341dea… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c2a36a0827e245984341dea… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] trying to build on linux w/out clang
by Jon Boone (＠jboone) 07 Jun '23

07 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 48f51460 by Jon Boone at 2023-06-07T17:26:08-04:00 trying to build on linux w/out clang - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -46,7 +46,8 @@ linux:build: #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp # Regular build using the cross-compiled result or snapshot - ls -laR snapshot/lib/cmucl/lib/locale - - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp + # - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp + - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - ls -laR linux-4/i18n/locale - bin/make-dist.sh -I dist linux-4 - ls -laR dist/lib/cmucl/lib/locale View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/48f51460d25f08e14736827… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/48f51460d25f08e14736827… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] additional check for locale files in linux:install job snapshot
by Jon Boone (＠jboone) 07 Jun '23

07 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 2e26de40 by Jon Boone at 2023-06-06T22:04:56-04:00 additional check for locale files in linux:install job snapshot - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -45,6 +45,7 @@ linux:build: #- bin/create-target.sh xcross x86_linux_clang #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp # Regular build using the cross-compiled result or snapshot + - ls -laR snapshot/lib/cmucl/lib/locale - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp - ls -laR linux-4/i18n/locale - bin/make-dist.sh -I dist linux-4 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2e26de4020276d07178597b… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2e26de4020276d07178597b… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] add additional checks to the linux:build task
by Jon Boone (＠jboone) 07 Jun '23

07 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 418dca5a by Jon Boone at 2023-06-06T21:54:38-04:00 add additional checks to the linux:build task - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -46,7 +46,9 @@ linux:build: #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp # Regular build using the cross-compiled result or snapshot - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp + - ls -laR linux-4/i18n/locale - bin/make-dist.sh -I dist linux-4 + - ls -laR dist/lib/cmucl/lib/locale linux:test: stage: test View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/418dca5ac3937ad496e20c7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/418dca5ac3937ad496e20c7… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-154-piglatin-translation-doesnt-work-anymore] add recursive listing of locale directories to test for files
by Jon Boone (＠jboone) 07 Jun '23

07 Jun '23

Jon Boone pushed to branch issue-154-piglatin-translation-doesnt-work-anymore at cmucl / cmucl Commits: 9ce6e5c4 by Jon Boone at 2023-06-06T21:35:40-04:00 add recursive listing of locale directories to test for files - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -61,6 +61,7 @@ linux:test: - job: linux:build artifacts: true script: + - ls -laR dist/lib/cmucl/lib/locale/ - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log linux:ansi-test: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9ce6e5c475401d2f9953eaa… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9ce6e5c475401d2f9953eaa… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs