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

mescc: Tinycc support: Numeric constant expressions.

Browse source
This commit is contained in:
Jan Nieuwenhuizen 2018-05-11 19:27:33 +02:00
parent ec13ccc19f
commit b254f12d5e
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1364,7 +1364,7 @@
((string-prefix? "0" s) (string->number s 8)) ((string-prefix? "0" s) (string->number s 8))
(else (string->number s))))) (else (string->number s)))))
(define (expr->number info o) (define (try-expr->number info o)
(pmatch o (pmatch o
((fixed ,a) (cstring->number a)) ((fixed ,a) (cstring->number a))
((p-expr ,expr) (expr->number info expr)) ((p-expr ,expr) (expr->number info expr))
@ -1400,7 +1400,12 @@
((cond-expr ,test ,then ,else) ((cond-expr ,test ,then ,else)
(if (p-expr->bool info test) (expr->number info then) (expr->number info else))) (if (p-expr->bool info test) (expr->number info then) (expr->number info else)))
(,string (guard (string? string)) (cstring->number string)) (,string (guard (string? string)) (cstring->number string))
(_ (error (format #f "expr->number: not supported: ~s\n" o))))) ((ident ,name) (assoc-ref (.constants info) name))
(_ #f)))
(define (expr->number info o)
(or (try-expr->number info o)
(error (format #f "expr->number: not supported: ~s\n" o))))
(define (p-expr->bool info o) (define (p-expr->bool info o)
(pmatch o (pmatch o
@ -2025,7 +2030,9 @@
(append (map int->bv32 o))) (append (map int->bv32 o)))
((initzer ,init) (init->data init info)) ((initzer ,init) (init->data init info))
((cast _ ,expr) (init->data expr info)) ((cast _ ,expr) (init->data expr info))
(_ (error "init->data: not supported: " o)))) (_ (let ((number (try-expr->number info o)))
(cond (number (int->bv32 number))
(else (error "init->data: not supported: " o)))))))
(define (init->strings o info) (define (init->strings o info)
(let ((globals (.globals info))) (let ((globals (.globals info)))