Mercurial > urweb

annotate src/compiler.sml @ 1558:6fe6bda2b928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable C optimization in debug mode
author Adam Chlipala <adam@chlipala.net>
date Sun, 11 Sep 2011 11:37:26 -0400
parents 659a2f71f5e5
children 154cfe2eb366
rev   line source
adamc@1132 1 (* Copyright (c) 2008-2010, Adam Chlipala
adamc@1 2 * All rights reserved.
adamc@1 3 *
adamc@1 4 * Redistribution and use in source and binary forms, with or without
adamc@1 5 * modification, are permitted provided that the following conditions are met:
adamc@1 6 *
adamc@1 7 * - Redistributions of source code must retain the above copyright notice,
adamc@1 8 * this list of conditions and the following disclaimer.
adamc@1 9 * - Redistributions in binary form must reproduce the above copyright notice,
adamc@1 10 * this list of conditions and the following disclaimer in the documentation
adamc@1 11 * and/or other materials provided with the distribution.
adamc@1 12 * - The names of contributors may not be used to endorse or promote products
adamc@1 13 * derived from this software without specific prior written permission.
adamc@1 14 *
adamc@1 15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
adamc@1 16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
adamc@1 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
adamc@1 18 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
adamc@1 19 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
adamc@1 20 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
adamc@1 21 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
adamc@1 22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
adamc@1 23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
adamc@1 24 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
adamc@1 25 * POSSIBILITY OF SUCH DAMAGE.
adamc@1 26 *)
adamc@1 27
adamc@1 28 structure Compiler :> COMPILER = struct
adamc@1 29
adamc@244 30 structure UrwebLrVals = UrwebLrValsFn(structure Token = LrParser.Token)
adamc@244 31 structure Lex = UrwebLexFn(structure Tokens = UrwebLrVals.Tokens)
adamc@244 32 structure UrwebP = Join(structure ParserData = UrwebLrVals.ParserData
adamc@1 33 structure Lex = Lex
adamc@1 34 structure LrParser = LrParser)
adamc@1 35
adamc@270 36 type job = {
adamc@385 37 prefix : string,
adamc@270 38 database : string option,
adamc@274 39 sources : string list,
adamc@274 40 exe : string,
adamc@274 41 sql : string option,
adamc@502 42 debug : bool,
adamc@673 43 profile : bool,
adamc@764 44 timeout : int,
adamc@764 45 ffi : string list,
adamc@764 46 link : string list,
adamc@765 47 headers : string list,
adamc@766 48 scripts : string list,
adamc@765 49 clientToServer : Settings.ffi list,
adamc@765 50 effectful : Settings.ffi list,
adamc@1171 51 benignEffectful : Settings.ffi list,
adamc@765 52 clientOnly : Settings.ffi list,
adamc@765 53 serverOnly : Settings.ffi list,
adamc@768 54 jsFuncs : (Settings.ffi * string) list,
adamc@769 55 rewrites : Settings.rewrite list,
adamc@769 56 filterUrl : Settings.rule list,
adamc@866 57 filterMime : Settings.rule list,
adam@1465 58 filterRequest : Settings.rule list,
adam@1465 59 filterResponse : Settings.rule list,
adamc@866 60 protocol : string option,
adamc@1164 61 dbms : string option,
adamc@1183 62 sigFile : string option,
adam@1294 63 safeGets : string list,
adam@1332 64 onError : (string * string list * string) option,
adam@1332 65 minHeap : int
adamc@270 66 }
adamc@201 67
adamc@201 68 type ('src, 'dst) phase = {
adamc@201 69 func : 'src -> 'dst,
adamc@201 70 print : 'dst -> Print.PD.pp_desc
adamc@201 71 }
adamc@201 72
adamc@201 73 type pmap = (string * Time.time) list
adamc@201 74
adamc@201 75 type ('src, 'dst) transform = {
adamc@201 76 func : 'src -> 'dst option,
adamc@201 77 print : 'dst -> Print.PD.pp_desc,
adamc@201 78 time : 'src * pmap -> 'dst option * pmap
adamc@201 79 }
adamc@201 80
adamc@1079 81 val debug = ref false
adamc@1240 82 val doIflow = ref false
adamc@1079 83
adamc@201 84 fun transform (ph : ('src, 'dst) phase) name = {
adamc@201 85 func = fn input => let
adamc@1079 86 val () = if !debug then
adamc@1079 87 print ("Starting " ^ name ^ "....\n")
adamc@1079 88 else
adamc@1079 89 ()
adamc@201 90 val v = #func ph input
adamc@201 91 in
adamc@1079 92 if !debug then
adamc@1079 93 print ("Finished " ^ name ^ ".\n")
adamc@1079 94 else
adamc@1079 95 ();
adamc@201 96 if ErrorMsg.anyErrors () then
adamc@201 97 NONE
adamc@201 98 else
adamc@201 99 SOME v
adamc@201 100 end,
adamc@201 101 print = #print ph,
adamc@201 102 time = fn (input, pmap) => let
adamc@1186 103 val () = if !debug then
adamc@1186 104 print ("Starting " ^ name ^ "....\n")
adamc@1186 105 else
adamc@1186 106 ()
adamc@201 107 val befor = Time.now ()
adamc@201 108 val v = #func ph input
adamc@201 109 val elapsed = Time.- (Time.now (), befor)
adamc@201 110 in
adamc@1186 111 if !debug then
adamc@1186 112 print ("Finished " ^ name ^ ".\n")
adamc@1186 113 else
adamc@1186 114 ();
adamc@201 115 (if ErrorMsg.anyErrors () then
adamc@201 116 NONE
adamc@201 117 else
adamc@201 118 SOME v,
adamc@201 119 (name, elapsed) :: pmap)
adamc@201 120 end
adamc@201 121 }
adamc@201 122
adamc@346 123 fun check (tr : ('src, 'dst) transform) x = (ErrorMsg.resetErrors ();
adamc@346 124 ignore (#func tr x))
adamc@346 125
adamc@280 126 fun run (tr : ('src, 'dst) transform) x = (ErrorMsg.resetErrors ();
adamc@280 127 #func tr x)
adamc@201 128
adamc@201 129 fun runPrint (tr : ('src, 'dst) transform) input =
adamc@280 130 (ErrorMsg.resetErrors ();
adamc@280 131 case #func tr input of
adamc@280 132 NONE => print "Failure\n"
adamc@280 133 | SOME v =>
adamc@280 134 (print "Success\n";
adamc@280 135 Print.print (#print tr v);
adamc@280 136 print "\n"))
adamc@201 137
adam@1362 138 fun runPrintToFile (tr : ('src, 'dst) transform) input fname =
adam@1362 139 (ErrorMsg.resetErrors ();
adam@1362 140 case #func tr input of
adam@1362 141 NONE => print "Failure\n"
adam@1362 142 | SOME v =>
adam@1362 143 let
adam@1362 144 val outf = TextIO.openOut fname
adam@1362 145 val str = Print.openOut {dst = outf, wid = 80}
adam@1362 146 in
adam@1362 147 print "Success\n";
adam@1362 148 Print.fprint str (#print tr v);
adam@1362 149 Print.PD.PPS.closeStream str;
adam@1362 150 TextIO.closeOut outf
adam@1362 151 end)
adam@1362 152
adamc@201 153 fun time (tr : ('src, 'dst) transform) input =
adamc@55 154 let
adamc@201 155 val (_, pmap) = #time tr (input, [])
adamc@201 156 in
adamc@201 157 app (fn (name, time) =>
adamc@201 158 print (name ^ ": " ^ LargeReal.toString (Time.toReal time) ^ "\n")) (rev pmap);
adamc@201 159 print ("TOTAL: " ^ LargeReal.toString (Time.toReal (foldl Time.+ Time.zeroTime (map #2 pmap))) ^ "\n");
adamc@201 160 print "\n"
adamc@201 161 end
adamc@55 162
adamc@201 163 fun timePrint (tr : ('src, 'dst) transform) input =
adamc@201 164 let
adamc@201 165 val (ro, pmap) = #time tr (input, [])
adamc@55 166 in
adamc@201 167 app (fn (name, time) =>
adamc@201 168 print (name ^ ": " ^ LargeReal.toString (Time.toReal time) ^ "\n")) (rev pmap);
adamc@201 169 print ("TOTAL: " ^ LargeReal.toString (Time.toReal (foldl Time.+ Time.zeroTime (map #2 pmap))) ^ "\n");
adamc@201 170 print "\n";
adamc@201 171 case ro of
adamc@201 172 NONE => print "Failure\n"
adamc@201 173 | SOME v =>
adamc@201 174 (print "Success\n";
adamc@201 175 Print.print (#print tr v);
adamc@201 176 print "\n")
adamc@55 177 end
adamc@55 178
adam@1362 179 fun runPrintCoreFuncs (tr : ('src, Core.file) transform) input =
adam@1362 180 (ErrorMsg.resetErrors ();
adam@1362 181 case #func tr input of
adam@1362 182 NONE => print "Failure\n"
adam@1362 183 | SOME file =>
adam@1362 184 (print "Success\n";
adam@1362 185 app (fn (d, _) =>
adam@1362 186 case d of
adam@1362 187 Core.DVal (x, _, t, _, _) => Print.preface(x, CorePrint.p_con CoreEnv.empty t)
adam@1362 188 | Core.DValRec xts => app (fn (x, _, t, _, _) => Print.preface(x, CorePrint.p_con CoreEnv.empty t)) xts
adam@1362 189 | _ => ()) file))
adam@1362 190
adamc@244 191 val parseUrs =
adamc@201 192 {func = fn filename => let
adamc@201 193 val fname = OS.FileSys.tmpName ()
adamc@201 194 val outf = TextIO.openOut fname
adamc@201 195 val () = TextIO.output (outf, "sig\n")
adamc@201 196 val inf = TextIO.openIn filename
adamc@201 197 fun loop () =
adamc@201 198 case TextIO.inputLine inf of
adamc@201 199 NONE => ()
adamc@201 200 | SOME line => (TextIO.output (outf, line);
adamc@201 201 loop ())
adamc@201 202 val () = loop ()
adamc@201 203 val () = TextIO.closeIn inf
adamc@201 204 val () = TextIO.closeOut outf
adamc@201 205
adamc@201 206 val () = (ErrorMsg.resetErrors ();
adamc@201 207 ErrorMsg.resetPositioning filename;
adamc@201 208 Lex.UserDeclarations.initialize ())
adamc@201 209 val file = TextIO.openIn fname
adamc@201 210 fun get _ = TextIO.input file
adamc@201 211 fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
adamc@201 212 val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
adamc@244 213 val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
adamc@201 214 in
adamc@201 215 TextIO.closeIn file;
adamc@201 216 case absyn of
adamc@201 217 [(Source.DSgn ("?", (Source.SgnConst sgis, _)), _)] => sgis
adamc@201 218 | _ => (ErrorMsg.errorAt {file = filename,
adamc@201 219 first = {line = 0,
adamc@201 220 char = 0},
adamc@201 221 last = {line = 0,
adamc@201 222 char = 0}} "Not a signature";
adamc@201 223 [])
adamc@201 224 end
adamc@201 225 handle LrParser.ParseError => [],
adamc@201 226 print = Print.p_list_sep Print.PD.newline SourcePrint.p_sgn_item}
adamc@55 227
adamc@1 228 (* The main parsing routine *)
adamc@244 229 val parseUr = {
adamc@201 230 func = fn filename =>
adamc@201 231 let
adamc@201 232 val () = (ErrorMsg.resetErrors ();
adamc@201 233 ErrorMsg.resetPositioning filename;
adamc@201 234 Lex.UserDeclarations.initialize ())
adamc@201 235 val file = TextIO.openIn filename
adamc@201 236 fun get _ = TextIO.input file
adamc@201 237 fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
adamc@201 238 val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
adamc@244 239 val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
adamc@201 240 in
adamc@201 241 TextIO.closeIn file;
adamc@201 242 case absyn of
adamc@201 243 [(Source.DSgn ("?", _), _)] =>
adamc@201 244 (ErrorMsg.errorAt {file = filename,
adamc@201 245 first = {line = 0,
adamc@201 246 char = 0},
adamc@201 247 last = {line = 0,
adamc@201 248 char = 0}} "File starts with 'sig'";
adamc@201 249 [])
adamc@201 250 | _ => absyn
adamc@201 251 end
adamc@201 252 handle LrParser.ParseError => [],
adamc@201 253 print = SourcePrint.p_file}
adamc@56 254
adamc@768 255 fun p_job ({prefix, database, exe, sql, sources, debug, profile,
adamc@768 256 timeout, ffi, link, headers, scripts,
adamc@1171 257 clientToServer, effectful, benignEffectful, clientOnly, serverOnly, jsFuncs, ...} : job) =
adamc@270 258 let
adamc@270 259 open Print.PD
adamc@270 260 open Print
adamc@765 261
adamc@765 262 fun p_ffi name = p_list_sep (box []) (fn (m, s) =>
adamc@765 263 box [string name, space, string m, string ".", string s, newline])
adamc@270 264 in
adamc@274 265 box [if debug then
adamc@274 266 box [string "DEBUG", newline]
adamc@274 267 else
adamc@274 268 box [],
adamc@502 269 if profile then
adamc@502 270 box [string "PROFILE", newline]
adamc@502 271 else
adamc@502 272 box [],
adamc@274 273 case database of
adamc@270 274 NONE => string "No database."
adamc@270 275 | SOME db => string ("Database: " ^ db),
adamc@270 276 newline,
adamc@274 277 string "Exe: ",
adamc@274 278 string exe,
adamc@274 279 newline,
adamc@274 280 case sql of
adamc@274 281 NONE => string "No SQL file."
adamc@274 282 | SOME sql => string ("SQL fle: " ^ sql),
adamc@673 283 newline,
adamc@673 284 string "Timeout: ",
adamc@673 285 string (Int.toString timeout),
adamc@673 286 newline,
adamc@764 287 p_list_sep (box []) (fn s => box [string "Ffi", space, string s, newline]) ffi,
adamc@764 288 p_list_sep (box []) (fn s => box [string "Header", space, string s, newline]) headers,
adamc@766 289 p_list_sep (box []) (fn s => box [string "Script", space, string s, newline]) scripts,
adamc@764 290 p_list_sep (box []) (fn s => box [string "Link", space, string s, newline]) link,
adamc@765 291 p_ffi "ClientToServer" clientToServer,
adamc@765 292 p_ffi "Effectful" effectful,
adamc@1171 293 p_ffi "BenignEffectful" benignEffectful,
adamc@765 294 p_ffi "ClientOnly" clientOnly,
adamc@765 295 p_ffi "ServerOnly" serverOnly,
adamc@765 296 p_list_sep (box []) (fn ((m, s), s') =>
adamc@765 297 box [string "JsFunc", space, string m, string ".", string s,
adamc@765 298 space, string "=", space, string s', newline]) jsFuncs,
adamc@270 299 string "Sources:",
adamc@270 300 p_list string sources,
adamc@270 301 newline]
adamc@270 302 end
adamc@270 303
adamc@270 304 fun trim s =
adamc@270 305 let
adamc@270 306 val (_, s) = Substring.splitl Char.isSpace s
adamc@270 307 val (s, _) = Substring.splitr Char.isSpace s
adamc@270 308 in
adamc@270 309 s
adamc@270 310 end
adamc@270 311
adam@1433 312 val trimS = Substring.string o trim o Substring.full
adam@1433 313
adamc@794 314 structure M = BinaryMapFn(struct
adamc@794 315 type ord_key = string
adamc@794 316 val compare = String.compare
adamc@794 317 end)
adamc@794 318
adamc@1089 319 val pathmap = ref (M.insert (M.empty, "", Config.libUr))
adamc@1089 320
adamc@1089 321 fun addPath (k, v) = pathmap := M.insert (!pathmap, k, v)
adamc@1089 322
adam@1296 323 fun capitalize "" = ""
adam@1296 324 | capitalize s = str (Char.toUpper (String.sub (s, 0))) ^ String.extract (s, 1, NONE)
adam@1296 325
adam@1296 326 fun institutionalizeJob (job : job) =
adam@1483 327 (Settings.setDebug (#debug job);
adam@1483 328 Settings.setUrlPrefix (#prefix job);
adam@1296 329 Settings.setTimeout (#timeout job);
adam@1296 330 Settings.setHeaders (#headers job);
adam@1296 331 Settings.setScripts (#scripts job);
adam@1296 332 Settings.setClientToServer (#clientToServer job);
adam@1296 333 Settings.setEffectful (#effectful job);
adam@1296 334 Settings.setBenignEffectful (#benignEffectful job);
adam@1296 335 Settings.setClientOnly (#clientOnly job);
adam@1296 336 Settings.setServerOnly (#serverOnly job);
adam@1296 337 Settings.setJsFuncs (#jsFuncs job);
adam@1296 338 Settings.setRewriteRules (#rewrites job);
adam@1296 339 Settings.setUrlRules (#filterUrl job);
adam@1296 340 Settings.setMimeRules (#filterMime job);
adam@1465 341 Settings.setRequestHeaderRules (#filterRequest job);
adam@1465 342 Settings.setResponseHeaderRules (#filterResponse job);
adam@1296 343 Option.app Settings.setProtocol (#protocol job);
adam@1296 344 Option.app Settings.setDbms (#dbms job);
adam@1296 345 Settings.setSafeGets (#safeGets job);
adam@1332 346 Settings.setOnError (#onError job);
adam@1408 347 Settings.setMinHeap (#minHeap job);
adam@1408 348 Settings.setSigFile (#sigFile job))
adam@1296 349
adam@1331 350 fun inputCommentableLine inf =
adam@1331 351 Option.map (fn s =>
adam@1331 352 let
adam@1331 353 val s = #1 (Substring.splitl (fn ch => ch <> #"#") (Substring.full s))
adam@1332 354 val s = #1 (Substring.splitr (not o Char.isSpace) s)
adam@1331 355 in
adam@1332 356 Substring.string (if Substring.size s > 0 andalso Char.isSpace (Substring.sub (s, Substring.size s - 1)) then
adam@1433 357 if Substring.size s > 1 andalso Char.isSpace (Substring.sub (s, Substring.size s - 2)) then
adam@1433 358 Substring.trimr 2 s
adam@1433 359 else
adam@1433 360 Substring.trimr 1 s
adam@1332 361 else
adam@1332 362 s)
adam@1331 363 end) (TextIO.inputLine inf)
adam@1331 364
adamc@1082 365 fun parseUrp' accLibs fname =
adam@1296 366 if not (Posix.FileSys.access (fname ^ ".urp", []) orelse Posix.FileSys.access (fname ^ "/lib.urp", []))
adam@1296 367 andalso Posix.FileSys.access (fname ^ ".ur", []) then
adam@1296 368 let
adam@1296 369 val job = {prefix = "/",
adam@1296 370 database = NONE,
adam@1296 371 sources = [fname],
adam@1296 372 exe = fname ^ ".exe",
adam@1296 373 sql = NONE,
adam@1396 374 debug = Settings.getDebug (),
adam@1296 375 profile = false,
adam@1296 376 timeout = 60,
adam@1296 377 ffi = [],
adam@1296 378 link = [],
adam@1296 379 headers = [],
adam@1296 380 scripts = [],
adam@1296 381 clientToServer = [],
adam@1296 382 effectful = [],
adam@1296 383 benignEffectful = [],
adam@1296 384 clientOnly = [],
adam@1296 385 serverOnly = [],
adam@1296 386 jsFuncs = [],
adam@1296 387 rewrites = [{pkind = Settings.Any,
adam@1296 388 kind = Settings.Prefix,
adam@1296 389 from = capitalize (OS.Path.file fname) ^ "/", to = ""}],
adam@1296 390 filterUrl = [],
adam@1296 391 filterMime = [],
adam@1465 392 filterRequest = [],
adam@1465 393 filterResponse = [],
adam@1296 394 protocol = NONE,
adam@1296 395 dbms = NONE,
adam@1296 396 sigFile = NONE,
adam@1296 397 safeGets = [],
adam@1332 398 onError = NONE,
adam@1332 399 minHeap = 0}
adam@1296 400 in
adam@1296 401 institutionalizeJob job;
adam@1296 402 {Job = job, Libs = []}
adam@1296 403 end
adam@1296 404 else
adam@1296 405 let
adam@1296 406 val pathmap = ref (!pathmap)
adam@1296 407 val bigLibs = ref []
adamc@767 408
adam@1296 409 fun pu filename =
adam@1296 410 let
adam@1338 411 val filename = OS.Path.mkAbsolute {path = filename, relativeTo = OS.FileSys.getDir ()}
adam@1338 412
adam@1296 413 val dir = OS.Path.dir filename
adam@1296 414 fun opener () = TextIO.openIn (OS.Path.joinBaseExt {base = filename, ext = SOME "urp"})
adamc@1151 415
adam@1296 416 val inf = opener ()
adamc@1151 417
adam@1296 418 fun hasSpaceLine () =
adam@1331 419 case inputCommentableLine inf of
adam@1296 420 NONE => false
adam@1331 421 | SOME s => s = "debug" orelse s = "profile"
adam@1296 422 orelse CharVector.exists (fn ch => ch = #" " orelse ch = #"\t") s orelse hasSpaceLine ()
adamc@1151 423
adam@1296 424 val hasBlankLine = hasSpaceLine ()
adamc@1151 425
adam@1296 426 val inf = (TextIO.closeIn inf; opener ())
adamc@767 427
adam@1296 428 fun pathify fname =
adam@1296 429 if size fname > 0 andalso String.sub (fname, 0) = #"$" then
adam@1296 430 let
adam@1296 431 val fname' = Substring.extract (fname, 1, NONE)
adam@1296 432 val (befor, after) = Substring.splitl (fn ch => ch <> #"/") fname'
adam@1296 433 in
adam@1340 434 case M.find (!pathmap, Substring.string befor) of
adam@1340 435 NONE => fname
adam@1340 436 | SOME rep => rep ^ Substring.string after
adam@1296 437 end
adam@1296 438 else
adam@1296 439 fname
adam@1296 440
adam@1296 441 fun relify fname =
adamc@794 442 let
adam@1296 443 val fname = pathify fname
adamc@794 444 in
adam@1296 445 OS.Path.concat (dir, fname)
adam@1296 446 handle OS.Path.Path => fname
adamc@794 447 end
adamc@767 448
adam@1296 449 fun libify path =
adam@1296 450 (if Posix.FileSys.access (path ^ ".urp", []) then
adam@1296 451 path
adam@1296 452 else
adam@1296 453 path ^ "/lib")
adam@1296 454 handle SysErr => path
adamc@767 455
adam@1296 456 fun libify' path =
adam@1296 457 (if Posix.FileSys.access (relify path ^ ".urp", []) then
adam@1296 458 path
adam@1296 459 else
adam@1296 460 path ^ "/lib")
adam@1296 461 handle SysErr => path
adamc@767 462
adam@1296 463 val absDir = OS.Path.mkAbsolute {path = dir, relativeTo = OS.FileSys.getDir ()}
adamc@794 464
adam@1296 465 fun relifyA fname =
adam@1296 466 OS.Path.mkAbsolute {path = pathify fname, relativeTo = absDir}
adamc@794 467
adam@1296 468 fun readSources acc =
adam@1331 469 case inputCommentableLine inf of
adam@1296 470 NONE => rev acc
adam@1296 471 | SOME line =>
adam@1296 472 let
adam@1296 473 val acc = if CharVector.all Char.isSpace line then
adam@1296 474 acc
adam@1296 475 else
adam@1296 476 let
adam@1296 477 val fname = String.implode (List.filter (fn x => not (Char.isSpace x))
adam@1296 478 (String.explode line))
adam@1296 479 val fname = relifyA fname
adam@1296 480 in
adam@1296 481 fname :: acc
adam@1296 482 end
adam@1296 483 in
adam@1296 484 readSources acc
adam@1296 485 end
adamc@794 486
adam@1335 487 val prefix = ref (case Settings.getUrlPrefix () of "/" => NONE | s => SOME s)
adam@1296 488 val database = ref (Settings.getDbstring ())
adam@1296 489 val exe = ref (Settings.getExe ())
adam@1296 490 val sql = ref (Settings.getSql ())
adam@1296 491 val debug = ref (Settings.getDebug ())
adam@1296 492 val profile = ref false
adam@1296 493 val timeout = ref NONE
adam@1296 494 val ffi = ref []
adam@1296 495 val link = ref []
adam@1296 496 val headers = ref []
adam@1296 497 val scripts = ref []
adam@1296 498 val clientToServer = ref []
adam@1296 499 val effectful = ref []
adam@1296 500 val benignEffectful = ref []
adam@1296 501 val clientOnly = ref []
adam@1296 502 val serverOnly = ref []
adam@1296 503 val jsFuncs = ref []
adam@1296 504 val rewrites = ref []
adam@1296 505 val url = ref []
adam@1296 506 val mime = ref []
adam@1465 507 val request = ref []
adam@1465 508 val response = ref []
adam@1296 509 val libs = ref []
adam@1296 510 val protocol = ref NONE
adam@1296 511 val dbms = ref NONE
adam@1296 512 val sigFile = ref (Settings.getSigFile ())
adam@1296 513 val safeGets = ref []
adam@1296 514 val onError = ref NONE
adam@1332 515 val minHeap = ref 0
adamc@794 516
adam@1296 517 fun finish sources =
adam@1296 518 let
adam@1296 519 val job = {
adam@1296 520 prefix = Option.getOpt (!prefix, "/"),
adam@1296 521 database = !database,
adam@1296 522 exe = Option.getOpt (!exe, OS.Path.joinBaseExt {base = OS.Path.base filename,
adam@1296 523 ext = SOME "exe"}),
adam@1296 524 sql = !sql,
adam@1296 525 debug = !debug,
adam@1296 526 profile = !profile,
adam@1296 527 timeout = Option.getOpt (!timeout, 60),
adam@1296 528 ffi = rev (!ffi),
adam@1296 529 link = rev (!link),
adam@1296 530 headers = rev (!headers),
adam@1296 531 scripts = rev (!scripts),
adam@1296 532 clientToServer = rev (!clientToServer),
adam@1296 533 effectful = rev (!effectful),
adam@1296 534 benignEffectful = rev (!benignEffectful),
adam@1296 535 clientOnly = rev (!clientOnly),
adam@1296 536 serverOnly = rev (!serverOnly),
adam@1296 537 jsFuncs = rev (!jsFuncs),
adam@1296 538 rewrites = rev (!rewrites),
adam@1296 539 filterUrl = rev (!url),
adam@1296 540 filterMime = rev (!mime),
adam@1465 541 filterRequest = rev (!request),
adam@1465 542 filterResponse = rev (!response),
adam@1296 543 sources = sources,
adam@1296 544 protocol = !protocol,
adam@1296 545 dbms = !dbms,
adam@1296 546 sigFile = !sigFile,
adam@1296 547 safeGets = rev (!safeGets),
adam@1332 548 onError = !onError,
adam@1332 549 minHeap = !minHeap
adam@1296 550 }
adamc@794 551
adam@1296 552 fun mergeO f (old, new) =
adam@1296 553 case (old, new) of
adam@1296 554 (NONE, _) => new
adam@1296 555 | (_, NONE) => old
adam@1296 556 | (SOME v1, SOME v2) => SOME (f (v1, v2))
adamc@794 557
adam@1296 558 fun same desc = mergeO (fn (x : string, y) =>
adam@1296 559 (if x = y then
adam@1296 560 ()
adam@1296 561 else
adam@1296 562 ErrorMsg.error ("Multiple "
adam@1296 563 ^ desc ^ " values that don't agree");
adam@1296 564 x))
adamc@794 565
adam@1296 566 fun merge (old : job, new : job) = {
adam@1296 567 prefix = #prefix old,
adam@1296 568 database = mergeO (fn (old, _) => old) (#database old, #database new),
adam@1296 569 exe = #exe old,
adam@1296 570 sql = #sql old,
adam@1296 571 debug = #debug old orelse #debug new,
adam@1296 572 profile = #profile old orelse #profile new,
adam@1296 573 timeout = #timeout old,
adam@1296 574 ffi = #ffi old @ #ffi new,
adam@1296 575 link = #link old @ #link new,
adam@1296 576 headers = #headers old @ #headers new,
adam@1296 577 scripts = #scripts old @ #scripts new,
adam@1296 578 clientToServer = #clientToServer old @ #clientToServer new,
adam@1296 579 effectful = #effectful old @ #effectful new,
adam@1296 580 benignEffectful = #benignEffectful old @ #benignEffectful new,
adam@1296 581 clientOnly = #clientOnly old @ #clientOnly new,
adam@1296 582 serverOnly = #serverOnly old @ #serverOnly new,
adam@1296 583 jsFuncs = #jsFuncs old @ #jsFuncs new,
adam@1296 584 rewrites = #rewrites old @ #rewrites new,
adam@1296 585 filterUrl = #filterUrl old @ #filterUrl new,
adam@1296 586 filterMime = #filterMime old @ #filterMime new,
adam@1465 587 filterRequest = #filterRequest old @ #filterRequest new,
adam@1465 588 filterResponse = #filterResponse old @ #filterResponse new,
adam@1296 589 sources = #sources new
adam@1296 590 @ List.filter (fn s => List.all (fn s' => s' <> s) (#sources new))
adam@1296 591 (#sources old),
adam@1296 592 protocol = mergeO #2 (#protocol old, #protocol new),
adam@1296 593 dbms = mergeO #2 (#dbms old, #dbms new),
adam@1296 594 sigFile = mergeO #2 (#sigFile old, #sigFile new),
adam@1296 595 safeGets = #safeGets old @ #safeGets new,
adam@1332 596 onError = mergeO #2 (#onError old, #onError new),
adam@1332 597 minHeap = Int.max (#minHeap old, #minHeap new)
adam@1296 598 }
adamc@794 599 in
adam@1296 600 if accLibs then
adam@1296 601 foldr (fn (job', job) => merge (job, job')) job (!libs)
adam@1296 602 else
adam@1296 603 job
adamc@794 604 end
adamc@794 605
adam@1296 606 fun parsePkind s =
adam@1296 607 case s of
adam@1296 608 "all" => Settings.Any
adam@1296 609 | "url" => Settings.Url
adam@1296 610 | "table" => Settings.Table
adam@1296 611 | "sequence" => Settings.Sequence
adam@1296 612 | "view" => Settings.View
adam@1296 613 | "relation" => Settings.Relation
adam@1296 614 | "cookie" => Settings.Cookie
adam@1296 615 | "style" => Settings.Style
adam@1296 616 | _ => (ErrorMsg.error "Bad path kind spec";
adam@1296 617 Settings.Any)
adam@1296 618
adam@1296 619 fun parseFrom s =
adam@1296 620 if size s > 1 andalso String.sub (s, size s - 2) = #"/" andalso String.sub (s, size s - 1) = #"*" then
adam@1296 621 (Settings.Prefix, String.substring (s, 0, size s - 1))
adam@1296 622 else
adam@1296 623 (Settings.Exact, s)
adam@1296 624
adam@1296 625 fun parseFkind s =
adam@1296 626 case s of
adam@1296 627 "url" => url
adam@1296 628 | "mime" => mime
adam@1465 629 | "requestHeader" => request
adam@1465 630 | "responseHeader" => response
adam@1296 631 | _ => (ErrorMsg.error "Bad filter kind";
adam@1296 632 url)
adam@1296 633
adam@1296 634 fun parsePattern s =
adam@1296 635 if size s > 0 andalso String.sub (s, size s - 1) = #"*" then
adam@1296 636 (Settings.Prefix, String.substring (s, 0, size s - 1))
adam@1296 637 else
adam@1296 638 (Settings.Exact, s)
adam@1296 639
adam@1296 640 fun read () =
adam@1331 641 case inputCommentableLine inf of
adam@1296 642 NONE => finish []
adam@1331 643 | SOME "" => finish (readSources [])
adam@1296 644 | SOME line =>
adam@1296 645 let
adam@1296 646 val (cmd, arg) = Substring.splitl (fn x => not (Char.isSpace x)) (Substring.full line)
adam@1296 647 val cmd = Substring.string (trim cmd)
adam@1296 648 val arg = Substring.string (trim arg)
adam@1296 649
adam@1296 650 fun ffiS () =
adam@1296 651 case String.fields (fn ch => ch = #".") arg of
adam@1296 652 [m, x] => (m, x)
adam@1296 653 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func");
adam@1296 654 ("", ""))
adam@1296 655
adam@1296 656 fun ffiM () =
adam@1296 657 case String.fields (fn ch => ch = #"=") arg of
adam@1296 658 [f, s] =>
adam@1433 659 let
adam@1433 660 val f = trimS f
adam@1433 661 val s = trimS s
adam@1433 662 in
adam@1433 663 case String.fields (fn ch => ch = #".") f of
adam@1433 664 [m, x] => ((m, x), s)
adam@1433 665 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func=func'");
adam@1433 666 (("", ""), ""))
adam@1433 667 end
adam@1296 668 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func=func'");
adam@1296 669 (("", ""), ""))
adam@1296 670 in
adam@1296 671 case cmd of
adam@1336 672 "prefix" => prefix := SOME arg
adam@1296 673 | "database" =>
adam@1296 674 (case !database of
adam@1296 675 NONE => database := SOME arg
adam@1296 676 | SOME _ => ())
adam@1296 677 | "dbms" =>
adam@1296 678 (case !dbms of
adam@1296 679 NONE => dbms := SOME arg
adam@1296 680 | SOME _ => ())
adam@1296 681 | "sigfile" =>
adam@1296 682 (case !sigFile of
adam@1296 683 NONE => sigFile := SOME arg
adam@1296 684 | SOME _ => ())
adam@1296 685 | "exe" =>
adam@1296 686 (case !exe of
adam@1296 687 NONE => exe := SOME (relify arg)
adam@1296 688 | SOME _ => ())
adam@1296 689 | "sql" =>
adam@1296 690 (case !sql of
adam@1296 691 NONE => sql := SOME (relify arg)
adam@1296 692 | SOME _ => ())
adam@1296 693 | "debug" => debug := true
adam@1296 694 | "profile" => profile := true
adam@1296 695 | "timeout" =>
adam@1296 696 (case !timeout of
adam@1296 697 NONE => ()
adam@1296 698 | SOME _ => ErrorMsg.error "Duplicate 'timeout' directive";
adam@1296 699 timeout := SOME (valOf (Int.fromString arg)))
adam@1296 700 | "ffi" => ffi := relify arg :: !ffi
adam@1296 701 | "link" => let
adam@1296 702 val arg = if size arg >= 1
adam@1296 703 andalso String.sub (arg, 0) = #"-" then
adam@1296 704 arg
adam@1296 705 else
adam@1296 706 relifyA arg
adam@1296 707 in
adam@1296 708 link := arg :: !link
adam@1296 709 end
adam@1296 710 | "include" => headers := relifyA arg :: !headers
adam@1296 711 | "script" => scripts := arg :: !scripts
adam@1296 712 | "clientToServer" => clientToServer := ffiS () :: !clientToServer
adam@1296 713 | "safeGet" => safeGets := arg :: !safeGets
adam@1296 714 | "effectful" => effectful := ffiS () :: !effectful
adam@1296 715 | "benignEffectful" => benignEffectful := ffiS () :: !benignEffectful
adam@1296 716 | "clientOnly" => clientOnly := ffiS () :: !clientOnly
adam@1296 717 | "serverOnly" => serverOnly := ffiS () :: !serverOnly
adam@1296 718 | "jsFunc" => jsFuncs := ffiM () :: !jsFuncs
adam@1296 719 | "rewrite" =>
adam@1296 720 let
adam@1296 721 fun doit (pkind, from, to) =
adam@1296 722 let
adam@1296 723 val pkind = parsePkind pkind
adam@1296 724 val (kind, from) = parseFrom from
adam@1296 725 in
adam@1296 726 rewrites := {pkind = pkind, kind = kind, from = from, to = to} :: !rewrites
adam@1296 727 end
adam@1296 728 in
adam@1296 729 case String.tokens Char.isSpace arg of
adam@1296 730 [pkind, from, to] => doit (pkind, from, to)
adam@1296 731 | [pkind, from] => doit (pkind, from, "")
adam@1296 732 | _ => ErrorMsg.error "Bad 'rewrite' syntax"
adam@1296 733 end
adam@1296 734 | "allow" =>
adam@1296 735 (case String.tokens Char.isSpace arg of
adam@1296 736 [fkind, pattern] =>
adam@1296 737 let
adam@1296 738 val fkind = parseFkind fkind
adam@1296 739 val (kind, pattern) = parsePattern pattern
adam@1296 740 in
adam@1296 741 fkind := {action = Settings.Allow, kind = kind, pattern = pattern} :: !fkind
adam@1296 742 end
adam@1296 743 | _ => ErrorMsg.error "Bad 'allow' syntax")
adam@1296 744 | "deny" =>
adam@1296 745 (case String.tokens Char.isSpace arg of
adam@1296 746 [fkind, pattern] =>
adam@1296 747 let
adam@1296 748 val fkind = parseFkind fkind
adam@1296 749 val (kind, pattern) = parsePattern pattern
adam@1296 750 in
adam@1296 751 fkind := {action = Settings.Deny, kind = kind, pattern = pattern} :: !fkind
adam@1296 752 end
adam@1296 753 | _ => ErrorMsg.error "Bad 'deny' syntax")
adam@1296 754 | "library" => if accLibs then
adam@1296 755 libs := pu (libify (relify arg)) :: !libs
adam@1296 756 else
adam@1296 757 bigLibs := libify' arg :: !bigLibs
adam@1296 758 | "path" =>
adam@1296 759 (case String.fields (fn ch => ch = #"=") arg of
adam@1338 760 [n, v] => ((pathmap := M.insert (!pathmap, n, OS.Path.mkAbsolute {path = v, relativeTo = dir}))
adam@1338 761 handle OS.Path.Path => ErrorMsg.error "Invalid 'path' directory argument")
adam@1296 762 | _ => ErrorMsg.error "path argument not of the form name=value'")
adam@1296 763 | "onError" =>
adam@1296 764 (case String.fields (fn ch => ch = #".") arg of
adam@1296 765 m1 :: (fs as _ :: _) =>
adam@1296 766 onError := SOME (m1, List.take (fs, length fs - 1), List.last fs)
adam@1296 767 | _ => ErrorMsg.error "invalid 'onError' argument")
adam@1307 768 | "limit" =>
adam@1307 769 (case String.fields Char.isSpace arg of
adam@1307 770 [class, num] =>
adam@1307 771 (case Int.fromString num of
adam@1307 772 NONE => ErrorMsg.error ("invalid limit number '" ^ num ^ "'")
adam@1307 773 | SOME n =>
adam@1307 774 if n < 0 then
adam@1307 775 ErrorMsg.error ("invalid limit number '" ^ num ^ "'")
adam@1307 776 else
adam@1307 777 Settings.addLimit (class, n))
adam@1307 778 | _ => ErrorMsg.error "invalid 'limit' arguments")
adam@1332 779 | "minHeap" =>
adam@1332 780 (case Int.fromString arg of
adam@1332 781 NONE => ErrorMsg.error ("invalid min heap '" ^ arg ^ "'")
adam@1332 782 | SOME n => minHeap := n)
adam@1393 783 | "alwaysInline" => Settings.addAlwaysInline arg
adam@1478 784 | "noXsrfProtection" => Settings.addNoXsrfProtection arg
adam@1296 785
adam@1296 786 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'");
adam@1296 787 read ()
adam@1296 788 end
adam@1296 789
adam@1296 790 val job = if hasBlankLine then
adam@1296 791 read ()
adam@1296 792 else
adam@1296 793 finish (readSources [])
adam@1296 794 in
adam@1296 795 TextIO.closeIn inf;
adam@1296 796 institutionalizeJob job;
adam@1296 797 job
adam@1296 798 end
adam@1296 799 in
adam@1296 800 {Job = pu fname, Libs = !bigLibs}
adam@1296 801 end
adamc@767 802
adamc@1082 803 fun p_job' {Job = j, Libs = _ : string list} = p_job j
adamc@1082 804
adamc@270 805 val parseUrp = {
adamc@1083 806 func = #Job o parseUrp' true,
adamc@270 807 print = p_job
adamc@270 808 }
adamc@270 809
adamc@1082 810 val parseUrp' = {
adamc@1083 811 func = parseUrp' false,
adamc@1082 812 print = p_job'
adamc@1082 813 }
adamc@1082 814
adamc@270 815 val toParseJob = transform parseUrp "parseJob"
adamc@1082 816 val toParseJob' = transform parseUrp' "parseJob'"
adamc@1082 817
adamc@1082 818 fun op o (tr2 : ('b, 'c) transform, tr1 : ('a, 'b) transform) = {
adamc@1082 819 func = fn input => case #func tr1 input of
adamc@1082 820 NONE => NONE
adamc@1082 821 | SOME v => #func tr2 v,
adamc@1082 822 print = #print tr2,
adamc@1082 823 time = fn (input, pmap) => let
adamc@1082 824 val (ro, pmap) = #time tr1 (input, pmap)
adamc@1082 825 in
adamc@1082 826 case ro of
adamc@1082 827 NONE => (NONE, pmap)
adamc@1082 828 | SOME v => #time tr2 (v, pmap)
adamc@1082 829 end
adamc@1082 830 }
adamc@270 831
adamc@1090 832 structure SM = BinaryMapFn(struct
adamc@1090 833 type ord_key = string
adamc@1090 834 val compare = String.compare
adamc@1090 835 end)
adamc@1090 836
adamc@1090 837 val moduleRoots = ref ([] : (string * string) list)
adamc@1090 838 fun addModuleRoot (k, v) = moduleRoots := (k, v) :: !moduleRoots
adamc@1090 839
adamc@1090 840 structure SS = BinarySetFn(struct
adamc@1090 841 type ord_key = string
adamc@1090 842 val compare = String.compare
adamc@1090 843 end)
adamc@1090 844
adamc@201 845 val parse = {
adam@1294 846 func = fn {database, sources = fnames, ffi, onError, ...} : job =>
adamc@201 847 let
adamc@1090 848 val mrs = !moduleRoots
adamc@1090 849
adamc@834 850 val anyErrors = ref false
adamc@834 851 fun checkErrors () = anyErrors := (!anyErrors orelse ErrorMsg.anyErrors ())
adam@1343 852 fun nameOf fname =
adam@1343 853 let
adam@1343 854 val fname = OS.Path.file fname
adam@1343 855 val fst = if size fname = 0 then #"!" else String.sub (fname, 0)
adam@1343 856 in
adam@1343 857 if not (Char.isAlpha fst) then
adam@1343 858 ErrorMsg.error ("Filename doesn't start with letter: " ^ fname)
adam@1343 859 else if CharVector.exists (fn ch => not (Char.isAlphaNum ch) andalso ch <> #"_") fname then
adam@1343 860 ErrorMsg.error ("Filename contains a character that isn't alphanumeric or underscore: " ^ fname)
adam@1343 861 else
adam@1343 862 ();
adam@1343 863 capitalize fname
adam@1343 864 end
adamc@109 865
adamc@764 866 fun parseFfi fname =
adamc@764 867 let
adamc@764 868 val mname = nameOf fname
adamc@764 869 val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
adamc@764 870
adamc@764 871 val loc = {file = urs,
adamc@764 872 first = ErrorMsg.dummyPos,
adamc@764 873 last = ErrorMsg.dummyPos}
adamc@764 874
adamc@764 875 val sgn = (Source.SgnConst (#func parseUrs urs), loc)
adamc@764 876 in
adamc@834 877 checkErrors ();
adamc@764 878 (Source.DFfiStr (mname, sgn), loc)
adamc@764 879 end
adamc@764 880
adamc@1090 881 val defed = ref SS.empty
adamc@1092 882 val fulls = ref SS.empty
adamc@1090 883
adamc@201 884 fun parseOne fname =
adamc@201 885 let
adamc@201 886 val mname = nameOf fname
adamc@244 887 val ur = OS.Path.joinBaseExt {base = fname, ext = SOME "ur"}
adamc@244 888 val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
adamc@56 889
adamc@201 890 val sgnO =
adamc@244 891 if Posix.FileSys.access (urs, []) then
adamc@244 892 SOME (Source.SgnConst (#func parseUrs urs),
adamc@244 893 {file = urs,
adamc@201 894 first = ErrorMsg.dummyPos,
adamc@201 895 last = ErrorMsg.dummyPos})
adamc@834 896 before checkErrors ()
adamc@201 897 else
adamc@201 898 NONE
adamc@56 899
adamc@244 900 val loc = {file = ur,
adamc@201 901 first = ErrorMsg.dummyPos,
adamc@201 902 last = ErrorMsg.dummyPos}
adamc@56 903
adamc@244 904 val ds = #func parseUr ur
adamc@1090 905 val d = (Source.DStr (mname, sgnO, (Source.StrConst ds, loc)), loc)
adamc@1090 906
adamc@1126 907 val fname = OS.Path.mkCanonical fname
adamc@1090 908 val d = case List.find (fn (root, name) =>
adamc@1090 909 String.isPrefix (root ^ "/") fname) mrs of
adamc@1090 910 NONE => d
adamc@1090 911 | SOME (root, name) =>
adamc@1090 912 let
adamc@1090 913 val fname = String.extract (fname, size root + 1, NONE)
adamc@1090 914 val pieces = name :: String.tokens (fn ch => ch = #"/") fname
adamc@1090 915 val pieces = List.filter (fn s => size s > 0
adamc@1090 916 andalso Char.isAlpha (String.sub (s, 0)))
adamc@1090 917 pieces
adamc@1090 918 val pieces = map capitalize pieces
adamc@1092 919 val full = String.concatWith "." pieces
adamc@1090 920
adamc@1090 921 fun makeD prefix pieces =
adamc@1090 922 case pieces of
adamc@1090 923 [] => (ErrorMsg.error "Empty module path";
adamc@1090 924 (Source.DStyle "Boo", loc))
adamc@1090 925 | [_] => d
adamc@1090 926 | piece :: pieces =>
adamc@1090 927 let
adamc@1146 928 val this = case prefix of
adamc@1146 929 "" => piece
adamc@1146 930 | _ => prefix ^ "." ^ piece
adamc@1090 931 val old = SS.member (!defed, this)
adamc@1146 932
adamc@1146 933 fun notThere (ch, s) =
adamc@1146 934 Substring.isEmpty (#2 (Substring.splitl
adamc@1146 935 (fn ch' => ch' <> ch) s))
adamc@1146 936
adamc@1146 937 fun simOpen () =
adamc@1146 938 SS.foldl (fn (full, ds) =>
adamc@1146 939 if String.isPrefix (this ^ ".") full
adamc@1146 940 andalso notThere (#".",
adamc@1146 941 Substring.extract (full,
adamc@1146 942 size
adamc@1146 943 this + 1,
adamc@1146 944 NONE)) then
adamc@1146 945 let
adamc@1146 946 val parts = String.tokens
adamc@1146 947 (fn ch => ch = #".") full
adamc@1146 948
adamc@1146 949 val part = List.last parts
adamc@1146 950
adamc@1146 951 val imp = if length parts >= 2 then
adamc@1146 952 (Source.StrProj
adamc@1146 953 ((Source.StrVar
adamc@1146 954 (List.nth (parts,
adamc@1146 955 length
adamc@1146 956 parts
adamc@1146 957 - 2)),
adamc@1146 958 loc),
adamc@1146 959 part), loc)
adamc@1146 960 else
adamc@1146 961 (Source.StrVar part, loc)
adamc@1146 962 in
adamc@1146 963 (Source.DStr (part, NONE, imp),
adamc@1146 964 loc) :: ds
adamc@1146 965 end
adamc@1146 966 else
adamc@1146 967 ds) [] (!fulls)
adamc@1090 968 in
adamc@1090 969 defed := SS.add (!defed, this);
adamc@1090 970 (Source.DStr (piece, NONE,
adamc@1090 971 (Source.StrConst (if old then
adamc@1146 972 simOpen ()
adamc@1146 973 @ [makeD this pieces]
adamc@1090 974 else
adamc@1146 975 [makeD this pieces]), loc)),
adamc@1090 976 loc)
adamc@1090 977 end
adamc@1090 978 in
adamc@1092 979 if SS.member (!fulls, full) then
adamc@1092 980 ErrorMsg.error ("Rooted module " ^ full ^ " has multiple versions.")
adamc@1092 981 else
adamc@1092 982 ();
adamc@1146 983
adamc@1090 984 makeD "" pieces
adamc@1146 985 before ignore (foldl (fn (new, path) =>
adamc@1146 986 let
adamc@1146 987 val new' = case path of
adamc@1146 988 "" => new
adamc@1146 989 | _ => path ^ "." ^ new
adamc@1146 990 in
adamc@1146 991 fulls := SS.add (!fulls, new');
adamc@1146 992 new'
adamc@1146 993 end) "" pieces)
adamc@1090 994 end
adamc@201 995 in
adamc@834 996 checkErrors ();
adamc@1090 997 d
adamc@201 998 end
adamc@56 999
adamc@764 1000 val dsFfi = map parseFfi ffi
adamc@201 1001 val ds = map parseOne fnames
adamc@1090 1002 val loc = ErrorMsg.dummySpan
adamc@201 1003 in
adamc@834 1004 if !anyErrors then
adamc@834 1005 ErrorMsg.error "Parse failure"
adamc@834 1006 else
adamc@834 1007 ();
adamc@834 1008
adamc@201 1009 let
adamc@1126 1010 val final = List.last fnames
adamc@1126 1011 val final = case List.find (fn (root, name) =>
adamc@1126 1012 String.isPrefix (root ^ "/") final) mrs of
adamc@1126 1013 NONE => (Source.StrVar (nameOf final), loc)
adamc@1126 1014 | SOME (root, name) =>
adamc@1126 1015 let
adamc@1126 1016 val m = (Source.StrVar name, loc)
adamc@1126 1017 val final = String.extract (final, size root + 1, NONE)
adamc@1264 1018 val fields = String.fields (fn ch => ch = #"/") final
adamc@1264 1019 val fields = List.filter (fn s => size s = 0
adamc@1264 1020 orelse not (Char.isDigit (String.sub (s, 0))))
adamc@1264 1021 fields
adamc@1126 1022 in
adamc@1126 1023 foldl (fn (x, m) => (Source.StrProj (m, capitalize x), loc))
adamc@1264 1024 m fields
adamc@1126 1025 end
adamc@271 1026
adamc@764 1027 val ds = dsFfi @ ds
adamc@1126 1028 @ [(Source.DExport final, loc)]
adamc@1090 1029
adamc@1090 1030 val ds = case database of
adamc@1090 1031 NONE => ds
adamc@1090 1032 | SOME s => (Source.DDatabase s, loc) :: ds
adam@1294 1033
adam@1294 1034 val ds = case onError of
adam@1294 1035 NONE => ds
adam@1294 1036 | SOME v => ds @ [(Source.DOnError v, loc)]
adamc@201 1037 in
adamc@1090 1038 ds
adamc@201 1039 end handle Empty => ds
adamc@201 1040 end,
adamc@201 1041 print = SourcePrint.p_file
adamc@201 1042 }
adamc@56 1043
adamc@270 1044 val toParse = transform parse "parse" o toParseJob
adamc@38 1045
adamc@378 1046 fun libFile s = OS.Path.joinDirFile {dir = Config.libUr,
adamc@378 1047 file = s}
adamc@378 1048 fun clibFile s = OS.Path.joinDirFile {dir = Config.libC,
adamc@378 1049 file = s}
adamc@378 1050
adamc@201 1051 val elaborate = {
adamc@201 1052 func = fn file => let
adamc@378 1053 val basis = #func parseUrs (libFile "basis.urs")
adamc@378 1054 val topSgn = #func parseUrs (libFile "top.urs")
adamc@378 1055 val topStr = #func parseUr (libFile "top.ur")
adamc@201 1056 in
adamc@325 1057 Elaborate.elabFile basis topStr topSgn ElabEnv.empty file
adamc@201 1058 end,
adamc@201 1059 print = ElabPrint.p_file ElabEnv.empty
adamc@201 1060 }
adamc@5 1061
adamc@270 1062 val toElaborate = transform elaborate "elaborate" o toParse
adamc@201 1063
adamc@448 1064 val unnest = {
adamc@448 1065 func = Unnest.unnest,
adamc@448 1066 print = ElabPrint.p_file ElabEnv.empty
adamc@448 1067 }
adamc@448 1068
adamc@448 1069 val toUnnest = transform unnest "unnest" o toElaborate
adamc@448 1070
adamc@313 1071 val termination = {
adamc@313 1072 func = (fn file => (Termination.check file; file)),
adamc@313 1073 print = ElabPrint.p_file ElabEnv.empty
adamc@313 1074 }
adamc@313 1075
adamc@448 1076 val toTermination = transform termination "termination" o toUnnest
adamc@313 1077
adamc@201 1078 val explify = {
adamc@201 1079 func = Explify.explify,
adamc@201 1080 print = ExplPrint.p_file ExplEnv.empty
adamc@201 1081 }
adamc@201 1082
adamc@625 1083 val toExplify = transform explify "explify" o toUnnest
adamc@201 1084
adamc@201 1085 val corify = {
adamc@201 1086 func = Corify.corify,
adamc@201 1087 print = CorePrint.p_file CoreEnv.empty
adamc@201 1088 }
adamc@201 1089
adamc@270 1090 val toCorify = transform corify "corify" o toExplify
adamc@201 1091
adamc@482 1092 (*val reduce_local = {
adamc@482 1093 func = ReduceLocal.reduce,
adamc@482 1094 print = CorePrint.p_file CoreEnv.empty
adamc@482 1095 }
adamc@482 1096
adamc@482 1097 val toReduce_local = transform reduce_local "reduce_local" o toCorify*)
adamc@482 1098
adamc@443 1099 val especialize = {
adamc@443 1100 func = ESpecialize.specialize,
adamc@443 1101 print = CorePrint.p_file CoreEnv.empty
adamc@443 1102 }
adamc@443 1103
adamc@454 1104 val core_untangle = {
adamc@454 1105 func = CoreUntangle.untangle,
adamc@454 1106 print = CorePrint.p_file CoreEnv.empty
adamc@454 1107 }
adamc@454 1108
adamc@794 1109 val toCore_untangle = transform core_untangle "core_untangle" o toCorify
adamc@454 1110
adamc@202 1111 val shake = {
adamc@202 1112 func = Shake.shake,
adamc@202 1113 print = CorePrint.p_file CoreEnv.empty
adamc@202 1114 }
adamc@39 1115
adamc@454 1116 val toShake1 = transform shake "shake1" o toCore_untangle
adamc@110 1117
adam@1362 1118 val toEspecialize1' = transform especialize "especialize1'" o toShake1
adam@1362 1119 val toShake1' = transform shake "shake1'" o toEspecialize1'
adam@1362 1120
adamc@607 1121 val rpcify = {
adamc@607 1122 func = Rpcify.frob,
adamc@607 1123 print = CorePrint.p_file CoreEnv.empty
adamc@607 1124 }
adamc@607 1125
adam@1362 1126 val toRpcify = transform rpcify "rpcify" o toShake1'
adamc@607 1127
adamc@642 1128 val toCore_untangle2 = transform core_untangle "core_untangle2" o toRpcify
adamc@642 1129 val toShake2 = transform shake "shake2" o toCore_untangle2
adamc@1181 1130
adamc@1186 1131 val toEspecialize1 = transform especialize "especialize1" o toShake2
adamc@1181 1132
adamc@1062 1133 val toCore_untangle3 = transform core_untangle "core_untangle3" o toEspecialize1
adamc@1062 1134 val toShake3 = transform shake "shake3" o toCore_untangle3
adamc@642 1135
adamc@202 1136 val tag = {
adamc@202 1137 func = Tag.tag,
adamc@202 1138 print = CorePrint.p_file CoreEnv.empty
adamc@202 1139 }
adamc@193 1140
adamc@1062 1141 val toTag = transform tag "tag" o toShake3
adamc@20 1142
adamc@202 1143 val reduce = {
adamc@202 1144 func = Reduce.reduce,
adamc@202 1145 print = CorePrint.p_file CoreEnv.empty
adamc@202 1146 }
adamc@25 1147
adamc@692 1148 val toReduce = transform reduce "reduce" o toTag
adamc@23 1149
adamc@1186 1150 val toShakey = transform shake "shakey" o toReduce
adamc@1186 1151
adamc@1186 1152 val unpoly = {
adamc@1186 1153 func = Unpoly.unpoly,
adamc@1186 1154 print = CorePrint.p_file CoreEnv.empty
adamc@1186 1155 }
adamc@1186 1156
adamc@1186 1157 val toUnpoly = transform unpoly "unpoly" o toShakey
adamc@315 1158
adamc@202 1159 val specialize = {
adamc@202 1160 func = Specialize.specialize,
adamc@202 1161 print = CorePrint.p_file CoreEnv.empty
adamc@202 1162 }
adamc@132 1163
adamc@1186 1164 val toSpecialize = transform specialize "specialize" o toUnpoly
adamc@131 1165
adamc@1062 1166 val toShake4 = transform shake "shake4" o toSpecialize
adamc@133 1167
adamc@1062 1168 val toEspecialize2 = transform especialize "especialize2" o toShake4
adamc@1272 1169 val toShake4' = transform shake "shake4'" o toEspecialize2
adamc@1272 1170 val toUnpoly2 = transform unpoly "unpoly2" o toShake4'
adamc@1276 1171 val toSpecialize2 = transform specialize "specialize2" o toUnpoly2
adamc@1276 1172 val toShake4'' = transform shake "shake4'" o toSpecialize2
adamc@1272 1173 val toEspecialize3 = transform especialize "especialize3" o toShake4''
adamc@794 1174
adamc@1272 1175 val toReduce2 = transform reduce "reduce2" o toEspecialize3
adamc@898 1176
adamc@1062 1177 val toShake5 = transform shake "shake5" o toReduce2
adamc@794 1178
adamc@692 1179 val marshalcheck = {
adamc@692 1180 func = (fn file => (MarshalCheck.check file; file)),
adamc@692 1181 print = CorePrint.p_file CoreEnv.empty
adamc@692 1182 }
adamc@692 1183
adamc@1062 1184 val toMarshalcheck = transform marshalcheck "marshalcheck" o toShake5
adamc@692 1185
adamc@732 1186 val effectize = {
adamc@732 1187 func = Effective.effectize,
adamc@732 1188 print = CorePrint.p_file CoreEnv.empty
adamc@732 1189 }
adamc@732 1190
adamc@732 1191 val toEffectize = transform effectize "effectize" o toMarshalcheck
adamc@732 1192
adamc@1170 1193 val css = {
adamc@1170 1194 func = Css.summarize,
adamc@1170 1195 print = fn _ => Print.box []
adamc@1170 1196 }
adamc@1170 1197
adamc@1170 1198 val toCss = transform css "css" o toShake5
adamc@1170 1199
adamc@202 1200 val monoize = {
adamc@202 1201 func = Monoize.monoize CoreEnv.empty,
adamc@202 1202 print = MonoPrint.p_file MonoEnv.empty
adamc@202 1203 }
adamc@134 1204
adamc@732 1205 val toMonoize = transform monoize "monoize" o toEffectize
adamc@96 1206
adamc@202 1207 val mono_opt = {
adamc@910 1208 func = MonoOpt.optimize,
adamc@202 1209 print = MonoPrint.p_file MonoEnv.empty
adamc@202 1210 }
adamc@29 1211
adamc@270 1212 val toMono_opt1 = transform mono_opt "mono_opt1" o toMonoize
adamc@5 1213
adamc@202 1214 val untangle = {
adamc@202 1215 func = Untangle.untangle,
adamc@202 1216 print = MonoPrint.p_file MonoEnv.empty
adamc@202 1217 }
adamc@1 1218
adamc@270 1219 val toUntangle = transform untangle "untangle" o toMono_opt1
adamc@38 1220
adamc@202 1221 val mono_reduce = {
adamc@202 1222 func = MonoReduce.reduce,
adamc@202 1223 print = MonoPrint.p_file MonoEnv.empty
adamc@202 1224 }
adamc@16 1225
adamc@270 1226 val toMono_reduce = transform mono_reduce "mono_reduce" o toUntangle
adamc@39 1227
adamc@202 1228 val mono_shake = {
adamc@202 1229 func = MonoShake.shake,
adamc@202 1230 print = MonoPrint.p_file MonoEnv.empty
adamc@202 1231 }
adamc@110 1232
adamc@270 1233 val toMono_shake = transform mono_shake "mono_shake1" o toMono_reduce
adamc@193 1234
adamc@572 1235 val toMono_opt2 = transform mono_opt "mono_opt2" o toMono_shake
adamc@572 1236
adamc@1200 1237 val iflow = {
adamc@1235 1238 func = (fn file => (if !doIflow then Iflow.check file else (); file)),
adamc@1200 1239 print = MonoPrint.p_file MonoEnv.empty
adamc@1200 1240 }
adamc@1200 1241
adamc@1200 1242 val toIflow = transform iflow "iflow" o toMono_opt2
adamc@1200 1243
adamc@567 1244 val jscomp = {
adamc@567 1245 func = JsComp.process,
adamc@567 1246 print = MonoPrint.p_file MonoEnv.empty
adamc@567 1247 }
adamc@567 1248
adamc@1200 1249 val toJscomp = transform jscomp "jscomp" o toIflow
adamc@567 1250
adamc@910 1251 val toMono_opt3 = transform mono_opt "mono_opt3" o toJscomp
adamc@20 1252
adamc@506 1253 val fuse = {
adamc@506 1254 func = Fuse.fuse,
adamc@506 1255 print = MonoPrint.p_file MonoEnv.empty
adamc@506 1256 }
adamc@506 1257
adamc@572 1258 val toFuse = transform fuse "fuse" o toMono_opt3
adamc@506 1259
adamc@506 1260 val toUntangle2 = transform untangle "untangle2" o toFuse
adamc@506 1261
adamc@601 1262 val toMono_reduce2 = transform mono_reduce "mono_reduce2" o toUntangle2
adamc@601 1263 val toMono_shake2 = transform mono_shake "mono_shake2" o toMono_reduce2
adamc@916 1264 val toMono_opt4 = transform mono_opt "mono_opt4" o toMono_shake2
adamc@1017 1265 val toMono_reduce3 = transform mono_reduce "mono_reduce3" o toMono_opt4
adamc@1185 1266 val toFuse2 = transform fuse "fuse2" o toMono_reduce3
adamc@916 1267 val toUntangle3 = transform untangle "untangle3" o toFuse2
adamc@916 1268 val toMono_shake3 = transform mono_shake "mono_shake3" o toUntangle3
adamc@506 1269
adamc@377 1270 val pathcheck = {
adamc@377 1271 func = (fn file => (PathCheck.check file; file)),
adamc@377 1272 print = MonoPrint.p_file MonoEnv.empty
adamc@377 1273 }
adamc@377 1274
adamc@916 1275 val toPathcheck = transform pathcheck "pathcheck" o toMono_shake3
adamc@377 1276
adamc@202 1277 val cjrize = {
adamc@202 1278 func = Cjrize.cjrize,
adamc@202 1279 print = CjrPrint.p_file CjrEnv.empty
adamc@202 1280 }
adamc@23 1281
adamc@377 1282 val toCjrize = transform cjrize "cjrize" o toPathcheck
adamc@29 1283
adamc@643 1284 val scriptcheck = {
adamc@643 1285 func = ScriptCheck.classify,
adamc@643 1286 print = CjrPrint.p_file CjrEnv.empty
adamc@643 1287 }
adamc@643 1288
adamc@643 1289 val toScriptcheck = transform scriptcheck "scriptcheck" o toCjrize
adamc@643 1290
adamc@282 1291 val prepare = {
adamc@282 1292 func = Prepare.prepare,
adamc@282 1293 print = CjrPrint.p_file CjrEnv.empty
adamc@282 1294 }
adamc@282 1295
adamc@643 1296 val toPrepare = transform prepare "prepare" o toScriptcheck
adamc@282 1297
adamc@879 1298 val checknest = {
adamc@879 1299 func = fn f => if #supportsNestedPrepared (Settings.currentDbms ()) then f else Checknest.annotate f,
adamc@879 1300 print = CjrPrint.p_file CjrEnv.empty
adamc@879 1301 }
adamc@879 1302
adamc@879 1303 val toChecknest = transform checknest "checknest" o toPrepare
adamc@879 1304
adamc@274 1305 val sqlify = {
adamc@274 1306 func = Cjrize.cjrize,
adamc@274 1307 print = CjrPrint.p_sql CjrEnv.empty
adamc@274 1308 }
adamc@274 1309
adamc@274 1310 val toSqlify = transform sqlify "sqlify" o toMono_opt2
adamc@274 1311
adam@1473 1312 val escapeFilename = String.translate (fn #" " => "\\ " | #"\"" => "\\\"" | #"'" => "\\'" | ch => str ch)
adam@1473 1313
adam@1540 1314 val beforeC = ref (fn () => ())
adam@1540 1315
adamc@764 1316 fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
adamc@183 1317 let
adamc@855 1318 val proto = Settings.currentProtocol ()
adamc@1095 1319
adam@1368 1320 val lib = if Settings.getStaticLinking () then
adam@1368 1321 #linkStatic proto ^ " " ^ Config.lib ^ "/../liburweb.a"
adam@1368 1322 else
adam@1368 1323 "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto
adamc@378 1324
adam@1558 1325 val opt = if debug then
adam@1558 1326 ""
adam@1558 1327 else
adam@1558 1328 " -O3"
adam@1558 1329
adam@1558 1330 val compile = Config.ccompiler ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " -Wimplicit -Werror -Wno-unused-value"
adam@1558 1331 ^ opt ^ " -I " ^ Config.includ
adamc@1096 1332 ^ " " ^ #compile proto
adam@1473 1333 ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname
adamc@1096 1334
adam@1558 1335 val link = Config.ccompiler ^ " -Werror" ^ opt ^ " -lm " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs
adam@1528 1336 ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ escapeFilename oname ^ " -o " ^ escapeFilename ename ^ " " ^ libs
adamc@502 1337
adamc@502 1338 val (compile, link) =
adamc@502 1339 if profile then
adamc@502 1340 (compile ^ " -pg", link ^ " -pg")
adamc@502 1341 else
adamc@502 1342 (compile, link)
adamc@742 1343
adamc@742 1344 val (compile, link) =
adamc@742 1345 if debug then
adamc@742 1346 (compile ^ " -g", link ^ " -g")
adamc@742 1347 else
adamc@742 1348 (compile, link)
adamc@764 1349
adamc@764 1350 val link = foldl (fn (s, link) => link ^ " " ^ s) link link'
adam@1394 1351
adam@1394 1352 fun system s =
adam@1394 1353 (if debug then
adam@1394 1354 print (s ^ "\n")
adam@1394 1355 else
adam@1394 1356 ();
adam@1394 1357 OS.Process.isSuccess (OS.Process.system s))
adamc@183 1358 in
adam@1540 1359 !beforeC ();
adam@1394 1360 system compile andalso system link
adamc@183 1361 end
adamc@183 1362
adamc@202 1363 fun compile job =
adamc@879 1364 case run toChecknest job of
adamc@1045 1365 NONE => false
adamc@29 1366 | SOME file =>
adamc@202 1367 let
adamc@274 1368 val job = valOf (run (transform parseUrp "parseUrp") job)
adamc@102 1369
adamc@274 1370 val (cname, oname, cleanup) =
adamc@274 1371 if #debug job then
adamc@457 1372 ("/tmp/webapp.c", "/tmp/webapp.o", fn () => ())
adamc@274 1373 else
adamc@274 1374 let
adamc@274 1375 val dir = OS.FileSys.tmpName ()
adamc@403 1376 val () = if OS.FileSys.access (dir, []) then
adamc@403 1377 OS.FileSys.remove dir
adamc@403 1378 else
adamc@403 1379 ()
adamc@457 1380 val cname = OS.Path.joinDirFile {dir = dir, file = "webapp.c"}
adamc@457 1381 val oname = OS.Path.joinDirFile {dir = dir, file = "webapp.o"}
adamc@274 1382 in
adamc@274 1383 OS.FileSys.mkDir dir;
adamc@274 1384 (cname, oname,
adam@1381 1385 fn () => (OS.FileSys.remove cname;
adam@1381 1386 OS.FileSys.remove oname;
adam@1381 1387 OS.FileSys.rmDir dir)
adam@1381 1388 handle OS.SysErr _ => OS.FileSys.rmDir dir)
adamc@274 1389 end
adamc@274 1390 val ename = #exe job
adamc@202 1391 in
adamc@274 1392 let
adamc@274 1393 val outf = TextIO.openOut cname
adamc@274 1394 val s = TextIOPP.openOut {dst = outf, wid = 80}
adamc@432 1395
adamc@432 1396 val hasDb = List.exists (fn (Cjr.DDatabase _, _) => true | _ => false) (#1 file)
adamc@432 1397 val libs =
adamc@432 1398 if hasDb then
adamc@866 1399 #link (Settings.currentDbms ())
adamc@432 1400 else
adamc@432 1401 ""
adamc@274 1402 in
adamc@274 1403 Print.fprint s (CjrPrint.p_file CjrEnv.empty file);
adamc@415 1404 TextIO.output1 (outf, #"\n");
adamc@274 1405 TextIO.closeOut outf;
adamc@102 1406
adam@1381 1407 if ErrorMsg.anyErrors () then
adam@1381 1408 false
adam@1381 1409 else
adam@1381 1410 (case #sql job of
adam@1381 1411 NONE => ()
adam@1381 1412 | SOME sql =>
adam@1381 1413 let
adam@1381 1414 val outf = TextIO.openOut sql
adam@1381 1415 val s = TextIOPP.openOut {dst = outf, wid = 80}
adam@1381 1416 in
adam@1381 1417 Print.fprint s (CjrPrint.p_sql CjrEnv.empty file);
adam@1381 1418 TextIO.closeOut outf
adam@1381 1419 end;
adamc@274 1420
adam@1381 1421 compileC {cname = cname, oname = oname, ename = ename, libs = libs,
adam@1381 1422 profile = #profile job, debug = #debug job, link = #link job}
adam@1381 1423
adam@1381 1424 before cleanup ())
adamc@274 1425 end
adamc@274 1426 handle ex => (((cleanup ()) handle _ => ()); raise ex)
adamc@202 1427 end
adamc@29 1428
adamc@1045 1429 fun compiler job =
adamc@1045 1430 if compile job then
adamc@1045 1431 ()
adamc@1045 1432 else
adamc@1045 1433 OS.Process.exit OS.Process.failure
adamc@1045 1434
adamc@1266 1435 fun moduleOf fname =
adamc@1266 1436 let
adamc@1266 1437 val mrs = !moduleRoots
adamc@1266 1438 val fname = OS.Path.mkCanonical fname
adamc@1266 1439 in
adamc@1266 1440 case List.find (fn (root, _) => String.isPrefix (root ^ "/") fname) mrs of
adamc@1266 1441 NONE => capitalize (OS.Path.base (OS.Path.file fname))
adamc@1266 1442 | SOME (root, name) =>
adamc@1266 1443 let
adamc@1266 1444 val fname = OS.Path.base fname
adamc@1266 1445 val fname = String.extract (fname, size root + 1, NONE)
adamc@1266 1446 val fs = String.fields (fn ch => ch = #"/") fname
adamc@1266 1447 val fs = List.filter (CharVector.exists (fn ch => not (Char.isDigit ch))) fs
adamc@1266 1448 val fs = map capitalize fs
adamc@1266 1449 in
adamc@1266 1450 String.concatWith "." (name :: fs)
adamc@1266 1451 end
adamc@1266 1452 end
adamc@1266 1453
adamc@1 1454 end