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

mescc: Handle enums.

Browse source 
* module/language/c99/compiler.mes (<types>, <constants>): New slots for info.
 (make, clone): Add them.
 (.types, .constants): New accessors.
This commit is contained in:
Jan Nieuwenhuizen 2017-01-10 22:44:01 +01:00
parent 961559f32e
commit 04218971c5
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,20 +89,33 @@
((fctn-defn _ (ptr-declr (pointer) (ftn-declr (ident ,name) _)) (compd-stmt (block-item-list . ,statements))) statements))) ((fctn-defn _ (ptr-declr (pointer) (ftn-declr (ident ,name) _)) (compd-stmt (block-item-list . ,statements))) statements)))
(define <info> '<info>) (define <info> '<info>)
(define <types> '<types>)
(define <constants> '<constants>)
(define <functions> '<functions>) (define <functions> '<functions>)
(define <globals> '<globals>) (define <globals> '<globals>)
(define <locals> '<locals>) (define <locals> '<locals>)
(define <function> '<function>) (define <function> '<function>)
(define <text> '<text>) (define <text> '<text>)
(define* (make o #:key (functions '()) (globals '()) (locals '()) (function #f) (text '()))
(define* (make o #:key (types '()) (constants '()) (functions '()) (globals '()) (locals '()) (function #f) (text '()))
(pmatch o (pmatch o
(<info> (list <info> (<info> (list <info>
(cons <types> types)
(cons <constants> constants)
(cons <functions> functions) (cons <functions> functions)
(cons <globals> globals) (cons <globals> globals)
(cons <locals> locals) (cons <locals> locals)
(cons <function> function) (cons <function> function)
(cons <text> text))))) (cons <text> text)))))
(define (.types o)
(pmatch o
((<info> . ,alist) (assq-ref alist <types>))))
(define (.constants o)
(pmatch o
((<info> . ,alist) (assq-ref alist <constants>))))
(define (.functions o) (define (.functions o)
(pmatch o (pmatch o
((<info> . ,alist) (assq-ref alist <functions>)))) ((<info> . ,alist) (assq-ref alist <functions>))))
@ -128,19 +141,23 @@
(define (clone o . rest) (define (clone o . rest)
(cond ((info? o) (cond ((info? o)
(let ((functions (.functions o)) (let ((types (.types o))
(constants (.constants o))
(functions (.functions o))
(globals (.globals o)) (globals (.globals o))
(locals (.locals o)) (locals (.locals o))
(function (.function o)) (function (.function o))
(text (.text o))) (text (.text o)))
(let-keywords rest (let-keywords rest
#f #f
((functions functions) ((types types)
(constants constants)
(functions functions)
(globals globals) (globals globals)
(locals locals) (locals locals)
(function function) (function function)
(text text)) (text text))
(make <info> #:functions functions #:globals globals #:locals locals #:function function #:text text)))))) (make <info> #:types types #:constants constants #:functions functions #:globals globals #:locals locals #:function function #:text text))))))
(define (push-global-ref globals) (define (push-global-ref globals)
(lambda (o) (lambda (o)
@ -258,6 +275,12 @@
(define (ident->global name value) (define (ident->global name value)
(cons name (int->bv32 value))) (cons name (int->bv32 value)))
(define (ident->constant name value)
(cons name value))
(define (ident->type name value)
(cons name value))
(define (expr->global o) (define (expr->global o)
(pmatch o (pmatch o
((p-expr (string ,string)) (string->global string)) ((p-expr (string ,string)) (string->global string))
@ -863,6 +886,13 @@
(append (.text info) (append (.text info)
((accu->ident info) name)))))) ((accu->ident info) name))))))
;; enum
((decl (decl-spec-list (type-spec (enum-def (ident ,name) (enum-def-list . ,fields)))))
(let ((type (ident->type name "enum"))
(constants (map ident->constant (map cadadr fields) (iota (length fields)))))
(clone info #:types (append (.types info) (list type))
#:constants (append constants (.constants info)))))
;; i = 0; ;; i = 0;
((expr-stmt (assn-expr (p-expr (ident ,name)) (op _) (p-expr (fixed ,value)))) ((expr-stmt (assn-expr (p-expr (ident ,name)) (op _) (p-expr (fixed ,value))))
;;(stderr "RET LOCAL[~a]: ~a\n" name (assoc-ref locals name)) ;;(stderr "RET LOCAL[~a]: ~a\n" name (assoc-ref locals name))