shithub: fnt

Info  •  Files  •  Log  •  Branches

reduce the line noise

--- a/otf.rkt

+++ b/otf.rkt

@@ -8,7 +8,8 @@

 (define cmplxs '())

 (define (indent x lst)

-  (let ([ind (make-string x #\tab)]) (map (λ (str) (string-append ind str)) lst)))

+  (define ind (make-string x #\tab))

+  (map (λ (str) (string-append ind str)) lst))

 (define (format-lines lst)

   (string-join (append lst '("")) "\n"))

@@ -78,10 +79,12 @@

 (define (autoparse bits ctype)

   (λ (b [index 0])

-    (letrec ([f (λ (index shift)

-                  (let* ([x (- shift 8)] [next (if (positive? x) (~a " | " (f (add1 index) x)) "")])

-                    (~a (if (> x 24) (~a "(" ctype ")") "") b "[" index "]" (if (positive? x) (~a "<<" x) "") next)))])

-      (~a (if (<= bits 32) (~a "(" ctype ")") "") "(" (f index bits) ")"))))

+    (define cast (~a "(" ctype ")"))

+    (define (f index bits)

+      (define sh (- bits 8))

+      (define tail (if (positive? sh) (~a "<<" sh " | " (f (add1 index) sh)) ""))

+      (~a (if (> sh 24) cast "") b "[" index "]" tail))

+    (~a (if (<= bits 32) cast "") "(" (f index bits) ")")))

 (define-syntax mktype

   (syntax-rules ()

@@ -117,11 +120,9 @@

   (string-prefix? s "typedef"))

 (define (format f)

-  (string-join (append (list "/* this file is generated. do not modify. */\n\n")

-                       (map (λ (c) (format-lines (filter c-typedef? (f c)))) cmplxs)

-                       (map (λ (c) (format-lines (filter (negate c-typedef?) (f c)))) cmplxs)

-                       (map (λ (t) (format-lines (f t))) types))

-               ""))

+  (define-values (a b) (partition c-typedef? (flatten (map f cmplxs))))

+  (define ps (list "/* this file is generated. do not modify. */\n" a b (map f types) ""))

+  (string-join (flatten ps) "\n"))

 (mktype uint8 8 u8int)

 (mktype int8 8 s8int)

@@ -142,7 +143,9 @@

 (mktype F2DOT14

         16

         float

-        (λ (b index) (let ([x (~a ((type-parse int16) b index))]) (~a "(" x ">>14)+(" x "&((1<<14)-1))/16384.0"))))

+        (λ (b index)

+          (define x (~a ((type-parse int16) b index)))

+          (~a "(" x ">>14)+(" x "&((1<<14)-1))/16384.0")))

 (mkcmplx TableRecord (mkfields {Tag tableTag} {uint32 checksum} {Offset32 offset} {uint32 length}))