Some fixes #31
3
Makefile
3
Makefile
@@ -90,7 +90,8 @@ sextest: $(EGGS_STAMP)
|
|||||||
$(MAKE) -C ./tools/sextest sextest
|
$(MAKE) -C ./tools/sextest sextest
|
||||||
cp ./tools/sextest/sextest .
|
cp ./tools/sextest/sextest .
|
||||||
|
|
||||||
SEX_TEST_PROGRAMS = hello-world lists comments unicode serialize features
|
SEX_TEST_PROGRAMS = hello-world lists comments unicode serialize features \
|
||||||
|
feature-flags
|
||||||
|
|
||||||
# Multi-module linking is checked end to end; see tests/modules/Makefile.
|
# Multi-module linking is checked end to end; see tests/modules/Makefile.
|
||||||
check-modules: sexc
|
check-modules: sexc
|
||||||
|
|||||||
@@ -135,9 +135,6 @@ forms, and what remains."
|
|||||||
(car type)
|
(car type)
|
||||||
type))
|
type))
|
||||||
|
|
||||||
(define (comment-form? f)
|
|
||||||
(and (pair? f) (eq? (car f) 'comment)))
|
|
||||||
|
|
||||||
;;; Strip ;s so ;;; Foo becomes /* Foo */ and not /* ;; Foo */
|
;;; Strip ;s so ;;; Foo becomes /* Foo */ and not /* ;; Foo */
|
||||||
(define (strip-comment-marker text)
|
(define (strip-comment-marker text)
|
||||||
(string-trim-both (string-trim text #\;)))
|
(string-trim-both (string-trim text #\;)))
|
||||||
@@ -279,7 +276,7 @@ forms, and what remains."
|
|||||||
;; it's a strong semantic cue
|
;; it's a strong semantic cue
|
||||||
`(%array ,(walk-type (maybe-unwrap-type array-type)))))
|
`(%array ,(walk-type (maybe-unwrap-type array-type)))))
|
||||||
(('fn arglist ret-type)
|
(('fn arglist ret-type)
|
||||||
`(%fun ,(walk-type ret-type) ,(walk-arglist arglist)))
|
`(%fun ,(walk-type ret-type) ,(walk-arg-types arglist)))
|
||||||
(('fn . _)
|
(('fn . _)
|
||||||
(sex-error form "malformed function type" form))
|
(sex-error form "malformed function type" form))
|
||||||
|
|
||||||
@@ -291,8 +288,13 @@ forms, and what remains."
|
|||||||
(else
|
(else
|
||||||
(type-convert-to-c form))))
|
(type-convert-to-c form))))
|
||||||
|
|
||||||
|
;;; An array or a function type
|
||||||
|
(define (structured-type? form)
|
||||||
|
(and (pair? form) (memq (car form) '(¤ fn))))
|
||||||
|
|
||||||
(define (has-pointer-star? form)
|
(define (has-pointer-star? form)
|
||||||
(and (pair? form)
|
(and (pair? form)
|
||||||
|
(not (structured-type? form))
|
||||||
(or (memq '* form)
|
(or (memq '* form)
|
||||||
(any has-pointer-star? (filter pair? form)))))
|
(any has-pointer-star? (filter pair? form)))))
|
||||||
|
|
||||||
@@ -304,6 +306,10 @@ forms, and what remains."
|
|||||||
(and (pair? type)
|
(and (pair? type)
|
||||||
(any has-pointer-star? (filter pair? type))))
|
(any has-pointer-star? (filter pair? type))))
|
||||||
|
|
||||||
|
(define (nested-structured-type type)
|
||||||
|
(and (pair? type)
|
||||||
|
(find structured-type? (filter pair? type))))
|
||||||
|
|
||||||
(define (type-convert-to-c type)
|
(define (type-convert-to-c type)
|
||||||
;; Our pointers to C pointers
|
;; Our pointers to C pointers
|
||||||
;; int -> int
|
;; int -> int
|
||||||
@@ -311,6 +317,12 @@ forms, and what remains."
|
|||||||
;; const * const char -> const char * const
|
;; const * const char -> const char * const
|
||||||
(when (nested-pointer? type)
|
(when (nested-pointer? type)
|
||||||
(sex-error type "pointer chains are written flat, as (* * T), not nested" type))
|
(sex-error type "pointer chains are written flat, as (* * T), not nested" type))
|
||||||
|
(let ((inner (nested-structured-type type)))
|
||||||
|
(when inner
|
||||||
|
(if (eq? (car inner) 'fn)
|
||||||
|
;; (fn ...) is spelled as the pointer it already is in C
|
||||||
|
(sex-error type "a fn type is a function pointer already: write (fn ...), not (* (fn ...))" type)
|
||||||
|
(sex-error type "a pointer to an array is not supported" type))))
|
||||||
(if (atom? type) (atom-to-fmt-c type)
|
(if (atom? type) (atom-to-fmt-c type)
|
||||||
(flatten
|
(flatten
|
||||||
(tree-map atom-to-fmt-c
|
(tree-map atom-to-fmt-c
|
||||||
@@ -334,26 +346,39 @@ forms, and what remains."
|
|||||||
((¤ * const volatile struct union) #t)
|
((¤ * const volatile struct union) #t)
|
||||||
(else #f)))
|
(else #f)))
|
||||||
|
|
||||||
|
;;; Does the parameter name itself?
|
||||||
|
;;; (f1 float) does
|
||||||
|
;;; (float), (const char) and (¤ float 4) do not
|
||||||
|
(define (named-arg? arg)
|
||||||
|
(and (pair? arg)
|
||||||
|
(pair? (cdr arg)) ; 1 element args are always type
|
||||||
|
(not (eq? (car arg) '¤))
|
||||||
|
(not (is-probably-type arg))))
|
||||||
|
|
||||||
|
;;; The type of one parameter
|
||||||
|
(define (arg-type arg)
|
||||||
|
(if (named-arg? arg)
|
||||||
|
(walk-type (maybe-unwrap-type (cdr arg)))
|
||||||
|
;; A lone type may arrive wrapped in parens of its own, and those
|
||||||
|
;; are not part of it: ((* const char))
|
||||||
|
;; Plain names e.g. (int) are left as is
|
||||||
|
(walk-type (if (and (pair? arg) (null? (cdr arg)) (pair? (car arg)))
|
||||||
|
(car arg)
|
||||||
|
arg))))
|
||||||
|
|
||||||
(define (walk-arglist form)
|
(define (walk-arglist form)
|
||||||
;; E.g.:
|
;; E.g.:
|
||||||
;; ((float) (int) (const char) (* const char) (¤ (* const struct res) 32))
|
;; ((float) (int) (const char) (* const char) (¤ (* const struct res) 32))
|
||||||
;; ((f1 float) (f2 float) (f3 float) (res (¤ float 4)))
|
;; ((f1 float) (f2 float) (f3 float) (res (¤ float 4)))
|
||||||
(map (fn
|
(map (lambda (arg)
|
||||||
(match x
|
(if (named-arg? arg)
|
||||||
(('¤ . _) (walk-type x))
|
(list (arg-type arg) (walk-type (car arg)))
|
||||||
|
(arg-type arg)))
|
||||||
;; yeah shitty, but I don't know yet how to determine if the
|
|
||||||
;; first entry is part of the type and not an argument name
|
|
||||||
;; :(
|
|
||||||
((? is-probably-type) (walk-type x))
|
|
||||||
|
|
||||||
;; 1 element args are always type
|
|
||||||
((_) (walk-type x))
|
|
||||||
|
|
||||||
((var . type) (append (list (walk-type (maybe-unwrap-type type)))
|
|
||||||
(list (walk-type var))))))
|
|
||||||
(remove comment-form? form)))
|
(remove comment-form? form)))
|
||||||
|
|
||||||
|
(define (walk-arg-types form)
|
||||||
|
(map arg-type (remove comment-form? form)))
|
||||||
|
|
||||||
(define (walk-function form)
|
(define (walk-function form)
|
||||||
;; (fn ret-type name arglist body) -> normal function
|
;; (fn ret-type name arglist body) -> normal function
|
||||||
;; (fn ret-type name arglist) -> prototype
|
;; (fn ret-type name arglist) -> prototype
|
||||||
|
|||||||
38
reader.scm
38
reader.scm
@@ -115,6 +115,21 @@
|
|||||||
((eq? tok dot-token) (error "Unexpected ."))
|
((eq? tok dot-token) (error "Unexpected ."))
|
||||||
(else tok))))
|
(else tok))))
|
||||||
|
|
||||||
|
;;; A token that stands for a datum
|
||||||
|
(define (datum-token? tok)
|
||||||
|
(not (or (eof-object? tok)
|
||||||
|
(eq? tok close-paren)
|
||||||
|
(eq? tok close-bracket)
|
||||||
|
(eq? tok dot-token))))
|
||||||
|
|
||||||
|
;;; next-token, sans the comments
|
||||||
|
(define (next-code-token port)
|
||||||
|
(let loop ()
|
||||||
|
(let ((tok (next-token port)))
|
||||||
|
(if (comment-form? tok)
|
||||||
|
(loop)
|
||||||
|
tok))))
|
||||||
|
|
||||||
;;; Read list elements up to close-paren or close-bracket,
|
;;; Read list elements up to close-paren or close-bracket,
|
||||||
;;; honoring dotted-pair notation (a b . c)
|
;;; honoring dotted-pair notation (a b . c)
|
||||||
(define (read-list port closer)
|
(define (read-list port closer)
|
||||||
@@ -208,13 +223,24 @@
|
|||||||
(else (error "Malformed feature expression" test))))
|
(else (error "Malformed feature expression" test))))
|
||||||
|
|
||||||
;;; The #-/#+ preceded datum is always read -- there is no other way
|
;;; The #-/#+ preceded datum is always read -- there is no other way
|
||||||
;;; to know where it ends -- and then either returned or dropped
|
;;; to know where it ends -- and then either returned or dropped. What
|
||||||
|
;;; follows a dropped datum is read in its place: `#+x #+y (a) (b)'
|
||||||
|
;;; with only x is (b).
|
||||||
|
;;;
|
||||||
|
;;; That next thing may be nothing: the end of the file, or the
|
||||||
|
;;; paren closing the list we are in
|
||||||
(define (read-conditional port keep-when)
|
(define (read-conditional port keep-when)
|
||||||
(let ((keep (eq? keep-when (feature-true? (read-datum port)))))
|
(let* ((test (next-code-token port))
|
||||||
(if keep
|
(keep (begin
|
||||||
(read-datum port)
|
(unless (datum-token? test)
|
||||||
(begin (read-datum port)
|
(error "Unexpected end of input in feature expression"))
|
||||||
(next-token port)))))
|
(eq? keep-when (feature-true? test))))
|
||||||
|
(guarded (next-code-token port)))
|
||||||
|
(cond
|
||||||
|
(keep guarded)
|
||||||
|
;; A datum was dropped, so the next one stands in for it
|
||||||
|
((datum-token? guarded) (next-token port))
|
||||||
|
(else guarded))))
|
||||||
|
|
||||||
;;; #t / #true / #f / #false. `val' is the boolean; consume any
|
;;; #t / #true / #f / #false. `val' is the boolean; consume any
|
||||||
;;; trailing name characters and validate
|
;;; trailing name characters and validate
|
||||||
|
|||||||
22
semen.scm
22
semen.scm
@@ -145,9 +145,6 @@
|
|||||||
;;; C code it will be placed as a C commentary just before the function
|
;;; C code it will be placed as a C commentary just before the function
|
||||||
;;; definition (actually that works for all blocky things: enum, struct, union as well).
|
;;; definition (actually that works for all blocky things: enum, struct, union as well).
|
||||||
|
|
||||||
(define (comment-form? f)
|
|
||||||
(and (pair? f) (eq? (car f) 'comment)))
|
|
||||||
|
|
||||||
(define (fn-header-length fn-form)
|
(define (fn-header-length fn-form)
|
||||||
(if (memq (first fn-form) '(pub extern)) 5 4))
|
(if (memq (first fn-form) '(pub extern)) 5 4))
|
||||||
|
|
||||||
@@ -207,21 +204,10 @@
|
|||||||
acc)))
|
acc)))
|
||||||
|
|
||||||
(define (strip-fn-header-comments fn-form)
|
(define (strip-fn-header-comments fn-form)
|
||||||
;; Remove comment forms from the function header
|
;; ([pub|extern] fn name arglist rettype). Comments in the body are
|
||||||
;; ([pub|extern] fn name arglist rettype) so the positional accessors
|
;; left in place as ordinary statements and preserved into the
|
||||||
;; below are not shifted. Comments in the body are left in place as
|
;; generated C.
|
||||||
;; ordinary statements and preserved into the generated C.
|
(strip-header-comments fn-form (fn-header-length fn-form)))
|
||||||
(let ((header-count (fn-header-length fn-form)))
|
|
||||||
;; This always rebuilds the list, so the location has to be carried
|
|
||||||
;; over explicitly -- otherwise every function loses it
|
|
||||||
(copy-form-source!
|
|
||||||
fn-form
|
|
||||||
(let loop ((form fn-form) (kept 0) (acc (list)))
|
|
||||||
(cond
|
|
||||||
((null? form) (reverse acc))
|
|
||||||
((= kept header-count) (append (reverse acc) form))
|
|
||||||
((comment-form? (car form)) (loop (cdr form) kept acc))
|
|
||||||
(else (loop (cdr form) (+ kept 1) (cons (car form) acc))))))))
|
|
||||||
|
|
||||||
(define (process-fn sex-fn-raw acc)
|
(define (process-fn sex-fn-raw acc)
|
||||||
(let-values (((doc sex-fn)
|
(let-values (((doc sex-fn)
|
||||||
|
|||||||
@@ -737,10 +737,13 @@
|
|||||||
(cat (c-type (cadr type) #f)
|
(cat (c-type (cadr type) #f)
|
||||||
" (*" (or name "") ")("
|
" (*" (or name "") ")("
|
||||||
(fmt-join (lambda (x) (c-type x #f)) (caddr type) ", ") ")"))
|
(fmt-join (lambda (x) (c-type x #f)) (caddr type) ", ") ")"))
|
||||||
|
;; MODIFIED FROM UPSTREAM fmt-c: a nameless declarator -- an
|
||||||
|
;; array parameter of a function type, where C has no room
|
||||||
|
;; for a name -- arrives as #f, and upstream printed it
|
||||||
((%array)
|
((%array)
|
||||||
(let ((name (cat name "[" (if (pair? (cddr type))
|
(let ((name (cat (or name "") "[" (if (pair? (cddr type))
|
||||||
(c-expr (caddr type))
|
(c-expr (caddr type))
|
||||||
"")
|
"")
|
||||||
"]")))
|
"]")))
|
||||||
(c-type (cadr type) name)))
|
(c-type (cadr type) name)))
|
||||||
((%pointer *)
|
((%pointer *)
|
||||||
@@ -773,10 +776,13 @@
|
|||||||
(cat (c-type (cadr type) #f)
|
(cat (c-type (cadr type) #f)
|
||||||
" (*" (or name "") ")("
|
" (*" (or name "") ")("
|
||||||
(fmt-join (lambda (x) (c-type x #f)) (caddr type) ", ") ")"))
|
(fmt-join (lambda (x) (c-type x #f)) (caddr type) ", ") ")"))
|
||||||
|
;; MODIFIED FROM UPSTREAM fmt-c: a nameless declarator -- an
|
||||||
|
;; array parameter of a function type, where C has no room
|
||||||
|
;; for a name -- arrives as #f, and upstream printed it
|
||||||
((%array)
|
((%array)
|
||||||
(let ((name (cat name "[" (if (pair? (cddr type))
|
(let ((name (cat (or name "") "[" (if (pair? (cddr type))
|
||||||
(c-expr (caddr type))
|
(c-expr (caddr type))
|
||||||
"")
|
"")
|
||||||
"]")))
|
"]")))
|
||||||
(c-type (cadr type) name)))
|
(c-type (cadr type) name)))
|
||||||
((%pointer *)
|
((%pointer *)
|
||||||
|
|||||||
@@ -26,8 +26,8 @@
|
|||||||
(import scheme
|
(import scheme
|
||||||
(scheme base)
|
(scheme base)
|
||||||
(only sex-macros cat comment)
|
(only sex-macros cat comment)
|
||||||
(only types get-type-info get-fields get-underlying-type
|
(only types get-type-info get-tag-info get-fields
|
||||||
type-match map-fields))
|
get-underlying-type type-match map-fields))
|
||||||
,@body)))
|
,@body)))
|
||||||
|
|
||||||
(define (get-macro name)
|
(define (get-macro name)
|
||||||
|
|||||||
@@ -72,18 +72,19 @@
|
|||||||
(list)
|
(list)
|
||||||
raw-forms)))
|
raw-forms)))
|
||||||
|
|
||||||
(define (public-fn-interface form)
|
(define (public-fn-interface raw-form)
|
||||||
;; (pub fn name args ret . body) -> prototype, keeping a docstring so
|
;; (pub fn name args ret . body) -> prototype, keeping a docstring so
|
||||||
;; the importer can emit it above the declaration
|
;; the importer can emit it above the declaration
|
||||||
(match form
|
(let ((form (strip-header-comments raw-form 5)))
|
||||||
(('pub 'fn name args ret)
|
(match form
|
||||||
form)
|
(('pub 'fn name args ret)
|
||||||
(('pub 'fn name args ret ('comment . _) . rest)
|
form)
|
||||||
(public-fn-interface `(pub fn ,name ,args ,ret ,@rest)))
|
(('pub 'fn name args ret ('comment . _) . rest)
|
||||||
(('pub 'fn name args ret (? string? doc) . _)
|
(public-fn-interface `(pub fn ,name ,args ,ret ,@rest)))
|
||||||
`(pub fn ,name ,args ,ret ,doc))
|
(('pub 'fn name args ret (? string? doc) . _)
|
||||||
(('pub 'fn name args ret . _)
|
`(pub fn ,name ,args ,ret ,doc))
|
||||||
`(pub fn ,name ,args ,ret))))
|
(('pub 'fn name args ret . _)
|
||||||
|
`(pub fn ,name ,args ,ret)))))
|
||||||
|
|
||||||
;;; TODO: use semen facilities to analyze modules
|
;;; TODO: use semen facilities to analyze modules
|
||||||
(define (process-public-interface-form form acc)
|
(define (process-public-interface-form form acc)
|
||||||
@@ -92,8 +93,9 @@
|
|||||||
;; with external linkage
|
;; with external linkage
|
||||||
(('pub 'fn . _)
|
(('pub 'fn . _)
|
||||||
(cons (copy-form-source! form (public-fn-interface form)) acc))
|
(cons (copy-form-source! form (public-fn-interface form)) acc))
|
||||||
(('pub 'var name type . _)
|
(('pub 'var . _)
|
||||||
(cons (copy-form-source! form `(extern var ,name ,type)) acc))
|
(match-let ((('pub 'var name type . _) (strip-header-comments form 4)))
|
||||||
|
(cons (copy-form-source! form `(extern var ,name ,type)) acc)))
|
||||||
(('pub (or 'define 'defmacro 'enum 'import 'include 'struct 'typedef 'union) . _)
|
(('pub (or 'define 'defmacro 'enum 'import 'include 'struct 'typedef 'union) . _)
|
||||||
(cons (copy-form-source! form (cdr form)) acc))
|
(cons (copy-form-source! form (cdr form)) acc))
|
||||||
(('pub . _)
|
(('pub . _)
|
||||||
|
|||||||
@@ -11,6 +11,9 @@
|
|||||||
# It also checks what only a second translation unit can check: that an
|
# It also checks what only a second translation unit can check: that an
|
||||||
# imported type reaches the type database, by expanding a macro that
|
# imported type reaches the type database, by expanding a macro that
|
||||||
# reads the imported struct's fields.
|
# reads the imported struct's fields.
|
||||||
|
#
|
||||||
|
# The public forms carry comments in their headers, which the reduction
|
||||||
|
# to a prototype and to an extern both have to look past.
|
||||||
|
|
||||||
SEXC ?= ../../sexc
|
SEXC ?= ../../sexc
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,11 @@
|
|||||||
|
|
||||||
(include stdio.h)
|
(include stdio.h)
|
||||||
|
|
||||||
(pub var greet-count int 0)
|
(pub var greet-count ;; a comment in the header of a public form is
|
||||||
|
;; not part of it: what the importer is given has
|
||||||
|
;; to be `extern int greet-count', not a form
|
||||||
|
;; counted off by one
|
||||||
|
int 0)
|
||||||
|
|
||||||
(pub struct greeting
|
(pub struct greeting
|
||||||
"A greeting to print."
|
"A greeting to print."
|
||||||
@@ -25,7 +29,8 @@
|
|||||||
(lambda (name field-type)
|
(lambda (name field-type)
|
||||||
`(printf "%s " ,(symbol->string name))))))
|
`(printf "%s " ,(symbol->string name))))))
|
||||||
|
|
||||||
(pub fn greet ((name (* const char))) void
|
(pub fn greet ;; ...and here the prototype would lose its return type
|
||||||
|
((name (* const char))) void
|
||||||
"Print a greeting for NAME."
|
"Print a greeting for NAME."
|
||||||
(++ greet-count)
|
(++ greet-count)
|
||||||
(printf "hello, %s\n" name))
|
(printf "hello, %s\n" name))
|
||||||
|
|||||||
@@ -80,6 +80,22 @@
|
|||||||
;; guards nest
|
;; guards nest
|
||||||
(feature-test '((a)) (x y) "#+x #+y (a)")
|
(feature-test '((a)) (x y) "#+x #+y (a)")
|
||||||
(feature-test '((b)) (x) "#+x #+y (a) (b)")
|
(feature-test '((b)) (x) "#+x #+y (a) (b)")
|
||||||
|
;; ...and the inner one may leave nothing behind: the end of the
|
||||||
|
;; file, or the paren closing the list, is what the outer one then
|
||||||
|
;; produces, and neither is an error
|
||||||
|
(feature-test '() (x) "#+x #+y (a)")
|
||||||
|
(feature-test '((f)) (x) "(f #+x #+y 1)")
|
||||||
|
(feature-test '((f 2)) (x) "(f #+x #+y 1 2)")
|
||||||
|
(feature-test '((a)) (x) "(a) #+x #+y (b)")
|
||||||
|
|
||||||
|
;; a comment between a guard and the form it guards describes the
|
||||||
|
;; guard. Taking it for the guarded datum would leave the form itself
|
||||||
|
;; unconditional
|
||||||
|
(feature-test '((a)) (x) "#+x ;; why\n (a)")
|
||||||
|
(feature-test '() (y) "#+x ;; why\n (a)")
|
||||||
|
(feature-test '((b)) (y) "#+x ;; why\n (a) (b)")
|
||||||
|
;; a comment after the guarded form is an ordinary form, and stays
|
||||||
|
(feature-test '((comment "; tail")) (y) "#+x (a) ;; tail")
|
||||||
|
|
||||||
;; a feature the program was not given is simply absent
|
;; a feature the program was not given is simply absent
|
||||||
(feature-test '() () "#+anything (a)")
|
(feature-test '() () "#+anything (a)")
|
||||||
|
|||||||
25
tests/sex-programs/feature-flags.sex
Normal file
25
tests/sex-programs/feature-flags.sex
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
(compilation "-f alpha -f beta,gamma --features=delta --no-platform-features")
|
||||||
|
(input)
|
||||||
|
(output "alpha" "beta" "gamma" "delta" "elsewhere")
|
||||||
|
(return 0)
|
||||||
|
|
||||||
|
;;; The flags naming the features, in every spelling sexc takes. This
|
||||||
|
;;; is not pedantry about the command line: sextest reads the program
|
||||||
|
;;; itself and prints the surviving forms to sexc, so a spelling it
|
||||||
|
;;; does not recognise leaves the guards below resolved against the
|
||||||
|
;;; wrong set -- quietly, since the test then checks the output of a
|
||||||
|
;;; program it did not mean to compile.
|
||||||
|
;;;
|
||||||
|
;;; --no-platform-features is what makes `#-unix' true wherever this is
|
||||||
|
;;; compiled, and it has to be honoured on both sides for that to hold.
|
||||||
|
|
||||||
|
(include stdio.h)
|
||||||
|
|
||||||
|
(pub fn main () int
|
||||||
|
#+alpha (puts "alpha")
|
||||||
|
#+beta (puts "beta")
|
||||||
|
#+gamma (puts "gamma")
|
||||||
|
#+delta (puts "delta")
|
||||||
|
#-unix (puts "elsewhere")
|
||||||
|
#+unix (puts "here")
|
||||||
|
(return 0))
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
map-fields
|
map-fields
|
||||||
|
|
||||||
get-type-info
|
get-type-info
|
||||||
|
get-tag-info
|
||||||
get-fields
|
get-fields
|
||||||
get-underlying-type)
|
get-underlying-type)
|
||||||
"../types.scm")
|
"../types.scm")
|
||||||
|
|||||||
@@ -79,6 +79,38 @@
|
|||||||
#f
|
#f
|
||||||
(get-fields 't-u8))
|
(get-fields 't-u8))
|
||||||
|
|
||||||
|
;; C keeps typedefs and ordinary identifiers apart, and the canonical way
|
||||||
|
;; to declare a struct uses both names at once. Neither declaration
|
||||||
|
;; may stand on the other.
|
||||||
|
(add-struct 't-node '(struct t-node ((next (* t-node)) (v int))))
|
||||||
|
(add-typedef 't-node '(typedef t-node (struct t-node)))
|
||||||
|
(test "a typedef of a struct's own name keeps the struct reachable"
|
||||||
|
'((next (* t-node)) (v int))
|
||||||
|
(get-fields 't-node))
|
||||||
|
(test "and the tag is there under its own name"
|
||||||
|
'(struct t-node ((next (* t-node)) (v int)))
|
||||||
|
(get-tag-info 't-node))
|
||||||
|
(add-struct 't-rect '(struct t-rect ((w int) (h int))))
|
||||||
|
(add-define 't-rect '(define t-rect 3))
|
||||||
|
(test "a define of a tag's name does not hide the fields"
|
||||||
|
'((w int) (h int))
|
||||||
|
(get-fields 't-rect))
|
||||||
|
|
||||||
|
;; A type built over a struct is not that struct. Handing back the
|
||||||
|
;; element's fields would have a macro write v->x for an array
|
||||||
|
(add-typedef 't-points '(typedef t-points (¤ t-point 4)))
|
||||||
|
(test "an array of a struct has no fields of its own"
|
||||||
|
#f
|
||||||
|
(get-fields 't-points))
|
||||||
|
(add-typedef 't-point-p '(typedef t-point-p (* t-point)))
|
||||||
|
(test "nor does a pointer to one"
|
||||||
|
#f
|
||||||
|
(get-fields 't-point-p))
|
||||||
|
(add-typedef 't-cb '(typedef t-cb (fn ((t-point)) void)))
|
||||||
|
(test "nor a function type over one"
|
||||||
|
#f
|
||||||
|
(get-fields 't-cb))
|
||||||
|
|
||||||
;; A typedef can be written to lead back to itself. Resolving it must
|
;; A typedef can be written to lead back to itself. Resolving it must
|
||||||
;; stop rather than spin
|
;; stop rather than spin
|
||||||
(add-typedef 't-loop-a '(typedef t-loop-a t-loop-b))
|
(add-typedef 't-loop-a '(typedef t-loop-a t-loop-b))
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
(import scheme
|
(import scheme
|
||||||
|
(scheme base) ; let-values
|
||||||
brev-separate
|
brev-separate
|
||||||
(chicken base)
|
(chicken base)
|
||||||
(chicken file)
|
(chicken file)
|
||||||
@@ -33,27 +34,45 @@
|
|||||||
(cons (list) (list))
|
(cons (list) (list))
|
||||||
contents))
|
contents))
|
||||||
|
|
||||||
;;; --features from the (compilation ...) form, which we have to honour
|
;;; The feature flags of the (compilation ...) form, which we have to
|
||||||
;;; ourselves: the program is read here and printed back out for sexc,
|
;;; honour ourselves: the program is read here and printed back out for
|
||||||
;;; so #+ and #- are resolved on this side
|
;;; sexc, so #+ and #- are resolved on this side.
|
||||||
|
;;;
|
||||||
|
;;; Returns the named features and whether the host's own are in play
|
||||||
(define (compilation-features settings)
|
(define (compilation-features settings)
|
||||||
(let ((compilation (assoc 'compilation settings)))
|
(let ((compilation (assoc 'compilation settings)))
|
||||||
(if compilation
|
(let loop ((flags (if compilation
|
||||||
(append-map (lambda (flag)
|
(string-split (cadr compilation))
|
||||||
(if (string-prefix? "--features=" flag)
|
|
||||||
(map string->symbol
|
|
||||||
(string-split (substring flag 11) ","))
|
|
||||||
(list)))
|
(list)))
|
||||||
(string-split (cadr compilation)))
|
(features (list))
|
||||||
(list))))
|
(platform #t))
|
||||||
|
(define (add names rest)
|
||||||
|
(loop rest
|
||||||
|
(append features (map string->symbol (string-split names ",")))
|
||||||
|
platform))
|
||||||
|
(cond
|
||||||
|
((null? flags) (values features platform))
|
||||||
|
;; past `--' the flags are the C compiler's
|
||||||
|
((string=? (car flags) "--") (values features platform))
|
||||||
|
((string=? (car flags) "--no-platform-features")
|
||||||
|
(loop (cdr flags) features #f))
|
||||||
|
((and (member (car flags) '("-f" "--features")) (pair? (cdr flags)))
|
||||||
|
(add (cadr flags) (cddr flags)))
|
||||||
|
((string-prefix? "--features=" (car flags))
|
||||||
|
(add (substring (car flags) 11) (cdr flags)))
|
||||||
|
((string-prefix? "-f" (car flags))
|
||||||
|
(add (substring (car flags) 2) (cdr flags)))
|
||||||
|
(else (loop (cdr flags) features platform))))))
|
||||||
|
|
||||||
(define (process-file target-path)
|
(define (process-file target-path)
|
||||||
(let* ((first-pass (split-settings (read-raw-forms target-path)))
|
(let ((first-pass (split-settings (read-raw-forms target-path))))
|
||||||
(features (compilation-features (car first-pass))))
|
(let-values (((features platform?) (compilation-features (car first-pass))))
|
||||||
(if (null? features)
|
(if (and (null? features) platform?)
|
||||||
first-pass
|
first-pass
|
||||||
(parameterize ((current-features (append (platform-features) features)))
|
(parameterize ((current-features
|
||||||
(split-settings (read-raw-forms target-path))))))
|
(append (if platform? (platform-features) (list))
|
||||||
|
features)))
|
||||||
|
(split-settings (read-raw-forms target-path)))))))
|
||||||
|
|
||||||
(define (compile src compilation sexc)
|
(define (compile src compilation sexc)
|
||||||
(let ((compiler (or
|
(let ((compiler (or
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
(get-env-var
|
(get-env-var
|
||||||
set-working-directory
|
set-working-directory
|
||||||
to-absolute-pathname
|
to-absolute-pathname
|
||||||
|
comment-form?
|
||||||
|
strip-header-comments
|
||||||
list-split
|
list-split
|
||||||
list-join
|
list-join
|
||||||
recons
|
recons
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
map-fields
|
map-fields
|
||||||
|
|
||||||
get-type-info
|
get-type-info
|
||||||
|
get-tag-info
|
||||||
get-fields
|
get-fields
|
||||||
get-underlying-type)
|
get-underlying-type)
|
||||||
"types.scm")
|
"types.scm")
|
||||||
|
|||||||
50
types.scm
50
types.scm
@@ -15,7 +15,11 @@
|
|||||||
srfi-1
|
srfi-1
|
||||||
srfi-69)
|
srfi-69)
|
||||||
|
|
||||||
(define +type-db+ (make-hash-table))
|
;;; Two namespaces: `struct point' and a `point' typedef are separate
|
||||||
|
;;; declarations. Tags -- struct, union and enum alike -- share the
|
||||||
|
;;; second table between them
|
||||||
|
(define +type-db+ (make-hash-table)) ; typedefs and defines
|
||||||
|
(define +tag-db+ (make-hash-table)) ; struct, union and enums
|
||||||
|
|
||||||
(define (strip-pub form)
|
(define (strip-pub form)
|
||||||
(if (eq? (car form) 'pub) (cdr form) form))
|
(if (eq? (car form) 'pub) (cdr form) form))
|
||||||
@@ -44,17 +48,17 @@
|
|||||||
(list))))
|
(list))))
|
||||||
|
|
||||||
(define (add-struct name form)
|
(define (add-struct name form)
|
||||||
(hash-table-set! +type-db+ name
|
(hash-table-set! +tag-db+ name
|
||||||
(list 'struct name (normalize-fields (aggregate-fields form)))))
|
(list 'struct name (normalize-fields (aggregate-fields form)))))
|
||||||
|
|
||||||
(define (add-union name form)
|
(define (add-union name form)
|
||||||
(hash-table-set! +type-db+ name
|
(hash-table-set! +tag-db+ name
|
||||||
(list 'union name (normalize-fields (aggregate-fields form)))))
|
(list 'union name (normalize-fields (aggregate-fields form)))))
|
||||||
|
|
||||||
;;; ([pub] enum name (value ...))
|
;;; ([pub] enum name (value ...))
|
||||||
(define (add-enum name form)
|
(define (add-enum name form)
|
||||||
(let ((f (strip-pub form)))
|
(let ((f (strip-pub form)))
|
||||||
(hash-table-set! +type-db+ name
|
(hash-table-set! +tag-db+ name
|
||||||
(list 'enum name (if (and (pair? (cddr f)) (list? (caddr f)))
|
(list 'enum name (if (and (pair? (cddr f)) (list? (caddr f)))
|
||||||
(caddr f)
|
(caddr f)
|
||||||
(list))))))
|
(list))))))
|
||||||
@@ -70,8 +74,14 @@
|
|||||||
(hash-table-set! +type-db+ name
|
(hash-table-set! +type-db+ name
|
||||||
(list 'define name (cddr (strip-pub form)))))
|
(list 'define name (cddr (strip-pub form)))))
|
||||||
|
|
||||||
|
(define (get-tag-info name)
|
||||||
|
(hash-table-ref/default +tag-db+ name #f))
|
||||||
|
|
||||||
|
;;; First look up the ordinary identifier, then tag of that id when
|
||||||
|
;;; no ordinary one was declared, as C does
|
||||||
(define (get-type-info name)
|
(define (get-type-info name)
|
||||||
(hash-table-ref/default +type-db+ name #f))
|
(or (hash-table-ref/default +type-db+ name #f)
|
||||||
|
(get-tag-info name)))
|
||||||
|
|
||||||
;;; ((name type) ...) for a struct or union, #f for anything else --
|
;;; ((name type) ...) for a struct or union, #f for anything else --
|
||||||
;;; including a name that was never declared. Callers give the better
|
;;; including a name that was never declared. Callers give the better
|
||||||
@@ -100,19 +110,31 @@
|
|||||||
|
|
||||||
;;; The declaration NAME ultimately names. For a typedef that is the
|
;;; The declaration NAME ultimately names. For a typedef that is the
|
||||||
;;; entry of whatever it stands for, and for anything else it is
|
;;; entry of whatever it stands for, and for anything else it is
|
||||||
;;; NAME's own info.
|
;;; NAME's own info
|
||||||
|
(define (target-tag target)
|
||||||
|
(cond
|
||||||
|
((symbol? target) target)
|
||||||
|
((and (pair? target)
|
||||||
|
(memq (car target) '(struct union enum))
|
||||||
|
(pair? (cdr target))
|
||||||
|
(symbol? (cadr target)))
|
||||||
|
(cadr target))
|
||||||
|
(else #f)))
|
||||||
|
|
||||||
(define (resolve-type-info name)
|
(define (resolve-type-info name)
|
||||||
|
(let ((info (resolve-ordinary-type-info name)))
|
||||||
|
(if (and info (memq (car info) '(struct union enum)))
|
||||||
|
info
|
||||||
|
(or (get-tag-info name) info))))
|
||||||
|
|
||||||
|
(define (resolve-ordinary-type-info name)
|
||||||
(let ((info (get-type-info name)))
|
(let ((info (get-type-info name)))
|
||||||
(and info
|
(and info
|
||||||
(if (eq? (car info) 'typedef)
|
(if (eq? (car info) 'typedef)
|
||||||
(let* ((target (get-underlying-type name))
|
(let ((tag (target-tag (get-underlying-type name))))
|
||||||
(tag (cond ((symbol? target) target)
|
;; A typedef target is written in type position, where
|
||||||
((and (pair? target)
|
;; `struct point' means the tag
|
||||||
(pair? (cdr target))
|
(and tag (or (get-tag-info tag) (get-type-info tag))))
|
||||||
(symbol? (cadr target)))
|
|
||||||
(cadr target))
|
|
||||||
(else #f))))
|
|
||||||
(and tag (get-type-info tag)))
|
|
||||||
info))))
|
info))))
|
||||||
|
|
||||||
;;; Type matcher macro
|
;;; Type matcher macro
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
(get-env-var
|
(get-env-var
|
||||||
set-working-directory
|
set-working-directory
|
||||||
to-absolute-pathname
|
to-absolute-pathname
|
||||||
|
comment-form?
|
||||||
|
strip-header-comments
|
||||||
list-split
|
list-split
|
||||||
list-join
|
list-join
|
||||||
recons
|
recons
|
||||||
|
|||||||
18
utils.scm
18
utils.scm
@@ -42,6 +42,24 @@
|
|||||||
(current-directory)
|
(current-directory)
|
||||||
pathname)))
|
pathname)))
|
||||||
|
|
||||||
|
(define (comment-form? form)
|
||||||
|
(and (pair? form) (eq? (car form) 'comment)))
|
||||||
|
|
||||||
|
;;; Remove the comment forms from the first COUNT elements of FORM --
|
||||||
|
;;; its header -- so that the positional accessors reading it are not
|
||||||
|
;;; shifted by one
|
||||||
|
(define (strip-header-comments form count)
|
||||||
|
;; This always rebuilds the list, so the location has to be carried
|
||||||
|
;; over explicitly -- otherwise every form loses it
|
||||||
|
(copy-form-source!
|
||||||
|
form
|
||||||
|
(let loop ((rest form) (kept 0) (acc (list)))
|
||||||
|
(cond
|
||||||
|
((null? rest) (reverse acc))
|
||||||
|
((= kept count) (append (reverse acc) rest))
|
||||||
|
((comment-form? (car rest)) (loop (cdr rest) kept acc))
|
||||||
|
(else (loop (cdr rest) (+ kept 1) (cons (car rest) acc)))))))
|
||||||
|
|
||||||
(define (list-split src-list split-elt)
|
(define (list-split src-list split-elt)
|
||||||
;; split '(1 2 / 3 4 / 5 6) by '/ -> '((1 2) (3 4) (5 6))
|
;; split '(1 2 / 3 4 / 5 6) by '/ -> '((1 2) (3 4) (5 6))
|
||||||
(fold (lambda (elt acc)
|
(fold (lambda (elt acc)
|
||||||
|
|||||||
Reference in New Issue
Block a user