comparison src/compiler.sml @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 01c8aceac480 403f0cc65b9c
children f0f7bf234893
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
872 | "neverInline" => Settings.addNeverInline arg 872 | "neverInline" => Settings.addNeverInline arg
873 | "noXsrfProtection" => Settings.addNoXsrfProtection arg 873 | "noXsrfProtection" => Settings.addNoXsrfProtection arg
874 | "timeFormat" => Settings.setTimeFormat arg 874 | "timeFormat" => Settings.setTimeFormat arg
875 | "noMangleSql" => Settings.setMangleSql false 875 | "noMangleSql" => Settings.setMangleSql false
876 | "html5" => Settings.setIsHtml5 true 876 | "html5" => Settings.setIsHtml5 true
877 | "lessSafeFfi" => Settings.setLessSafeFfi true
877 878
878 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'"); 879 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'");
879 read () 880 read ()
880 end 881 end
881 882