Commit 0b7c5226 authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

Merge branch 'feature/kernel/removes-deprecated-features' into 'master'

[kernel-compat] removed AST nodes

See merge request frama-c/frama-clang!158
parents c0917f18 614ccb9d
......@@ -29,9 +29,9 @@ let transform_category =
let exn_dkey = Frama_Clang_option.register_category "exn:inherit"
let find_comp name =
try
try
(match Globals.Types.find_type Logic_typing.Struct name with
| TComp(c,_,_) -> c
| TComp(c,_) -> c
| _ ->
Frama_Clang_option.fatal "unexpected type returned for struct %s" name)
with Not_found ->
......@@ -44,7 +44,7 @@ let rec coerce lv comp path =
| (_,_,direct_base) :: path ->
let cname = Extlib.uncurry Mangling.mangle direct_base None in
let fname =
Extlib.uncurry
Extlib.uncurry
(Convert.create_base_field_name Convert_env.empty_env) direct_base
in
let field = Cil.getCompField comp fname in
......@@ -58,7 +58,7 @@ let add_subtypes kf = function
| Catch_exn(vi,l) as bind ->
let loc = vi.vdecl in
(match (Cil.unrollType vi.vtype) with
| TComp({ corig_name = base },_,_) as base_struct ->
| TComp({ corig_name = base },_) as base_struct ->
let qualified_base = Class.class_of_mangled base in
(match qualified_base with
| Some qualified_base ->
......@@ -101,7 +101,7 @@ let add_subtypes kf = function
Cil.makeTempVar f
~insert:false
~name:(vi.vname ^ "_" ^ (string_of_int i))
(TComp (struct_info, { scache = Not_Computed }, []))
(TComp (struct_info, []))
in
f.slocals <- my_vi :: f.slocals;
let lv = coerce (Cil.var my_vi) struct_info path in
......@@ -113,7 +113,7 @@ let add_subtypes kf = function
end else acc
in
let _,binders =
Fclang_datatype.Qualified_name.Set.fold
Fclang_datatype.Qualified_name.Set.fold
treat_one_derived derived (1,binders)
in
Catch_exn(vi,binders)
......
......@@ -88,7 +88,7 @@ let kind_of_glob = function
| _ -> Other)
(* TODO: find dependencies also in GLOBANNOT... *)
| GLOBASM _ | PRAGMA _ | STATIC_ASSERT _
| LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> Other
| LINKAGE _ | GLOBANNOT _ -> Other
let name_of_glob d = match d with
| FUNDEF(_,(_,(name,_,_,_)),_,_,_) -> name
......@@ -110,7 +110,7 @@ let name_of_glob d = match d with
Cabs_debug.pp_def d
)
| GLOBASM _ | PRAGMA _ | STATIC_ASSERT _
| LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> ""
| LINKAGE _ | GLOBANNOT _ -> ""
let has_init = List.exists (function (_,NO_INIT) -> false | _ -> true)
......@@ -128,7 +128,7 @@ let glob_is_def = function
| Tenum(_,None,_) -> false
| _ -> false)
| GLOBASM _ | PRAGMA _ | STATIC_ASSERT _
| LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> false
| LINKAGE _ | GLOBANNOT _ -> false
let decl_of_def = function
| FUNDEF (_,(s,n),_,b,_) -> DECDEF(None,(s,[n,NO_INIT]),b)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment