artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Update snarfer.

Browse source 
* build-aux/mes-snarf.scm (symbol->header): Update for pointer cells.
(snarf-symbols): Likewise.
(snarf-functions): Likewise.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-09-27 19:07:00 +02:00
parent 1cdbadfe98
commit e4a8bdcc8f
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build-aux/mes-snarf.scm
View file

@ -104,12 +104,19 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
(format #f "// CONSTANT ~a ~a\n" s i) (format #f "// CONSTANT ~a ~a\n" s i)
(format #f "#define ~a ~a\n" s i))) (format #f "#define ~a ~a\n" s i)))
(define (symbol->header s i)
(let ((c (string-upcase s)))
(string-append
(format #f "\n// CONSTANT ~a ~a\n" c i)
(format #f "#define ~a ~a\n" c i)
(format #f "struct scm *~a; /* ~a */\n" s i))))
(define (function->header f i) (define (function->header f i)
(let* ((arity (or (assoc-ref (function.annotation f) 'arity) (let* ((arity (or (assoc-ref (function.annotation f) 'arity)
(if (string-null? (function.formals f)) 0 (if (string-null? (function.formals f)) 0
(length (string-split (function.formals f) #\,))))) (length (string-split (function.formals f) #\,)))))
(n (if (eq? arity 'n) -1 arity))) (n (if (eq? arity 'n) -1 arity)))
(format #f "SCM ~a (~a);\n" (function.name f) (function.formals f)))) (format #f "struct scm *~a (~a);\n" (function.name f) (function.formals f))))
(define (function->source f i) (define (function->source f i)
(let* ((arity (or (assoc-ref (function.annotation f) 'arity) (let* ((arity (or (assoc-ref (function.annotation f) 'arity)
@ -143,7 +150,8 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
(receive (function rest) (receive (function rest)
(apply values (string-split-string line " ")) (apply values (string-split-string line " "))
(and function (and function
(equal? (string-trim previous) "SCM") (or (equal? (string-trim previous) "struct scm*")
(equal? (string-trim previous) "struct scm *"))
(not (string-null? function)) (not (string-null? function))
(not (string-prefix? "#" function)) (not (string-prefix? "#" function))
(not (string-prefix? "/" function)) (not (string-prefix? "/" function))
@ -163,7 +171,7 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
(string-split parameters #\,))) (string-split parameters #\,)))
(formals (map string-trim formals))) (formals (map string-trim formals)))
(and parameters (and parameters
(let* ((non-SCM (filter (negate (cut string-prefix? "SCM" <>)) formals))) (let* ((non-SCM (filter (negate (cut string-prefix? "struct scm" <>)) formals)))
(and (null? non-SCM) (and (null? non-SCM)
(let ((annotation (and annotation (with-input-from-string annotation read)))) (let ((annotation (and annotation (with-input-from-string annotation read))))
(make-function function parameters annotation)))))))))) (make-function function parameters annotation))))))))))