From 940def00921d4c8a8f8586308e51ca0f269f5ea6 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Wed, 9 Sep 2026 17:08:25 +0300 Subject: [PATCH] assert: version 1.0.0 --- Makefile | 39 +++++++++++++++++----------------- retropikzel/assert.sld | 8 +++---- retropikzel/assert/ignore.scm | 4 ++++ retropikzel/assert/ignore.sld | 5 +++++ retropikzel/assert/pass.scm | 1 - retropikzel/assert/pass.sld | 9 -------- retropikzel/assert/warning.scm | 9 ++++++++ retropikzel/assert/warning.sld | 5 +++++ 8 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 retropikzel/assert/ignore.scm create mode 100644 retropikzel/assert/ignore.sld delete mode 100644 retropikzel/assert/pass.scm delete mode 100644 retropikzel/assert/pass.sld create mode 100644 retropikzel/assert/warning.scm create mode 100644 retropikzel/assert/warning.sld diff --git a/Makefile b/Makefile index 7ff47ae..d4e79a8 100644 --- a/Makefile +++ b/Makefile @@ -1,54 +1,53 @@ .POSIX: SCHEME=chibi LIBRARY=tap -LIBRARY_FILE=retropikzel/${LIBRARY}.sld -MAINTAINER=Retropikzel -TESTFILE=retropikzel/${LIBRARY}/test.scm DOCKER_TAG=latest +library_file=retropikzel/${LIBRARY}.sld +testfile=retropikzel/${LIBRARY}/test.scm splitclean=awk -F ':' '{print($$2)}' | tr -d ' ' -VERSION=$$(grep "VERSION:" ${LIBRARY_FILE} | ${splitclean}) -LICENSE=$$(grep "SPDX-License-Identifier:" ${LIBRARY_FILE} | awk -F ":" "{print(\$$2)}" | tr -d ' ') -DESCRIPTION=$$(grep "DESCRIPTION:" ${LIBRARY_FILE} | awk -F ':' '{print($$2)}' | tr -d ' ') -ADDITIONAL_LIBRARIES=$$(grep "ADD_LIBRARIES:" ${LIBRARY_FILE} | awk -F ':' '{print($$2)}' | tr -d ' ' || echo "") +version=$$(grep "Version:" ${library_file} | ${splitclean}) +license=$$(grep "SPDX-License-Identifier:" ${library_file} | awk -F ":" "{print(\$$2)}" | tr -d ' ') +description=$$(grep "Description:" ${library_file} | awk -F ':' '{print($$2)}' | tr -d ' ') +additional_libraries=$$(grep "Additional Libraries:" ${library_file} | awk -F ':' '{print($$2)}' || echo "") -PKG=retropikzel-${LIBRARY}-${VERSION}.tgz +pkg=retropikzel-${LIBRARY}-${version}.tgz debug: - echo "${LICENSE}" + echo "${license}" all: package package: snow-chibi package \ --always-yes \ - --version="${VERSION}" \ + --version="${version}" \ --authors=Retropikzel \ --maintainers=Retropikzel \ - --license="${LICENSE}" \ + --license="${license}" \ --doc-from-scribble=1 \ - --test=${TESTFILE} \ - --description="${DESCRIPTION}" \ - ${LIBRARY_FILE} ${ADDITIONAL_LIBRARIES} + --test=${testfile} \ + --description="${description}" \ + ${library_file} ${additional_libraries} git-index: - snow-chibi git-index ${PKG} + snow-chibi git-index ${pkg} install: - snow-chibi install --impls=${SCHEME} --always-yes --verbose?=1 --skip-tests?=1 ${PKG} + snow-chibi install --impls=${SCHEME} --always-yes --verbose?=1 --skip-tests?=1 ${pkg} test: package - snow-chibi --impls=${SCHEME} test-package ${PKG} + snow-chibi --impls=${SCHEME} test-package ${pkg} test-compile-r7rs: - COMPILE_R7RS=${SCHEME} compile-r7rs -o test-program ${TESTFILE} + COMPILE_R7RS=${SCHEME} compile-r7rs -o test-program ${testfile} ./test-program test-docker: DOCKER_TAG=${DOCKER_TAG} \ - SNOW_PACKAGES="retropikzel.tap ${PKG}" \ + SNOW_PACKAGES="retropikzel.tap ${pkg}" \ COMPILE_R7RS=${SCHEME} \ - test-r7rs -o test-program ${TESTFILE} + test-r7rs -o test-program ${testfile} retropikzel/wasm/plus.wat: retropikzel/wasm/plus.c emcc -o retropikzel/wasm/plus.js retropikzel/wasm/plus.c diff --git a/retropikzel/assert.sld b/retropikzel/assert.sld index 68db746..baac642 100644 --- a/retropikzel/assert.sld +++ b/retropikzel/assert.sld @@ -1,7 +1,7 @@ -;; SPDX-License-Identifier: LGPL -;; VERSION: 0.1.0 -;; DESCRIPTION: Assert -;; ADDITIONAL_LIBRARIES: retropikzel/assert/pass.sld +;; SPDX-License-Identifier: AGPL-3.0 +;; Version: 1.0.0 +;; Description: Assert +;; Additional Libraries: retropikzel/assert/warning.sld retropikzel/assert/ignore.sld (define-library (retropikzel assert) diff --git a/retropikzel/assert/ignore.scm b/retropikzel/assert/ignore.scm new file mode 100644 index 0000000..5699421 --- /dev/null +++ b/retropikzel/assert/ignore.scm @@ -0,0 +1,4 @@ +(define-syntax assert + (syntax-rules () + ((_ check val err-msg) + (cond-expand (else))))) diff --git a/retropikzel/assert/ignore.sld b/retropikzel/assert/ignore.sld new file mode 100644 index 0000000..5348d12 --- /dev/null +++ b/retropikzel/assert/ignore.sld @@ -0,0 +1,5 @@ +(define-library + (retropikzel assert ignore) + (import (scheme base)) + (export assert) + (include "ignore.scm")) diff --git a/retropikzel/assert/pass.scm b/retropikzel/assert/pass.scm deleted file mode 100644 index 1ef8905..0000000 --- a/retropikzel/assert/pass.scm +++ /dev/null @@ -1 +0,0 @@ -(define-syntax assert (syntax-rules () ((_ check val err-msg) #t))) diff --git a/retropikzel/assert/pass.sld b/retropikzel/assert/pass.sld deleted file mode 100644 index 4b52f69..0000000 --- a/retropikzel/assert/pass.sld +++ /dev/null @@ -1,9 +0,0 @@ -;; SPDX-License-Identifier: LGPL -;; VERSION: 0.1.0 -;; DESCRIPTION: Assert passtrough - -(define-library - (retropikzel assert pass) - (import (scheme base)) - (export assert) - (include "pass.scm")) diff --git a/retropikzel/assert/warning.scm b/retropikzel/assert/warning.scm new file mode 100644 index 0000000..392a387 --- /dev/null +++ b/retropikzel/assert/warning.scm @@ -0,0 +1,9 @@ +(define-syntax assert + (syntax-rules () + ((_ check val err-msg) + (unless (check val) + (display "WARNING: " (current-error-port)) + (display err-msg (current-error-port)) + (display ", val: " (current-error-port)) + (write val (current-error-port)) + (newline (current-error-port)))))) diff --git a/retropikzel/assert/warning.sld b/retropikzel/assert/warning.sld new file mode 100644 index 0000000..f5fc4c0 --- /dev/null +++ b/retropikzel/assert/warning.sld @@ -0,0 +1,5 @@ +(define-library + (retropikzel assert warning) + (import (scheme base)) + (export assert) + (include "warning.scm"))