diff options
| author | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
|---|---|---|
| committer | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
| commit | 5664fddcab15ef4482d583673c75e07bd1e96d0a (patch) | |
| tree | 878b22860e69405ba5cf6fd2798731dac8ce660c /cparser/Env.ml | |
| parent | b960c83725d7e185ac5c6e3c0d6043c7dcd2f556 (diff) | |
| parent | fe73ed58ef80da7c53c124302a608948fb190229 (diff) | |
| download | compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.tar.gz compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.zip | |
Merge remote-tracking branch 'origin/master' into parser_fix
Diffstat (limited to 'cparser/Env.ml')
| -rw-r--r-- | cparser/Env.ml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cparser/Env.ml b/cparser/Env.ml index 6610c159..65df6cb9 100644 --- a/cparser/Env.ml +++ b/cparser/Env.ml @@ -132,7 +132,7 @@ let lookup_struct env s = res with Not_found -> raise(Error(Unbound_tag(s, "struct"))) - + let lookup_union env s = try let (id, ci as res) = IdentMap.lookup s env.env_tag in @@ -141,7 +141,7 @@ let lookup_union env s = res with Not_found -> raise(Error(Unbound_tag(s, "union"))) - + let lookup_composite env s = try Some (IdentMap.lookup s env.env_tag) with Not_found -> None @@ -191,7 +191,7 @@ let find_union env id = ci with Not_found -> raise(Error(Unbound_tag(id.name, "union"))) - + let find_member ci m = List.find (fun f -> f.fld_name = m) ci @@ -258,7 +258,7 @@ let add_typedef env id info = let add_enum env id info = let add_enum_item env (id, v, exp) = { env with env_ident = IdentMap.add id (II_enum v) env.env_ident } in - List.fold_left add_enum_item + List.fold_left add_enum_item { env with env_enum = IdentMap.add id info env.env_enum } info.ei_members @@ -270,12 +270,12 @@ let composite_tag_name name = if name = "" then "<anonymous>" else name let error_message = function - | Unbound_identifier name -> + | Unbound_identifier name -> sprintf "Unbound identifier '%s'" name | Unbound_tag(name, kind) -> sprintf "Unbound %s '%s'" kind (composite_tag_name name) | Tag_mismatch(name, expected, actual) -> - sprintf "'%s' was declared as a %s but is used as a %s" + sprintf "'%s' was declared as a %s but is used as a %s" (composite_tag_name name) actual expected | Unbound_typedef name -> sprintf "Unbound typedef '%s'" name |