From 61f3945316ee86b0a848fd32df7e2e688bd5bc1a Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Thu, 1 Jan 2015 11:40:20 +0100
Subject: Wrong handling of block-local function declarations (again)

Reapply commit c3b615f875ed2cf8418453c79c4621d2dc61b0a0
which was overwritten by 2d32afc5daf16c75d1a34f2716c34ae2e1efcce4
---
 cparser/Elab.ml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'cparser')

diff --git a/cparser/Elab.ml b/cparser/Elab.ml
index ac82532b..faffc36f 100644
--- a/cparser/Elab.ml
+++ b/cparser/Elab.ml
@@ -1777,18 +1777,13 @@ let enter_decdefs local loc env sto dl =
   if sto <> Storage_default && dl = [] then
     warning loc "Storage class specifier on empty declaration";
   let rec enter_decdef (decls, env) (s, ty, init) =
+    let isfun = is_function_type env ty in
     if sto = Storage_extern && init <> NO_INIT then
       error loc "'extern' declaration cannot have an initializer";
-    (* Adjust storage for function declarations *)
-    let sto1 =
-      match unroll env ty, sto with
-      | TFun _, Storage_default -> 
-          Storage_extern
-      | TFun _, (Storage_static | Storage_register) ->
-          if local then error loc "invalid storage class for '%s'" s;
-          sto
-      | _, _ ->
-          sto in
+    if local && isfun && (sto = Storage_static || sto = Storage_register) then
+      error loc "invalid storage class for '%s'" s;
+    (* Local function declarations are always treated as extern *)
+    let sto1 = if local && isfun then Storage_extern else sto in
     (* enter ident in environment with declared type, because
        initializer can refer to the ident *)
     let (id, sto', env1) = enter_or_refine_ident local loc env s sto1 ty in
@@ -1798,10 +1793,10 @@ let enter_decdefs local loc env sto dl =
     let env2 = Env.add_ident env1 id sto' ty' in
     (* check for incomplete type *)
     if local && sto' <> Storage_extern
-             && not (is_function_type env ty')
+             && not isfun
              && wrap incomplete_type loc env ty' then
       error loc "'%s' has incomplete type" s;
-    if local && sto' <> Storage_extern && sto' <> Storage_static then
+    if local && not isfun && sto' <> Storage_extern && sto' <> Storage_static then
       (* Local definition *)
       ((sto', id, ty', init') :: decls, env2)
     else begin
-- 
cgit