diff options
| author | Bernhard Schommer <bschommer@users.noreply.github.com> | 2015-11-12 17:35:41 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bschommer@users.noreply.github.com> | 2015-11-12 17:35:41 +0100 |
| commit | d90ba4443294b80bd940daedfdcdc3d4334fdc7c (patch) | |
| tree | d647ca2216c342c433c35783d32e1abe8545a72c /cparser/Cabshelper.ml | |
| parent | 9054efbd25eedd5627b9e6e62bf1204e5fa0ae94 (diff) | |
| parent | 0ebefc1d145f82783829174bad1f41bb319742b4 (diff) | |
| download | compcert-d90ba4443294b80bd940daedfdcdc3d4334fdc7c.tar.gz compcert-d90ba4443294b80bd940daedfdcdc3d4334fdc7c.zip | |
Merge pull request #69 from jhjourdan/parser_fix
Parser : duplicate identifier tokens, fix K&R definition parsing
Diffstat (limited to 'cparser/Cabshelper.ml')
| -rw-r--r-- | cparser/Cabshelper.ml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/cparser/Cabshelper.ml b/cparser/Cabshelper.ml index 890679b4..b4e6a082 100644 --- a/cparser/Cabshelper.ml +++ b/cparser/Cabshelper.ml @@ -46,8 +46,7 @@ let rec isTypedef = function let get_definitionloc (d : definition) : cabsloc = match d with - | FUNDEF(_, _, _, l) -> l - | KRFUNDEF(_, _, _, _, _, l) -> l + | FUNDEF(_, _, _, _, l) -> l | DECDEF(_, l) -> l | PRAGMA(_, l) -> l @@ -78,10 +77,3 @@ let string_of_cabsloc l = let format_cabsloc pp l = Format.fprintf pp "%s:%d" l.filename l.lineno - -let rec append_decltype dt1 dt2 = - match dt1 with - | JUSTBASE -> dt2 - | ARRAY(dt, attr, sz) -> ARRAY(append_decltype dt dt2, attr, sz) - | PTR(attr, dt) -> PTR(attr, append_decltype dt dt2) - | PROTO(dt, params) -> PROTO(append_decltype dt dt2, params) |