comparison src/compiler.sml @ 1979:81bc76aa4acd

Merge in upstream changes.
author Patrick Hurst <phurst@mit.edu>
date Sat, 18 Jan 2014 18:26:24 -0500
parents ac1be85e91ad
children 0652f295e0fa
comparison
equal deleted inserted replaced
1978:c5143edaf3c7 1979:81bc76aa4acd
862 NONE => ErrorMsg.error ("invalid mono inline level '" ^ arg ^ "'") 862 NONE => ErrorMsg.error ("invalid mono inline level '" ^ arg ^ "'")
863 | SOME n => Settings.setMonoInline n) 863 | SOME n => Settings.setMonoInline n)
864 | "alwaysInline" => Settings.addAlwaysInline arg 864 | "alwaysInline" => Settings.addAlwaysInline arg
865 | "noXsrfProtection" => Settings.addNoXsrfProtection arg 865 | "noXsrfProtection" => Settings.addNoXsrfProtection arg
866 | "timeFormat" => Settings.setTimeFormat arg 866 | "timeFormat" => Settings.setTimeFormat arg
867 | "noMangleSql" => Settings.setMangleSql false
868 | "html5" => Settings.setIsHtml5 true
867 869
868 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'"); 870 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'");
869 read () 871 read ()
870 end 872 end
871 873