changeset 1928:f1c211936557

Merge
author Adam Chlipala <adam@chlipala.net>
date Mon, 09 Dec 2013 17:25:53 -0500 (2013-12-09)
parents b6aee1d5b9b1 afdc823563de
children f792a6544093
files doc/manual.tex src/monoize.sml
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/doc/manual.tex	Mon Dec 09 17:23:25 2013 -0500
+++ b/doc/manual.tex	Mon Dec 09 17:25:53 2013 -0500
@@ -275,6 +275,8 @@
 
 \item \texttt{-print-ccompiler}: Print the C compiler being used.
 
+\item \texttt{-print-cinclude}: Print the name of the directory where C/C++ header files are installed.
+
 \item \texttt{-protocol [http|cgi|fastcgi|static]}: Set the protocol that the generated application speaks.
   \begin{itemize}
   \item \texttt{http}: This is the default.  It is for building standalone web servers that can be accessed by web browsers directly.
--- a/src/main.mlton.sml	Mon Dec 09 17:23:25 2013 -0500
+++ b/src/main.mlton.sml	Mon Dec 09 17:25:53 2013 -0500
@@ -56,8 +56,10 @@
 		               raise Code OS.Process.success)
         fun printNumericVersion () = (print (Config.versionNumber ^ "\n");
 			              raise Code OS.Process.success)
-        fun printCCompiler () = (print ((Settings.getCCompiler ()) ^ "\n");
-			              raise Code OS.Process.success)
+        fun printCCompiler () = (print (Settings.getCCompiler () ^ "\n");
+			         raise Code OS.Process.success)
+        fun printCInclude () = (print (Config.includ ^ "\n");
+			        raise Code OS.Process.success)
 
         fun doArgs args =
             case args of
@@ -71,6 +73,8 @@
                  doArgs rest)
               | "-print-ccompiler" :: rest =>
                   printCCompiler ()
+              | "-print-cinclude" :: rest =>
+                  printCInclude ()
               | "-ccompiler" :: ccomp :: rest =>
                 (Settings.setCCompiler ccomp;
                  doArgs rest)
--- a/src/monoize.sml	Mon Dec 09 17:23:25 2013 -0500
+++ b/src/monoize.sml	Mon Dec 09 17:25:53 2013 -0500
@@ -215,6 +215,7 @@
 
                   | L.CFfi ("Basis", "unit") => (L'.TRecord [], loc)
                   | L.CFfi ("Basis", "page") => (L'.TFfi ("Basis", "string"), loc)
+                  | L.CFfi ("Basis", "xhead") => (L'.TFfi ("Basis", "string"), loc)
                   | L.CFfi ("Basis", "xbody") => (L'.TFfi ("Basis", "string"), loc)
                   | L.CFfi ("Basis", "xtable") => (L'.TFfi ("Basis", "string"), loc)
                   | L.CFfi ("Basis", "xtr") => (L'.TFfi ("Basis", "string"), loc)