comparison src/compiler.sml @ 1984:819756825c8d

Merge in upstream
author Patrick Hurst <phurst@mit.edu>
date Fri, 14 Feb 2014 04:00:03 -0500
parents b15a4c2cb542
children 403f0cc65b9c 606af2c9b828
comparison
equal deleted inserted replaced
1983:0ff4f64b4309 1984:819756825c8d
867 | "monoInline" => 867 | "monoInline" =>
868 (case Int.fromString arg of 868 (case Int.fromString arg of
869 NONE => ErrorMsg.error ("invalid mono inline level '" ^ arg ^ "'") 869 NONE => ErrorMsg.error ("invalid mono inline level '" ^ arg ^ "'")
870 | SOME n => Settings.setMonoInline n) 870 | SOME n => Settings.setMonoInline n)
871 | "alwaysInline" => Settings.addAlwaysInline arg 871 | "alwaysInline" => Settings.addAlwaysInline arg
872 | "neverInline" => Settings.addNeverInline arg
872 | "noXsrfProtection" => Settings.addNoXsrfProtection arg 873 | "noXsrfProtection" => Settings.addNoXsrfProtection arg
873 | "timeFormat" => Settings.setTimeFormat arg 874 | "timeFormat" => Settings.setTimeFormat arg
874 | "noMangleSql" => Settings.setMangleSql false 875 | "noMangleSql" => Settings.setMangleSql false
875 | "html5" => Settings.setIsHtml5 true 876 | "html5" => Settings.setIsHtml5 true
876 877