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/Cabs.v | |
| 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/Cabs.v')
| -rw-r--r-- | cparser/Cabs.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cparser/Cabs.v b/cparser/Cabs.v index 6d9e95d5..e15f8694 100644 --- a/cparser/Cabs.v +++ b/cparser/Cabs.v @@ -86,18 +86,18 @@ with parameter := | PARAM : list spec_elem -> option string -> decl_type -> list attribute -> cabsloc -> parameter (* The optional expression is the bitfield *) -with field_group := +with field_group := | Field_group : list spec_elem -> list (option name * option expression) -> cabsloc -> field_group (* The decl_type is in the order in which they are printed. Only the name of * the declared identifier is pulled out. *) (* e.g: in "int *x", "*x" is the declarator; "x" will be pulled out as *) (* the string, and decl_type will be PTR([], JUSTBASE) *) -with name := +with name := | Name : string -> decl_type -> list attribute -> cabsloc -> name (* A variable declarator ("name") with an initializer *) -with init_name := +with init_name := | Init_name : name -> init_expression -> init_name (* |