Deactivate warning 27 and added back removed code.

The code was mostly there for documentation effort. So warning
27 is deactivated again.
Bug 18349

1 files changed, 9 insertions, 9 deletions

diff --git a/cparser/Transform.ml b/cparser/Transform.ml
index 685ef7e1..0a2ce3bb 100644
--- a/cparser/Transform.ml
+++ b/cparser/Transform.ml
@@ -141,7 +141,7 @@ let expand_postincrdecr ~read ~write env ctx op l =
    and preserving the statement structure.
    If [decl] is not given, it applies only to unblocked code. *)
 
-let stmt ~expr ?(decl = fun _ _ -> assert false) env s =
+let stmt ~expr ?(decl = fun env decl -> assert false) env s =
   let rec stm s =
   match s.sdesc with
   | Sskip -> s
@@ -163,7 +163,7 @@ let stmt ~expr ?(decl = fun _ _ -> assert false) env s =
       {s with sdesc = Sswitch(expr s.sloc env Val e, stm s1)}
   | Slabeled(lbl, s) ->
       {s with sdesc = Slabeled(lbl, stm s)}
-  | Sgoto _ -> s
+  | Sgoto lbl -> s
   | Sreturn None -> s
   | Sreturn (Some e) ->
       {s with sdesc = Sreturn(Some(expr s.sloc env Val e))}
@@ -191,12 +191,12 @@ let fundef trstmt env f =
 (* Generic transformation of a program *)
 
 let program
-    ?(decl = fun _ d -> d)
-    ?(fundef = fun _ fd -> fd)
-    ?(composite = fun _ _ _ attr fl -> (attr, fl))
-    ?(typedef = fun _ _ ty -> ty)
-    ?(enum = fun _ _ attr members -> (attr, members))
-    ?(pragma = fun _ s -> s)
+    ?(decl = fun env d -> d)
+    ?(fundef = fun env fd -> fd)
+    ?(composite = fun env su id attr fl -> (attr, fl))
+    ?(typedef = fun env id ty -> ty)
+    ?(enum = fun env id attr members -> (attr, members))
+    ?(pragma = fun env s -> s)
     p =
 
   let rec transf_globdecls env accu = function
@@ -204,7 +204,7 @@ let program
   | g :: gl ->
       let (desc', env') =
         match g.gdesc with
-        | Gdecl((sto, id, ty, _) as d) ->
+        | Gdecl((sto, id, ty, init) as d) ->
            (Gdecl(decl env d), Env.add_ident env id sto ty)
         | Gfundef f ->
            (Gfundef(fundef env f),