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/C.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/C.mli')
| -rw-r--r-- | cparser/C.mli | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cparser/C.mli b/cparser/C.mli index 72e1f787..8d8f2805 100644 --- a/cparser/C.mli +++ b/cparser/C.mli @@ -27,7 +27,7 @@ type ident = (* Kinds of integers *) -type ikind = +type ikind = | IBool (** [_Bool] *) | IChar (** [char] *) | ISChar (** [signed char] *) @@ -39,12 +39,12 @@ type ikind = | ILong (** [long] *) | IULong (** [unsigned long] *) | ILongLong (** [long long] (or [_int64] on Microsoft Visual C) *) - | IULongLong (** [unsigned long long] (or [unsigned _int64] on Microsoft + | IULongLong (** [unsigned long long] (or [unsigned _int64] on Microsoft Visual C) *) (** Kinds of floating-point numbers*) -type fkind = +type fkind = FFloat (** [float] *) | FDouble (** [double] *) | FLongDouble (** [long double] *) @@ -73,7 +73,7 @@ type attr_arg = | AInt of int64 | AString of string -type attribute = +type attribute = | AConst | AVolatile | ARestrict @@ -216,7 +216,7 @@ and stmt_desc = | Sdecl of decl | Sasm of attributes * string * asm_operand list * asm_operand list * string list -and slabel = +and slabel = | Slabel of string | Scase of exp | Sdefault |