Merge pull request #527 from FStarLang/protz_internal_headers

Fix mistake in #include generation for internal headers

Author: msprotz

lib/Bundles.ml

@@ -303,6 +303,10 @@ let direct_dependencies_with_internal files file_of =
         | `Internal ->  List.mem Common.Internal flags
 
       method! visit_DFunction env cc flags n_cgs n ret name binders body =
+        (* KPrint.bprintf "function %a: concern us=%b %b %b \n" *)
+        (*   PrintAst.Ops.plid name *)
+        (*   (self#concerns_us flags) *)
+        (*   (List.mem Common.Internal flags) (List.mem Common.Private flags); *)
         if self#concerns_us flags then
           if is_inline_static name then
             super#visit_DFunction env cc flags n_cgs n ret name binders body

lib/Output.ml

@@ -192,7 +192,7 @@ let write_h files public_headers (deps: Bundles.all_deps Bundles.StringMap.t) =
           let internal_headers = List.map (fun f -> "internal/" ^ f) internal in
           let headers =
             if Bundles.StringSet.mem name public_headers then
-              ("../" ^ name) :: internal_headers
+              ("../" ^ name) :: public @ internal_headers
             else
               public @ internal_headers
           in