From f5260cea9cf36aed7cc50aed355ff4c86978abff Mon Sep 17 00:00:00 2001 From: retropikzel Date: Tue, 21 Jul 2026 20:35:05 +0300 Subject: [PATCH] debug: Add procedure debugging tools, lambda-utils: Add new library --- Jenkinsfile | 2 +- retropikzel/debug.scm | 26 ++++- retropikzel/debug.sld | 4 +- retropikzel/debug/VERSION | 2 +- retropikzel/debug/test.scm | 15 +++ retropikzel/lambda-utils.scm | 29 +++++ retropikzel/lambda-utils.sld | 7 ++ retropikzel/lambda-utils/LICENSE | 165 +++++++++++++++++++++++++++++ retropikzel/lambda-utils/README.md | 1 + retropikzel/lambda-utils/VERSION | 1 + retropikzel/lambda-utils/test.scm | 12 +++ retropikzel/tap.scm | 4 +- 12 files changed, 259 insertions(+), 9 deletions(-) create mode 100644 retropikzel/debug/test.scm create mode 100644 retropikzel/lambda-utils.scm create mode 100644 retropikzel/lambda-utils.sld create mode 100644 retropikzel/lambda-utils/LICENSE create mode 100644 retropikzel/lambda-utils/README.md create mode 100644 retropikzel/lambda-utils/VERSION create mode 100644 retropikzel/lambda-utils/test.scm diff --git a/Jenkinsfile b/Jenkinsfile index b9d1ddc..ae91211 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { environment { R6RS_SCHEMES='capyscheme chezscheme guile ikarus ironscheme loko mosh racket sagittarius ypsilon' R7RS_SCHEMES='capyscheme chibi chicken cyclone foment gauche gambit kawa loko meevax mosh racket sagittarius skint stklos tr7 ypsilon' - LIBRARIES='tap junit ctrf mouth string url-encoding leb128 hardware-info' + LIBRARIES='tap junit debug lambda-utils ctrf mouth string url-encoding leb128 hardware-info' } stages { diff --git a/retropikzel/debug.scm b/retropikzel/debug.scm index 4853b9f..884907f 100644 --- a/retropikzel/debug.scm +++ b/retropikzel/debug.scm @@ -1,9 +1,27 @@ +(define print + (lambda args + (map (lambda (item) (display item (current-error-port))) args))) + +(define-syntax debug-display + (syntax-rules () + ((_ obj) + (begin + (print "[DEBUG] " 'obj ": " obj #\newline) + obj)))) + (define-syntax debug (syntax-rules () ((_ obj) (begin - (display 'obj) - (display ": ") - (write obj) - (newline) + (print "[DEBUG] " 'obj ": " obj #\newline) obj)))) + +(define-syntax debug-proc + (syntax-rules () + ((_ proc arg ...) + (begin + (print "[DEBUG] Calling: " 'proc ", arguments: " '(arg ...)) + (let ((result (apply proc (list arg ...)))) + (print ", returned: " result #\newline) + result))))) + diff --git a/retropikzel/debug.sld b/retropikzel/debug.sld index bd09648..ebe5efa 100644 --- a/retropikzel/debug.sld +++ b/retropikzel/debug.sld @@ -2,5 +2,7 @@ (retropikzel debug) (import (scheme base) (scheme write)) - (export debug) + (export debug + debug-display + debug-proc) (include "debug.scm")) diff --git a/retropikzel/debug/VERSION b/retropikzel/debug/VERSION index 3eefcb9..9084fa2 100644 --- a/retropikzel/debug/VERSION +++ b/retropikzel/debug/VERSION @@ -1 +1 @@ -1.0.0 +1.1.0 diff --git a/retropikzel/debug/test.scm b/retropikzel/debug/test.scm new file mode 100644 index 0000000..eb79140 --- /dev/null +++ b/retropikzel/debug/test.scm @@ -0,0 +1,15 @@ +(test-begin "debug") + +(debug 'lol) +(debug-display 'lol) + +(define someval 123) +(debug someval) +(debug-display someval) + +(define (plus a b) (+ a b)) +(debug plus) +(debug-display plus) +(debug-proc plus 1 2) + +(test-end "debug") diff --git a/retropikzel/lambda-utils.scm b/retropikzel/lambda-utils.scm new file mode 100644 index 0000000..c08507e --- /dev/null +++ b/retropikzel/lambda-utils.scm @@ -0,0 +1,29 @@ +(define-syntax default-lambda + (syntax-rules () + ((_ ((arg default) ...) body ...) + (lambda args + (let ((arg default) ...) + (for-each + (lambda (item) + (when (equal? (car item) 'arg) (set! arg (cadr item))) ...) + args) + body ...))))) + +(define-syntax default-checked-lambda + (syntax-rules () + ((_ ((arg default check) ...) body ...) + (lambda args + (let ((arg default) ...) + (for-each + (lambda (item) + (when (equal? (car item) 'arg) + (set! arg (cadr item)) + (when (not (check arg)) + (error + (string-append "argument: " + (symbol->string 'arg) + ", failed check: " + (symbol->string 'check))))) + ...) + args) + body ...))))) diff --git a/retropikzel/lambda-utils.sld b/retropikzel/lambda-utils.sld new file mode 100644 index 0000000..1e45332 --- /dev/null +++ b/retropikzel/lambda-utils.sld @@ -0,0 +1,7 @@ +(define-library + (retropikzel lambda-utils) + (import (scheme base)) + (export default-lambda + default-checked-lambda) + (include "lambda-utils.scm")) + diff --git a/retropikzel/lambda-utils/LICENSE b/retropikzel/lambda-utils/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/retropikzel/lambda-utils/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/retropikzel/lambda-utils/README.md b/retropikzel/lambda-utils/README.md new file mode 100644 index 0000000..00d7bdd --- /dev/null +++ b/retropikzel/lambda-utils/README.md @@ -0,0 +1 @@ +WIP diff --git a/retropikzel/lambda-utils/VERSION b/retropikzel/lambda-utils/VERSION new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/retropikzel/lambda-utils/VERSION @@ -0,0 +1 @@ +0.1.0 diff --git a/retropikzel/lambda-utils/test.scm b/retropikzel/lambda-utils/test.scm new file mode 100644 index 0000000..ddc2ae4 --- /dev/null +++ b/retropikzel/lambda-utils/test.scm @@ -0,0 +1,12 @@ + +(test-begin "lambda-utils") + +(define dl (default-lambda ((arg1 #f) (arg2 #f)) arg2)) + +(test-assert (not (dl))) +(test-equal 1 (dl '(arg2 1))) + +(define dcl (default-checked-lambda ((arg1 #f string?) (arg2 #f string?)) arg2)) + +(test-assert (not (dcl))) +(test-equal "hello" (dcl '(arg2 "hello"))) diff --git a/retropikzel/tap.scm b/retropikzel/tap.scm index 8b546a0..870f9fb 100644 --- a/retropikzel/tap.scm +++ b/retropikzel/tap.scm @@ -1,6 +1,6 @@ (define tap-output-port (current-output-port)) -(define (set-tap-runner-output-port! port) - (set! tap-output-port port)) +(define (set-tap-runner-output-port! port) (set! tap-output-port port)) + (define-syntax tap-runner (syntax-rules () ((_)