andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mescc: Tinycc support: workaround for nyacc "\0" bug. 

* module/language/c99/compiler.mes (fix-null): Replace "\nul" with "\0".
  (initzer->data): Use it.
  (expr->global): Use it.
This commit is contained in:
Jan Nieuwenhuizen 2017-07-28 21:39:39 +02:00
parent 03eadd6fa6
commit b6375aa016
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/language/c99/compiler.mes
View File

@ -2331,12 +2331,15 @@
((p-expr (fixed ,value)) (cstring->number value))
(_ (error "initzer->value: " o)))))
(define (fix-null o)
(if (equal? o "\nul") (make-string 1 #\nul) o))
(define (initzer->data info)
(lambda (o)
(pmatch o
((initzer (p-expr (char ,char))) (int->bv32 (char->integer (string-ref char 0))))
((initzer (p-expr (string ,string))) `((#:string ,string) #f #f #f))
((initzer (p-expr (string . ,strings))) `((#:string ,(string-join strings "")) #f #f #f))
((initzer (p-expr (string . ,strings))) `((#:string ,(string-join (map fix-null strings) "")) #f #f #f))
((initzer (initzer-list . ,initzers)) (append-map (initzer->data info) initzers))
((initzer (ref-to (p-expr (ident ,name)))) `(,name #f #f #f))
((initzer (ref-to (i-sel (ident ,field) (cast (type-name (decl-spec-list ,struct) (abs-declr (pointer))) (p-expr (fixed ,base))))))
@ -2366,7 +2369,7 @@
(or (assoc g globals)
(string->global-entry string))))
((p-expr (string . ,strings))
(let* ((string (string-join strings ""))
(let* ((string (string-join (map fix-null strings) ""))
(g `(#:string ,string)))
(or (assoc g globals)
(string->global-entry string))))