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

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

Browse source 
This reverts commit b160540e221dbeb96908823b5a3504bdbfd7f751.

Fixed by: https://lists.gnu.org/archive/html/guile-user/2017-08/msg00007.html
This commit is contained in:
Jan Nieuwenhuizen 2017-08-04 11:45:15 +02:00
parent 5c61c040c9
commit 50af730e00
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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