diff options
| author | EuAndreh <eu@euandre.org> | 2022-05-17 15:41:56 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2022-05-17 15:41:56 -0300 |
| commit | 19ecf3b372a1a60cfafcb73f47a64ec15ed621a3 (patch) | |
| tree | 151bd44b776ecf0c18c088610a1237943fa6aa7f | |
| parent | git mv src/heredoc.scm src/xyz/euandreh/ (diff) | |
| download | guile-heredoc-19ecf3b372a1a60cfafcb73f47a64ec15ed621a3.tar.gz guile-heredoc-19ecf3b372a1a60cfafcb73f47a64ec15ed621a3.tar.xz | |
Update references to src/heredoc.scm
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | src/xyz/euandreh/heredoc.scm | 2 | ||||
| -rw-r--r-- | tests/heredoc.scm | 16 |
4 files changed, 16 insertions, 16 deletions
@@ -1,4 +1,4 @@ /heredoc.log -/src/*.go +*.go /vendor/ /FIXME @@ -21,7 +21,7 @@ OBJDIR = $(LIBDIR)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache $(GUILD) compile -L src/ $(GUILE_FLAGS)-o $@ $< -sources = src/heredoc.scm +sources = src/xyz/euandreh/heredoc.scm objects = $(sources:.scm=.go) @@ -33,18 +33,20 @@ install: all "$(DESTDIR)$(MODDIR)" \ "$(DESTDIR)$(OBJDIR)" for s in $(sources); do \ - cp $$s "$(DESTDIR)$(MODDIR)"; \ + mkdir -p "$(DESTDIR)$(MODDIR)"/`dirname $${s#src/}`; \ + cp $$s "$(DESTDIR)$(MODDIR)"/`dirname $${s#src/}`; \ done for o in $(objects); do \ - cp $$o "$(DESTDIR)$(OBJDIR)"; \ + mkdir -p "$(DESTDIR)$(OBJDIR)"/`dirname $${o#src/}`; \ + cp $$o "$(DESTDIR)$(OBJDIR)"/`dirname $${o#src/}`; \ done uninstall: for s in $(sources); do \ - rm -f "$(DESTDIR)$(MODDIR)/`basename $$s`"; \ + rm -f "$(DESTDIR)$(MODDIR)"/$${s#src/}; \ done for o in $(objects); do \ - rm -f "$(DESTDIR)$(OBJDIR)/`basename $$o`"; \ + rm -f "$(DESTDIR)$(OBJDIR)"/$${o#src/}; \ done check-guile: diff --git a/src/xyz/euandreh/heredoc.scm b/src/xyz/euandreh/heredoc.scm index fb10088..be9408a 100644 --- a/src/xyz/euandreh/heredoc.scm +++ b/src/xyz/euandreh/heredoc.scm @@ -1,4 +1,4 @@ -(define-module (heredoc) +(define-module (xyz euandreh heredoc) #:use-module ((srfi srfi-1) #:prefix s1:) #:export (heredoc-reader)) diff --git a/tests/heredoc.scm b/tests/heredoc.scm index a445ac1..3c0fb7b 100644 --- a/tests/heredoc.scm +++ b/tests/heredoc.scm @@ -1,13 +1,11 @@ (use-modules - (heredoc) + ((xyz euandreh heredoc) #:prefix heredoc:) ((srfi srfi-64) #:prefix t:)) - -(eval-when (expand load eval) - (read-hash-extend #\" heredoc-reader)) +(heredoc:enable-syntax) (define (test-extract-single-line-indentation) (define extract-single-line-indentation - (@@ (heredoc) extract-single-line-indentation)) + (@@ (xyz euandreh heredoc) extract-single-line-indentation)) (t:test-group "extract-single-line-indentation" (t:test-equal '(#nil #f 0) (extract-single-line-indentation @@ -67,7 +65,7 @@ (define (test-extract-line-indentations) (define extract-line-indentations - (@@ (heredoc) extract-line-indentations)) + (@@ (xyz euandreh heredoc) extract-line-indentations)) (t:test-group "extract-line-indentations" (t:test-equal '() (extract-line-indentations @@ -99,7 +97,7 @@ (define (test-maximum-indentation) (define maximum-indentation - (@@ (heredoc) maximum-indentation)) + (@@ (xyz euandreh heredoc) maximum-indentation)) (t:test-group "maximum-indentation" (t:test-equal 0 (maximum-indentation @@ -135,7 +133,7 @@ (define (test-trim-indentation) (define trim-indentation - (@@ (heredoc) trim-indentation)) + (@@ (xyz euandreh heredoc) trim-indentation)) (t:test-group "trim-indentation" (t:test-equal "" (trim-indentation "")) @@ -201,7 +199,7 @@ exit $ret (define (test-non-quote-chars?) (define non-quote-chars? - (@@ (heredoc) non-quote-chars?)) + (@@ (xyz euandreh heredoc) non-quote-chars?)) (t:test-group "non-quote-chars?" (t:test-equal #f (non-quote-chars? |