Mercurial > urweb

comparison src/jscomp.sml @ 2197:6eae499c56cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New .urp directive: jsFile
author Adam Chlipala <adam@chlipala.net>
date Sat, 05 Dec 2015 12:04:06 -0500
parents 9e9c915f554c
children 6fb9232ade99
comparison
equal deleted inserted replaced
2196:100352dbae36 2197:6eae499c56cb
1356 1356
1357 val urlRules = "urlRules = " ^ urlRules ^ ";\n\n" 1357 val urlRules = "urlRules = " ^ urlRules ^ ";\n\n"
1358 1358
1359 val script = 1359 val script =
1360 if !foundJavaScript then 1360 if !foundJavaScript then
1361 lines ^ urlRules ^ String.concat (rev (#script st)) 1361 String.concatWith "" ((lines ^ urlRules ^ String.concat (rev (#script st))
1362 ^ "\ntime_format = \"" ^ Prim.toCString (Settings.getTimeFormat ()) ^ "\";\n" 1362 ^ "\ntime_format = \"" ^ Prim.toCString (Settings.getTimeFormat ()) ^ "\";\n")
1363 :: map (fn r => "\n// " ^ #Filename r ^ "\n\n" ^ #Content r ^ "\n") (Settings.listJsFiles ()))
1363 else 1364 else
1364 "" 1365 ""
1365 in 1366 in
1366 TextIO.closeIn inf; 1367 TextIO.closeIn inf;
1367 ((DJavaScript script, ErrorMsg.dummySpan) :: ds, #2 file) 1368 ((DJavaScript script, ErrorMsg.dummySpan) :: ds, #2 file)