summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.dir-locals.el2
-rw-r--r--manifest.scm24
-rwxr-xr-xsrc/ull (renamed from src/gscc)6
3 files changed, 22 insertions, 10 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index cb836da..ba479e9 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,4 +1,4 @@
;;; Directory Local Variables -*- no-byte-compile: t -*-
;;; For more information see (info "(emacs) Directory Variables")
-((scheme-mode . ((compile-command . "guix shell -m manifest.scm -- ./writing-a-c-compiler-tests/test_compiler ./src/gscc --chapter 1 --stage lex"))))
+((scheme-mode . ((compile-command . "guix shell -m manifest.scm -- ./writing-a-c-compiler-tests/test_compiler ./src/ull --chapter 1 --stage lex"))))
diff --git a/manifest.scm b/manifest.scm
index 8d1b86e..54ab185 100644
--- a/manifest.scm
+++ b/manifest.scm
@@ -1,6 +1,18 @@
-(specifications->manifest
- '(
- "gcc-toolchain"
- "guile"
- "python"
- ))
+(use-modules (gnu packages bison)
+ (gnu packages flex)
+ (gnu packages commencement)
+ (gnu packages base)
+ (gnu packages python)
+ (gnu packages guile)
+ (gnu packages pkg-config))
+
+(packages->manifest
+ (list
+ bison
+ flex
+ gcc-toolchain
+ gnu-make
+ guile-next
+ pkg-config
+ python
+ ))
diff --git a/src/gscc b/src/ull
index 41cbbed..f878c4e 100755
--- a/src/gscc
+++ b/src/ull
@@ -19,7 +19,7 @@
(define (error message)
(display (string-concatenate `(,message "
Usage:
- gscc [OPTIONS] file
+ ull [OPTIONS] file
Options:
--version, -v: print version information
--debug, -d: turn on verbose output
@@ -70,7 +70,7 @@ Returns #f on a failure, #t on a success."
(zero? (system (string-concatenate `("gcc " ,src " -o " ,dest)))))
(define (main args)
- "Entry point for the gscc. Handles user args and performs initial validity check."
+ "Entry point for ull. Handles user args and performs initial validity check."
(let* ((option-spec
'((version (single-char #\v) (value #f))
(debug (single-char #\d) (value #f))
@@ -83,7 +83,7 @@ Returns #f on a failure, #t on a success."
(file (if (null? rest) #f (car rest))))
(cond
((option-ref options 'version #f)
- (display (string-concatenate `("gscc (the 'Guile Scheme C Compiler', " ,version ")\n"))))
+ (display (string-concatenate `("ull (" ,version ")\n"))))
((not (equal? 1 (length rest))) (error "Wrong number of arguments."))
((or (not file)
(not (access? file R_OK))