diff --git a/Jenkinsfile b/Jenkinsfile index f705003..852bbee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,7 +98,7 @@ pipeline { sh 'find . -name "*.so" -delete' sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh ' ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.term.ansi.sld && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.test.sld' + sh ' ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.term.ansi.sld && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.test.sld' sh 'csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests.scm && ./r7rs-test && rm r7rs-test' sh 'for f in *.log; do cp -- "$f" "reports/chicken-$f"; done' sh 'ls reports' @@ -259,7 +259,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'kawa --r7rs -Dkawa.import.path=..:../snow:*.sld:./snow/chibi/*.sld:./snow/chibi/term/*.sld r7rs-tests.scm' + sh 'kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/kawa-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' @@ -387,7 +387,7 @@ pipeline { sh 'find . -name "*.o" -delete' sh 'find . -name "*.o" -delete' - sh 'stklos -I . r7rs-tests.scm' + sh 'stklos -I ./snow r7rs-tests.scm' sh 'for f in *.log; do cp -- "$f" "reports/stklos-$f"; done' sh 'ls reports' stash name: 'reports', includes: 'reports/*' diff --git a/Makefile b/Makefile index 8900b5d..34f5455 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ test-chibi-r7rs-test: test-chicken-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.term.ansi.sld && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J snow.chibi.test.sld" + docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && ls && cp snow/chibi/term/ansi.sld snow.chibi.term.ansi.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.term.ansi.sld && cp snow/chibi/optional.sld snow.chibi.optional.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.optional.sld && cp snow/chibi/diff.sld snow.chibi.diff.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.diff.sld && cp snow/chibi/test.sld snow.chibi.test.sld && csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J snow.chibi.test.sld" docker run -it -v ${PWD}:/workdir:z schemers/chicken bash -c "cd workdir && csc -include-path ./snow/chibi -X r7rs -R r7rs r7rs-tests.scm && ./r7rs-test && rm r7rs-test" @@ -30,7 +30,7 @@ test-guile-r7rs-test: test-kawa-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/kawa bash -c "cd workdir && kawa --r7rs -Dkawa.import.path=..:../snow:*.sld:./snow/chibi/*.sld:./snow/chibi/term/*.sld r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/kawa bash -c "cd workdir && kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld r7rs-tests.scm" test-loko-r7rs-test: @@ -50,7 +50,7 @@ test-sagittarius-r7rs-test: test-stklos-r7rs-test: - docker run -it -v ${PWD}:/workdir:z schemers/stklos bash -c "cd workdir && stklos -I . r7rs-tests.scm" + docker run -it -v ${PWD}:/workdir:z schemers/stklos bash -c "cd workdir && stklos -I ./snow r7rs-tests.scm" test-skint-r7rs-test: diff --git a/chibi.term.ansi.import.scm b/chibi.term.ansi.import.scm new file mode 100644 index 0000000..3be3793 --- /dev/null +++ b/chibi.term.ansi.import.scm @@ -0,0 +1,110 @@ +;;;; chibi.term.ansi.import.scm - GENERATED BY CHICKEN 5.4.0 -*- Scheme -*- + +(##sys#with-environment + (lambda () + (scheme#eval + '(import-syntax + (only r7rs + begin + cond-expand + export + import + import-for-syntax + include + include-ci + syntax-rules) + scheme.base + scheme.write + scheme.process-context)) + (import + (only r7rs + begin + cond-expand + export + import + import-for-syntax + include + include-ci + syntax-rules)) + (##sys#register-compiled-module + 'chibi.term.ansi + 'chibi.term.ansi + (scheme#list + '(make-wrap-procedure . chibi.term.ansi#make-wrap-procedure) + '(make-simple-escape-procedure + . + chibi.term.ansi#make-simple-escape-procedure)) + '((black-escape . chibi.term.ansi#black-escape) + (red-escape . chibi.term.ansi#red-escape) + (yellow-escape . chibi.term.ansi#yellow-escape) + (green-escape . chibi.term.ansi#green-escape) + (blue-escape . chibi.term.ansi#blue-escape) + (cyan-escape . chibi.term.ansi#cyan-escape) + (magenta-escape . chibi.term.ansi#magenta-escape) + (white-escape . chibi.term.ansi#white-escape) + (rgb-escape . chibi.term.ansi#rgb-escape) + (gray-escape . chibi.term.ansi#gray-escape) + (rgb24-escape . chibi.term.ansi#rgb24-escape) + (reset-color-escape . chibi.term.ansi#reset-color-escape) + (black-background-escape . chibi.term.ansi#black-background-escape) + (red-background-escape . chibi.term.ansi#red-background-escape) + (yellow-background-escape . chibi.term.ansi#yellow-background-escape) + (green-background-escape . chibi.term.ansi#green-background-escape) + (blue-background-escape . chibi.term.ansi#blue-background-escape) + (cyan-background-escape . chibi.term.ansi#cyan-background-escape) + (magenta-background-escape . chibi.term.ansi#magenta-background-escape) + (white-background-escape . chibi.term.ansi#white-background-escape) + (rgb-background-escape . chibi.term.ansi#rgb-background-escape) + (gray-background-escape . chibi.term.ansi#gray-background-escape) + (rgb24-background-escape . chibi.term.ansi#rgb24-background-escape) + (reset-background-color-escape + . + chibi.term.ansi#reset-background-color-escape) + (black . chibi.term.ansi#black) + (red . chibi.term.ansi#red) + (yellow . chibi.term.ansi#yellow) + (green . chibi.term.ansi#green) + (blue . chibi.term.ansi#blue) + (cyan . chibi.term.ansi#cyan) + (magenta . chibi.term.ansi#magenta) + (white . chibi.term.ansi#white) + (black-background . chibi.term.ansi#black-background) + (red-background . chibi.term.ansi#red-background) + (yellow-background . chibi.term.ansi#yellow-background) + (green-background . chibi.term.ansi#green-background) + (blue-background . chibi.term.ansi#blue-background) + (cyan-background . chibi.term.ansi#cyan-background) + (magenta-background . chibi.term.ansi#magenta-background) + (white-background . chibi.term.ansi#white-background) + (bold . chibi.term.ansi#bold) + (underline . chibi.term.ansi#underline) + (negative . chibi.term.ansi#negative) + (italic . chibi.term.ansi#italic) + (strikethrough . chibi.term.ansi#strikethrough) + (rgb . chibi.term.ansi#rgb) + (rgb-background . chibi.term.ansi#rgb-background) + (gray . chibi.term.ansi#gray) + (gray-background . chibi.term.ansi#gray-background) + (rgb24 . chibi.term.ansi#rgb24) + (rgb24-background . chibi.term.ansi#rgb24-background) + (bold-escape . chibi.term.ansi#bold-escape) + (reset-bold-escape . chibi.term.ansi#reset-bold-escape) + (underline-escape . chibi.term.ansi#underline-escape) + (reset-underline-escape . chibi.term.ansi#reset-underline-escape) + (negative-escape . chibi.term.ansi#negative-escape) + (reset-negative-escape . chibi.term.ansi#reset-negative-escape) + (italic-escape . chibi.term.ansi#italic-escape) + (reset-italic-escape . chibi.term.ansi#reset-italic-escape) + (strikethrough-escape . chibi.term.ansi#strikethrough-escape) + (reset-strikethrough-escape + . + chibi.term.ansi#reset-strikethrough-escape) + (ansi-escapes-enabled? . chibi.term.ansi#ansi-escapes-enabled?)) + (scheme#list + (scheme#cons + '|\x04r7rschibi.term.ansi| + (##sys#er-transformer (##core#lambda (x r c) (##core#undefined))))) + (scheme#list) + (scheme#list)))) + +;; END OF FILE diff --git a/implementations.scm b/implementations.scm index 11975dc..272f6ed 100644 --- a/implementations.scm +++ b/implementations.scm @@ -3,7 +3,7 @@ '(((name . chibi) (command . "chibi-scheme -I ./snow/chibi")) ((name . chicken) (command . "csc -include-path ./snow/chibi -X r7rs -R r7rs") - (library-command . "csc -include-path ./snow/chibi -X r7rs -R r7rs -s -J")) + (library-command . "csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J")) ((name . cyclone) (command . "cyclone -A .") (library-command . "cyclone -A .")) @@ -12,7 +12,7 @@ (library-command . "gsc .")) ((name . gauche) (command . "gosh -r7 -A ./snow")) ((name . guile) (command . "guile --fresh-auto-compile --r7rs -L . -L ./snow")) - ((name . kawa) (command . "kawa --r7rs -Dkawa.import.path=..:../snow:*.sld:./snow/chibi/*.sld:./snow/chibi/term/*.sld")) + ((name . kawa) (command . "kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld")) ((name . loko) (docker-image . "schemers/loko:head") (command . "LOKO_LIBRARY_PATH=./snow loko -std=r7rs --compile") @@ -20,6 +20,6 @@ (library-command . "ls")) ((name . mit-scheme) (command . "mit-scheme --load")) ((name . sagittarius) (command . "sash -r7 -L ./snow")) - ((name . stklos) (command . "stklos -I .")) + ((name . stklos) (command . "stklos -I ./snow")) ((name . skint) (command . "skint --program")) ((name . tr7) (command . "tr7i"))))