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

mescc: Enhance enum support.

Browse source 
* module/language/c99/compiler.mes (ast->info): Support enum variable
  declaration.  Respect field value overrides.
This commit is contained in:
Jan Nieuwenhuizen 2017-05-06 19:31:00 +02:00
parent 390059a42d
commit 0bc2c05dba
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1450,6 +1450,13 @@
(clone info #:locals (add-local locals name type 0)) (clone info #:locals (add-local locals name type 0))
(clone info #:globals (append globals (list (ident->global name type 0 0)))))) (clone info #:globals (append globals (list (ident->global name type 0 0))))))
;; enum e i;
((decl (decl-spec-list (type-spec (enum-ref (ident ,type)))) (init-declr-list (init-declr (ident ,name))))
(let ((type "int")) ;; FIXME
(if (.function info)
(clone info #:locals (add-local locals name type 0))
(clone info #:globals (append globals (list (ident->global name type 0 0)))))))
;; int i = 0; ;; int i = 0;
((decl (decl-spec-list (type-spec (fixed-type ,type))) (init-declr-list (init-declr (ident ,name) (initzer (p-expr (fixed ,value)))))) ((decl (decl-spec-list (type-spec (fixed-type ,type))) (init-declr-list (init-declr (ident ,name) (initzer (p-expr (fixed ,value))))))
(let ((value (cstring->number value))) (let ((value (cstring->number value)))
@ -1732,7 +1739,17 @@
;; enum ;; enum
((decl (decl-spec-list (type-spec (enum-def (ident ,name) (enum-def-list . ,fields))))) ((decl (decl-spec-list (type-spec (enum-def (ident ,name) (enum-def-list . ,fields)))))
(let ((type (enum->type name fields)) (let ((type (enum->type name fields))
(constants (map ident->constant (map cadadr fields) (iota (length fields))))) (constants (let loop ((fields fields) (i 0) (constants constants))
(if (null? fields) constants
(let* ((field (car fields))
(name (pmatch field
((enum-defn (ident ,name) . _) name)))
(i (pmatch field
((enum-defn ,name (p-expr (fixed ,value))) (cstring->number value))
((enum-defn ,name) i))))
(loop (cdr fields)
(1+ i)
(append constants (list (ident->constant name i)))))))))
(clone info (clone info
#:types (append (.types info) (list type)) #:types (append (.types info) (list type))
#:constants (append constants (.constants info))))) #:constants (append constants (.constants info)))))