diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /cparser/Transform.mli | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'cparser/Transform.mli')
| -rw-r--r-- | cparser/Transform.mli | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cparser/Transform.mli b/cparser/Transform.mli index 57a4737b..a04896a9 100644 --- a/cparser/Transform.mli +++ b/cparser/Transform.mli @@ -64,11 +64,11 @@ val fundef : (Env.t -> C.stmt -> C.stmt) -> Env.t -> C.fundef -> C.fundef val program : ?decl:(Env.t -> C.decl -> C.decl) -> ?fundef:(Env.t -> C.fundef -> C.fundef) -> - ?composite:(Env.t -> C.struct_or_union -> - C.ident -> C.attributes -> C.field list -> + ?composite:(Env.t -> C.struct_or_union -> + C.ident -> C.attributes -> C.field list -> C.attributes * C.field list) -> ?typedef:(Env.t -> C.ident -> C.typ -> C.typ) -> - ?enum:(Env.t -> C.ident -> C.attributes -> C.enumerator list -> + ?enum:(Env.t -> C.ident -> C.attributes -> C.enumerator list -> C.attributes * C.enumerator list) -> ?pragma:(Env.t -> string -> string) -> C.program -> |