diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2013-12-09 17:25:53 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2013-12-09 17:25:53 -0500 |
| commit | e92b616737083d2f847db38c9cb8918f96595a04 (patch) | |
| tree | 42a98dfa7c7fef29d0f0f0621671617376172100 | |
| parent | 31ab9f8c18c9e071392090960a8041febf7a2807 (diff) | |
| parent | 377d1b9ccdf923b6803dc63a66babd90f08ba3f7 (diff) | |
Merge
| -rw-r--r-- | doc/manual.tex | 2 | ||||
| -rw-r--r-- | src/main.mlton.sml | 8 | ||||
| -rw-r--r-- | src/monoize.sml | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/manual.tex b/doc/manual.tex index db1bfe1c..968d93eb 100644 --- a/doc/manual.tex +++ b/doc/manual.tex @@ -275,6 +275,8 @@ sqlite3 path/to/database/file <app.sql \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. diff --git a/src/main.mlton.sml b/src/main.mlton.sml index d176efcc..b0c4e03f 100644 --- a/src/main.mlton.sml +++ b/src/main.mlton.sml @@ -56,8 +56,10 @@ fun oneRun args = 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 @@ fun oneRun args = doArgs rest) | "-print-ccompiler" :: rest => printCCompiler () + | "-print-cinclude" :: rest => + printCInclude () | "-ccompiler" :: ccomp :: rest => (Settings.setCCompiler ccomp; doArgs rest) diff --git a/src/monoize.sml b/src/monoize.sml index 291c0fa3..ad53cf18 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -215,6 +215,7 @@ fun monoType env = | 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) |