Mercurial > urweb

annotate src/compiler.sml @ 866:03e7f111fe99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start of multi-DBMS support
author Adam Chlipala <adamc@hcoop.net>
date Sun, 28 Jun 2009 13:49:32 -0400
parents 3d2f6cb6d54a
children b2a175a0f2ef
rev   line source
adamc@764 1 (* Copyright (c) 2008-2009, 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@765 51 clientOnly : Settings.ffi list,
adamc@765 52 serverOnly : Settings.ffi list,
adamc@768 53 jsFuncs : (Settings.ffi * string) list,
adamc@769 54 rewrites : Settings.rewrite list,
adamc@769 55 filterUrl : Settings.rule list,
adamc@866 56 filterMime : Settings.rule list,
adamc@866 57 protocol : string option,
adamc@866 58 dbms : string option
adamc@270 59 }
adamc@201 60
adamc@201 61 type ('src, 'dst) phase = {
adamc@201 62 func : 'src -> 'dst,
adamc@201 63 print : 'dst -> Print.PD.pp_desc
adamc@201 64 }
adamc@201 65
adamc@201 66 type pmap = (string * Time.time) list
adamc@201 67
adamc@201 68 type ('src, 'dst) transform = {
adamc@201 69 func : 'src -> 'dst option,
adamc@201 70 print : 'dst -> Print.PD.pp_desc,
adamc@201 71 time : 'src * pmap -> 'dst option * pmap
adamc@201 72 }
adamc@201 73
adamc@201 74 fun transform (ph : ('src, 'dst) phase) name = {
adamc@201 75 func = fn input => let
adamc@201 76 val v = #func ph input
adamc@201 77 in
adamc@201 78 if ErrorMsg.anyErrors () then
adamc@201 79 NONE
adamc@201 80 else
adamc@201 81 SOME v
adamc@201 82 end,
adamc@201 83 print = #print ph,
adamc@201 84 time = fn (input, pmap) => let
adamc@201 85 val befor = Time.now ()
adamc@201 86 val v = #func ph input
adamc@201 87 val elapsed = Time.- (Time.now (), befor)
adamc@201 88 in
adamc@201 89 (if ErrorMsg.anyErrors () then
adamc@201 90 NONE
adamc@201 91 else
adamc@201 92 SOME v,
adamc@201 93 (name, elapsed) :: pmap)
adamc@201 94 end
adamc@201 95 }
adamc@201 96
adamc@270 97 fun op o (tr2 : ('b, 'c) transform, tr1 : ('a, 'b) transform) = {
adamc@201 98 func = fn input => case #func tr1 input of
adamc@201 99 NONE => NONE
adamc@201 100 | SOME v => #func tr2 v,
adamc@201 101 print = #print tr2,
adamc@201 102 time = fn (input, pmap) => let
adamc@201 103 val (ro, pmap) = #time tr1 (input, pmap)
adamc@201 104 in
adamc@201 105 case ro of
adamc@201 106 NONE => (NONE, pmap)
adamc@201 107 | SOME v => #time tr2 (v, pmap)
adamc@201 108 end
adamc@201 109 }
adamc@201 110
adamc@346 111 fun check (tr : ('src, 'dst) transform) x = (ErrorMsg.resetErrors ();
adamc@346 112 ignore (#func tr x))
adamc@346 113
adamc@280 114 fun run (tr : ('src, 'dst) transform) x = (ErrorMsg.resetErrors ();
adamc@280 115 #func tr x)
adamc@201 116
adamc@201 117 fun runPrint (tr : ('src, 'dst) transform) input =
adamc@280 118 (ErrorMsg.resetErrors ();
adamc@280 119 case #func tr input of
adamc@280 120 NONE => print "Failure\n"
adamc@280 121 | SOME v =>
adamc@280 122 (print "Success\n";
adamc@280 123 Print.print (#print tr v);
adamc@280 124 print "\n"))
adamc@201 125
adamc@201 126 fun time (tr : ('src, 'dst) transform) input =
adamc@55 127 let
adamc@201 128 val (_, pmap) = #time tr (input, [])
adamc@201 129 in
adamc@201 130 app (fn (name, time) =>
adamc@201 131 print (name ^ ": " ^ LargeReal.toString (Time.toReal time) ^ "\n")) (rev pmap);
adamc@201 132 print ("TOTAL: " ^ LargeReal.toString (Time.toReal (foldl Time.+ Time.zeroTime (map #2 pmap))) ^ "\n");
adamc@201 133 print "\n"
adamc@201 134 end
adamc@55 135
adamc@201 136 fun timePrint (tr : ('src, 'dst) transform) input =
adamc@201 137 let
adamc@201 138 val (ro, pmap) = #time tr (input, [])
adamc@55 139 in
adamc@201 140 app (fn (name, time) =>
adamc@201 141 print (name ^ ": " ^ LargeReal.toString (Time.toReal time) ^ "\n")) (rev pmap);
adamc@201 142 print ("TOTAL: " ^ LargeReal.toString (Time.toReal (foldl Time.+ Time.zeroTime (map #2 pmap))) ^ "\n");
adamc@201 143 print "\n";
adamc@201 144 case ro of
adamc@201 145 NONE => print "Failure\n"
adamc@201 146 | SOME v =>
adamc@201 147 (print "Success\n";
adamc@201 148 Print.print (#print tr v);
adamc@201 149 print "\n")
adamc@55 150 end
adamc@55 151
adamc@244 152 val parseUrs =
adamc@201 153 {func = fn filename => let
adamc@201 154 val fname = OS.FileSys.tmpName ()
adamc@201 155 val outf = TextIO.openOut fname
adamc@201 156 val () = TextIO.output (outf, "sig\n")
adamc@201 157 val inf = TextIO.openIn filename
adamc@201 158 fun loop () =
adamc@201 159 case TextIO.inputLine inf of
adamc@201 160 NONE => ()
adamc@201 161 | SOME line => (TextIO.output (outf, line);
adamc@201 162 loop ())
adamc@201 163 val () = loop ()
adamc@201 164 val () = TextIO.closeIn inf
adamc@201 165 val () = TextIO.closeOut outf
adamc@201 166
adamc@201 167 val () = (ErrorMsg.resetErrors ();
adamc@201 168 ErrorMsg.resetPositioning filename;
adamc@201 169 Lex.UserDeclarations.initialize ())
adamc@201 170 val file = TextIO.openIn fname
adamc@201 171 fun get _ = TextIO.input file
adamc@201 172 fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
adamc@201 173 val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
adamc@244 174 val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
adamc@201 175 in
adamc@201 176 TextIO.closeIn file;
adamc@201 177 case absyn of
adamc@201 178 [(Source.DSgn ("?", (Source.SgnConst sgis, _)), _)] => sgis
adamc@201 179 | _ => (ErrorMsg.errorAt {file = filename,
adamc@201 180 first = {line = 0,
adamc@201 181 char = 0},
adamc@201 182 last = {line = 0,
adamc@201 183 char = 0}} "Not a signature";
adamc@201 184 [])
adamc@201 185 end
adamc@201 186 handle LrParser.ParseError => [],
adamc@201 187 print = Print.p_list_sep Print.PD.newline SourcePrint.p_sgn_item}
adamc@55 188
adamc@1 189 (* The main parsing routine *)
adamc@244 190 val parseUr = {
adamc@201 191 func = fn filename =>
adamc@201 192 let
adamc@201 193 val () = (ErrorMsg.resetErrors ();
adamc@201 194 ErrorMsg.resetPositioning filename;
adamc@201 195 Lex.UserDeclarations.initialize ())
adamc@201 196 val file = TextIO.openIn filename
adamc@201 197 fun get _ = TextIO.input file
adamc@201 198 fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
adamc@201 199 val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
adamc@244 200 val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
adamc@201 201 in
adamc@201 202 TextIO.closeIn file;
adamc@201 203 case absyn of
adamc@201 204 [(Source.DSgn ("?", _), _)] =>
adamc@201 205 (ErrorMsg.errorAt {file = filename,
adamc@201 206 first = {line = 0,
adamc@201 207 char = 0},
adamc@201 208 last = {line = 0,
adamc@201 209 char = 0}} "File starts with 'sig'";
adamc@201 210 [])
adamc@201 211 | _ => absyn
adamc@201 212 end
adamc@201 213 handle LrParser.ParseError => [],
adamc@201 214 print = SourcePrint.p_file}
adamc@56 215
adamc@768 216 fun p_job ({prefix, database, exe, sql, sources, debug, profile,
adamc@768 217 timeout, ffi, link, headers, scripts,
adamc@768 218 clientToServer, effectful, clientOnly, serverOnly, jsFuncs, ...} : job) =
adamc@270 219 let
adamc@270 220 open Print.PD
adamc@270 221 open Print
adamc@765 222
adamc@765 223 fun p_ffi name = p_list_sep (box []) (fn (m, s) =>
adamc@765 224 box [string name, space, string m, string ".", string s, newline])
adamc@270 225 in
adamc@274 226 box [if debug then
adamc@274 227 box [string "DEBUG", newline]
adamc@274 228 else
adamc@274 229 box [],
adamc@502 230 if profile then
adamc@502 231 box [string "PROFILE", newline]
adamc@502 232 else
adamc@502 233 box [],
adamc@274 234 case database of
adamc@270 235 NONE => string "No database."
adamc@270 236 | SOME db => string ("Database: " ^ db),
adamc@270 237 newline,
adamc@274 238 string "Exe: ",
adamc@274 239 string exe,
adamc@274 240 newline,
adamc@274 241 case sql of
adamc@274 242 NONE => string "No SQL file."
adamc@274 243 | SOME sql => string ("SQL fle: " ^ sql),
adamc@673 244 newline,
adamc@673 245 string "Timeout: ",
adamc@673 246 string (Int.toString timeout),
adamc@673 247 newline,
adamc@764 248 p_list_sep (box []) (fn s => box [string "Ffi", space, string s, newline]) ffi,
adamc@764 249 p_list_sep (box []) (fn s => box [string "Header", space, string s, newline]) headers,
adamc@766 250 p_list_sep (box []) (fn s => box [string "Script", space, string s, newline]) scripts,
adamc@764 251 p_list_sep (box []) (fn s => box [string "Link", space, string s, newline]) link,
adamc@765 252 p_ffi "ClientToServer" clientToServer,
adamc@765 253 p_ffi "Effectful" effectful,
adamc@765 254 p_ffi "ClientOnly" clientOnly,
adamc@765 255 p_ffi "ServerOnly" serverOnly,
adamc@765 256 p_list_sep (box []) (fn ((m, s), s') =>
adamc@765 257 box [string "JsFunc", space, string m, string ".", string s,
adamc@765 258 space, string "=", space, string s', newline]) jsFuncs,
adamc@270 259 string "Sources:",
adamc@270 260 p_list string sources,
adamc@270 261 newline]
adamc@270 262 end
adamc@270 263
adamc@270 264 fun trim s =
adamc@270 265 let
adamc@270 266 val (_, s) = Substring.splitl Char.isSpace s
adamc@270 267 val (s, _) = Substring.splitr Char.isSpace s
adamc@270 268 in
adamc@270 269 s
adamc@270 270 end
adamc@270 271
adamc@794 272 structure M = BinaryMapFn(struct
adamc@794 273 type ord_key = string
adamc@794 274 val compare = String.compare
adamc@794 275 end)
adamc@794 276
adamc@794 277 fun parseUrp' fname =
adamc@767 278 let
adamc@794 279 val pathmap = ref (M.insert (M.empty, "", Config.libUr))
adamc@767 280
adamc@794 281 fun pu filename =
adamc@794 282 let
adamc@794 283 val dir = OS.Path.dir filename
adamc@794 284 val inf = TextIO.openIn (OS.Path.joinBaseExt {base = filename, ext = SOME "urp"})
adamc@767 285
adamc@794 286 fun pathify fname =
adamc@794 287 if size fname > 0 andalso String.sub (fname, 0) = #"$" then
adamc@794 288 let
adamc@794 289 val fname' = Substring.extract (fname, 1, NONE)
adamc@794 290 val (befor, after) = Substring.splitl (fn ch => ch <> #"/") fname'
adamc@794 291 in
adamc@794 292 if Substring.isEmpty after then
adamc@794 293 fname
adamc@794 294 else
adamc@794 295 case M.find (!pathmap, Substring.string befor) of
adamc@794 296 NONE => fname
adamc@794 297 | SOME rep => rep ^ Substring.string after
adamc@794 298 end
adamc@794 299 else
adamc@794 300 fname
adamc@767 301
adamc@794 302 fun relify fname =
adamc@794 303 let
adamc@794 304 val fname = pathify fname
adamc@794 305 in
adamc@794 306 OS.Path.concat (dir, fname)
adamc@794 307 handle OS.Path.Path => fname
adamc@794 308 end
adamc@767 309
adamc@794 310 val absDir = OS.Path.mkAbsolute {path = dir, relativeTo = OS.FileSys.getDir ()}
adamc@767 311
adamc@794 312 fun relifyA fname =
adamc@794 313 OS.Path.mkAbsolute {path = pathify fname, relativeTo = absDir}
adamc@767 314
adamc@794 315 fun readSources acc =
adamc@794 316 case TextIO.inputLine inf of
adamc@794 317 NONE => rev acc
adamc@794 318 | SOME line =>
adamc@794 319 let
adamc@794 320 val acc = if CharVector.all Char.isSpace line then
adamc@794 321 acc
adamc@794 322 else
adamc@794 323 let
adamc@794 324 val fname = String.implode (List.filter (fn x => not (Char.isSpace x))
adamc@794 325 (String.explode line))
adamc@794 326 val fname = relify fname
adamc@794 327 in
adamc@794 328 fname :: acc
adamc@794 329 end
adamc@794 330 in
adamc@794 331 readSources acc
adamc@794 332 end
adamc@767 333
adamc@794 334 val prefix = ref NONE
adamc@794 335 val database = ref NONE
adamc@794 336 val exe = ref NONE
adamc@794 337 val sql = ref NONE
adamc@857 338 val debug = ref (Settings.getDebug ())
adamc@794 339 val profile = ref false
adamc@794 340 val timeout = ref NONE
adamc@794 341 val ffi = ref []
adamc@794 342 val link = ref []
adamc@794 343 val headers = ref []
adamc@794 344 val scripts = ref []
adamc@794 345 val clientToServer = ref []
adamc@794 346 val effectful = ref []
adamc@794 347 val clientOnly = ref []
adamc@794 348 val serverOnly = ref []
adamc@794 349 val jsFuncs = ref []
adamc@794 350 val rewrites = ref []
adamc@794 351 val url = ref []
adamc@794 352 val mime = ref []
adamc@794 353 val libs = ref []
adamc@866 354 val protocol = ref NONE
adamc@866 355 val dbms = ref NONE
adamc@767 356
adamc@794 357 fun finish sources =
adamc@794 358 let
adamc@794 359 val job = {
adamc@794 360 prefix = Option.getOpt (!prefix, "/"),
adamc@794 361 database = !database,
adamc@794 362 exe = Option.getOpt (!exe, OS.Path.joinBaseExt {base = OS.Path.base filename,
adamc@794 363 ext = SOME "exe"}),
adamc@794 364 sql = !sql,
adamc@794 365 debug = !debug,
adamc@794 366 profile = !profile,
adamc@794 367 timeout = Option.getOpt (!timeout, 60),
adamc@794 368 ffi = rev (!ffi),
adamc@794 369 link = rev (!link),
adamc@794 370 headers = rev (!headers),
adamc@794 371 scripts = rev (!scripts),
adamc@794 372 clientToServer = rev (!clientToServer),
adamc@794 373 effectful = rev (!effectful),
adamc@794 374 clientOnly = rev (!clientOnly),
adamc@794 375 serverOnly = rev (!serverOnly),
adamc@794 376 jsFuncs = rev (!jsFuncs),
adamc@794 377 rewrites = rev (!rewrites),
adamc@794 378 filterUrl = rev (!url),
adamc@794 379 filterMime = rev (!mime),
adamc@866 380 sources = sources,
adamc@866 381 protocol = !protocol,
adamc@866 382 dbms = !dbms
adamc@794 383 }
adamc@767 384
adamc@794 385 fun mergeO f (old, new) =
adamc@794 386 case (old, new) of
adamc@794 387 (NONE, _) => new
adamc@794 388 | (_, NONE) => old
adamc@794 389 | (SOME v1, SOME v2) => SOME (f (v1, v2))
adamc@794 390
adamc@794 391 fun same desc = mergeO (fn (x : string, y) =>
adamc@794 392 (if x = y then
adamc@794 393 ()
adamc@794 394 else
adamc@794 395 ErrorMsg.error ("Multiple "
adamc@794 396 ^ desc ^ " values that don't agree");
adamc@794 397 x))
adamc@794 398
adamc@794 399 fun merge (old : job, new : job) = {
adamc@794 400 prefix = #prefix old,
adamc@794 401 database = #database old,
adamc@794 402 exe = #exe old,
adamc@794 403 sql = #sql old,
adamc@794 404 debug = #debug old orelse #debug new,
adamc@794 405 profile = #profile old orelse #profile new,
adamc@794 406 timeout = #timeout old,
adamc@794 407 ffi = #ffi old @ #ffi new,
adamc@794 408 link = #link old @ #link new,
adamc@794 409 headers = #headers old @ #headers new,
adamc@794 410 scripts = #scripts old @ #scripts new,
adamc@794 411 clientToServer = #clientToServer old @ #clientToServer new,
adamc@794 412 effectful = #effectful old @ #effectful new,
adamc@794 413 clientOnly = #clientOnly old @ #clientOnly new,
adamc@794 414 serverOnly = #serverOnly old @ #serverOnly new,
adamc@794 415 jsFuncs = #jsFuncs old @ #jsFuncs new,
adamc@794 416 rewrites = #rewrites old @ #rewrites new,
adamc@794 417 filterUrl = #filterUrl old @ #filterUrl new,
adamc@794 418 filterMime = #filterMime old @ #filterMime new,
adamc@866 419 sources = #sources new @ #sources old,
adamc@866 420 protocol = mergeO #2 (#protocol old, #protocol new),
adamc@866 421 dbms = mergeO #2 (#dbms old, #dbms new)
adamc@794 422 }
adamc@794 423 in
adamc@832 424 foldr (fn (fname, job) => merge (job, pu fname)) job (!libs)
adamc@794 425 end
adamc@794 426
adamc@794 427 fun parsePkind s =
adamc@794 428 case s of
adamc@794 429 "all" => Settings.Any
adamc@794 430 | "url" => Settings.Url
adamc@794 431 | "table" => Settings.Table
adamc@794 432 | "sequence" => Settings.Sequence
adamc@794 433 | "view" => Settings.View
adamc@794 434 | "relation" => Settings.Relation
adamc@794 435 | "cookie" => Settings.Cookie
adamc@794 436 | "style" => Settings.Style
adamc@794 437 | _ => (ErrorMsg.error "Bad path kind spec";
adamc@794 438 Settings.Any)
adamc@794 439
adamc@794 440 fun parseFrom s =
adamc@794 441 if size s > 1 andalso String.sub (s, size s - 2) = #"/" andalso String.sub (s, size s - 1) = #"*" then
adamc@794 442 (Settings.Prefix, String.substring (s, 0, size s - 1))
adamc@794 443 else
adamc@794 444 (Settings.Exact, s)
adamc@794 445
adamc@794 446 fun parseFkind s =
adamc@794 447 case s of
adamc@794 448 "url" => url
adamc@794 449 | "mime" => mime
adamc@794 450 | _ => (ErrorMsg.error "Bad filter kind";
adamc@794 451 url)
adamc@794 452
adamc@794 453 fun parsePattern s =
adamc@794 454 if size s > 0 andalso String.sub (s, size s - 1) = #"*" then
adamc@794 455 (Settings.Prefix, String.substring (s, 0, size s - 1))
adamc@794 456 else
adamc@794 457 (Settings.Exact, s)
adamc@794 458
adamc@794 459 fun read () =
adamc@794 460 case TextIO.inputLine inf of
adamc@794 461 NONE => finish []
adamc@794 462 | SOME "\n" => finish (readSources [])
adamc@794 463 | SOME line =>
adamc@794 464 let
adamc@794 465 val (cmd, arg) = Substring.splitl (fn x => not (Char.isSpace x)) (Substring.full line)
adamc@794 466 val cmd = Substring.string (trim cmd)
adamc@794 467 val arg = Substring.string (trim arg)
adamc@794 468
adamc@794 469 fun ffiS () =
adamc@794 470 case String.fields (fn ch => ch = #".") arg of
adamc@794 471 [m, x] => (m, x)
adamc@794 472 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func");
adamc@794 473 ("", ""))
adamc@794 474
adamc@794 475 fun ffiM () =
adamc@794 476 case String.fields (fn ch => ch = #"=") arg of
adamc@794 477 [f, s] =>
adamc@794 478 (case String.fields (fn ch => ch = #".") f of
adamc@794 479 [m, x] => ((m, x), s)
adamc@794 480 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func=func'");
adamc@794 481 (("", ""), "")))
adamc@794 482 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func=func'");
adamc@794 483 (("", ""), ""))
adamc@794 484 in
adamc@794 485 case cmd of
adamc@794 486 "prefix" =>
adamc@794 487 (case !prefix of
adamc@794 488 NONE => ()
adamc@794 489 | SOME _ => ErrorMsg.error "Duplicate 'prefix' directive";
adamc@794 490 prefix := SOME arg)
adamc@794 491 | "database" =>
adamc@794 492 (case !database of
adamc@794 493 NONE => ()
adamc@794 494 | SOME _ => ErrorMsg.error "Duplicate 'database' directive";
adamc@794 495 database := SOME arg)
adamc@794 496 | "exe" =>
adamc@794 497 (case !exe of
adamc@794 498 NONE => ()
adamc@794 499 | SOME _ => ErrorMsg.error "Duplicate 'exe' directive";
adamc@794 500 exe := SOME (relify arg))
adamc@794 501 | "sql" =>
adamc@794 502 (case !sql of
adamc@794 503 NONE => ()
adamc@794 504 | SOME _ => ErrorMsg.error "Duplicate 'sql' directive";
adamc@794 505 sql := SOME (relify arg))
adamc@794 506 | "debug" => debug := true
adamc@794 507 | "profile" => profile := true
adamc@794 508 | "timeout" =>
adamc@794 509 (case !timeout of
adamc@794 510 NONE => ()
adamc@794 511 | SOME _ => ErrorMsg.error "Duplicate 'timeout' directive";
adamc@794 512 timeout := SOME (valOf (Int.fromString arg)))
adamc@794 513 | "ffi" => ffi := relify arg :: !ffi
adamc@794 514 | "link" => link := relifyA arg :: !link
adamc@794 515 | "include" => headers := relifyA arg :: !headers
adamc@794 516 | "script" => scripts := arg :: !scripts
adamc@794 517 | "clientToServer" => clientToServer := ffiS () :: !clientToServer
adamc@794 518 | "effectful" => effectful := ffiS () :: !effectful
adamc@794 519 | "clientOnly" => clientOnly := ffiS () :: !clientOnly
adamc@794 520 | "serverOnly" => serverOnly := ffiS () :: !serverOnly
adamc@794 521 | "jsFunc" => jsFuncs := ffiM () :: !jsFuncs
adamc@794 522 | "rewrite" =>
adamc@794 523 let
adamc@794 524 fun doit (pkind, from, to) =
adamc@794 525 let
adamc@794 526 val pkind = parsePkind pkind
adamc@794 527 val (kind, from) = parseFrom from
adamc@794 528 in
adamc@794 529 rewrites := {pkind = pkind, kind = kind, from = from, to = to} :: !rewrites
adamc@794 530 end
adamc@794 531 in
adamc@794 532 case String.tokens Char.isSpace arg of
adamc@794 533 [pkind, from, to] => doit (pkind, from, to)
adamc@794 534 | [pkind, from] => doit (pkind, from, "")
adamc@794 535 | _ => ErrorMsg.error "Bad 'rewrite' syntax"
adamc@794 536 end
adamc@794 537 | "allow" =>
adamc@794 538 (case String.tokens Char.isSpace arg of
adamc@794 539 [fkind, pattern] =>
adamc@794 540 let
adamc@794 541 val fkind = parseFkind fkind
adamc@794 542 val (kind, pattern) = parsePattern pattern
adamc@794 543 in
adamc@794 544 fkind := {action = Settings.Allow, kind = kind, pattern = pattern} :: !fkind
adamc@794 545 end
adamc@794 546 | _ => ErrorMsg.error "Bad 'allow' syntax")
adamc@794 547 | "deny" =>
adamc@794 548 (case String.tokens Char.isSpace arg of
adamc@794 549 [fkind, pattern] =>
adamc@794 550 let
adamc@794 551 val fkind = parseFkind fkind
adamc@794 552 val (kind, pattern) = parsePattern pattern
adamc@794 553 in
adamc@794 554 fkind := {action = Settings.Deny, kind = kind, pattern = pattern} :: !fkind
adamc@794 555 end
adamc@794 556 | _ => ErrorMsg.error "Bad 'deny' syntax")
adamc@794 557 | "library" => libs := relify arg :: !libs
adamc@794 558 | "path" =>
adamc@794 559 (case String.fields (fn ch => ch = #"=") arg of
adamc@794 560 [n, v] => pathmap := M.insert (!pathmap, n, v)
adamc@794 561 | _ => ErrorMsg.error "path argument not of the form name=value'")
adamc@794 562 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'");
adamc@794 563 read ()
adamc@794 564 end
adamc@794 565
adamc@794 566 val job = read ()
adamc@767 567 in
adamc@794 568 TextIO.closeIn inf;
adamc@794 569 Settings.setUrlPrefix (#prefix job);
adamc@794 570 Settings.setTimeout (#timeout job);
adamc@794 571 Settings.setHeaders (#headers job);
adamc@794 572 Settings.setScripts (#scripts job);
adamc@794 573 Settings.setClientToServer (#clientToServer job);
adamc@794 574 Settings.setEffectful (#effectful job);
adamc@794 575 Settings.setClientOnly (#clientOnly job);
adamc@794 576 Settings.setServerOnly (#serverOnly job);
adamc@794 577 Settings.setJsFuncs (#jsFuncs job);
adamc@794 578 Settings.setRewriteRules (#rewrites job);
adamc@794 579 Settings.setUrlRules (#filterUrl job);
adamc@794 580 Settings.setMimeRules (#filterMime job);
adamc@866 581 Option.app Settings.setProtocol (#protocol job);
adamc@866 582 Option.app Settings.setDbms (#dbms job);
adamc@794 583 job
adamc@767 584 end
adamc@767 585 in
adamc@794 586 pu fname
adamc@767 587 end
adamc@767 588
adamc@270 589 val parseUrp = {
adamc@767 590 func = parseUrp',
adamc@270 591 print = p_job
adamc@270 592 }
adamc@270 593
adamc@270 594 val toParseJob = transform parseUrp "parseJob"
adamc@270 595
adamc@56 596 fun capitalize "" = ""
adamc@56 597 | capitalize s = str (Char.toUpper (String.sub (s, 0))) ^ String.extract (s, 1, NONE)
adamc@56 598
adamc@201 599 val parse = {
adamc@764 600 func = fn {database, sources = fnames, ffi, ...} : job =>
adamc@201 601 let
adamc@834 602 val anyErrors = ref false
adamc@834 603 fun checkErrors () = anyErrors := (!anyErrors orelse ErrorMsg.anyErrors ())
adamc@201 604 fun nameOf fname = capitalize (OS.Path.file fname)
adamc@109 605
adamc@764 606 fun parseFfi fname =
adamc@764 607 let
adamc@764 608 val mname = nameOf fname
adamc@764 609 val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
adamc@764 610
adamc@764 611 val loc = {file = urs,
adamc@764 612 first = ErrorMsg.dummyPos,
adamc@764 613 last = ErrorMsg.dummyPos}
adamc@764 614
adamc@764 615 val sgn = (Source.SgnConst (#func parseUrs urs), loc)
adamc@764 616 in
adamc@834 617 checkErrors ();
adamc@764 618 (Source.DFfiStr (mname, sgn), loc)
adamc@764 619 end
adamc@764 620
adamc@201 621 fun parseOne fname =
adamc@201 622 let
adamc@201 623 val mname = nameOf fname
adamc@244 624 val ur = OS.Path.joinBaseExt {base = fname, ext = SOME "ur"}
adamc@244 625 val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
adamc@56 626
adamc@201 627 val sgnO =
adamc@244 628 if Posix.FileSys.access (urs, []) then
adamc@244 629 SOME (Source.SgnConst (#func parseUrs urs),
adamc@244 630 {file = urs,
adamc@201 631 first = ErrorMsg.dummyPos,
adamc@201 632 last = ErrorMsg.dummyPos})
adamc@834 633 before checkErrors ()
adamc@201 634 else
adamc@201 635 NONE
adamc@56 636
adamc@244 637 val loc = {file = ur,
adamc@201 638 first = ErrorMsg.dummyPos,
adamc@201 639 last = ErrorMsg.dummyPos}
adamc@56 640
adamc@244 641 val ds = #func parseUr ur
adamc@201 642 in
adamc@834 643 checkErrors ();
adamc@201 644 (Source.DStr (mname, sgnO, (Source.StrConst ds, loc)), loc)
adamc@201 645 end
adamc@56 646
adamc@764 647 val dsFfi = map parseFfi ffi
adamc@201 648 val ds = map parseOne fnames
adamc@201 649 in
adamc@834 650 if !anyErrors then
adamc@834 651 ErrorMsg.error "Parse failure"
adamc@834 652 else
adamc@834 653 ();
adamc@834 654
adamc@201 655 let
adamc@201 656 val final = nameOf (List.last fnames)
adamc@271 657
adamc@764 658 val ds = dsFfi @ ds
adamc@764 659 @ [(Source.DExport (Source.StrVar final, ErrorMsg.dummySpan), ErrorMsg.dummySpan)]
adamc@201 660 in
adamc@271 661 case database of
adamc@271 662 NONE => ds
adamc@271 663 | SOME s => (Source.DDatabase s, ErrorMsg.dummySpan) :: ds
adamc@201 664 end handle Empty => ds
adamc@201 665 end,
adamc@201 666 print = SourcePrint.p_file
adamc@201 667 }
adamc@56 668
adamc@270 669 val toParse = transform parse "parse" o toParseJob
adamc@38 670
adamc@378 671 fun libFile s = OS.Path.joinDirFile {dir = Config.libUr,
adamc@378 672 file = s}
adamc@378 673 fun clibFile s = OS.Path.joinDirFile {dir = Config.libC,
adamc@378 674 file = s}
adamc@378 675
adamc@201 676 val elaborate = {
adamc@201 677 func = fn file => let
adamc@378 678 val basis = #func parseUrs (libFile "basis.urs")
adamc@378 679 val topSgn = #func parseUrs (libFile "top.urs")
adamc@378 680 val topStr = #func parseUr (libFile "top.ur")
adamc@201 681 in
adamc@325 682 Elaborate.elabFile basis topStr topSgn ElabEnv.empty file
adamc@201 683 end,
adamc@201 684 print = ElabPrint.p_file ElabEnv.empty
adamc@201 685 }
adamc@5 686
adamc@270 687 val toElaborate = transform elaborate "elaborate" o toParse
adamc@201 688
adamc@448 689 val unnest = {
adamc@448 690 func = Unnest.unnest,
adamc@448 691 print = ElabPrint.p_file ElabEnv.empty
adamc@448 692 }
adamc@448 693
adamc@448 694 val toUnnest = transform unnest "unnest" o toElaborate
adamc@448 695
adamc@313 696 val termination = {
adamc@313 697 func = (fn file => (Termination.check file; file)),
adamc@313 698 print = ElabPrint.p_file ElabEnv.empty
adamc@313 699 }
adamc@313 700
adamc@448 701 val toTermination = transform termination "termination" o toUnnest
adamc@313 702
adamc@201 703 val explify = {
adamc@201 704 func = Explify.explify,
adamc@201 705 print = ExplPrint.p_file ExplEnv.empty
adamc@201 706 }
adamc@201 707
adamc@625 708 val toExplify = transform explify "explify" o toUnnest
adamc@201 709
adamc@201 710 val corify = {
adamc@201 711 func = Corify.corify,
adamc@201 712 print = CorePrint.p_file CoreEnv.empty
adamc@201 713 }
adamc@201 714
adamc@270 715 val toCorify = transform corify "corify" o toExplify
adamc@201 716
adamc@482 717 (*val reduce_local = {
adamc@482 718 func = ReduceLocal.reduce,
adamc@482 719 print = CorePrint.p_file CoreEnv.empty
adamc@482 720 }
adamc@482 721
adamc@482 722 val toReduce_local = transform reduce_local "reduce_local" o toCorify*)
adamc@482 723
adamc@443 724 val especialize = {
adamc@443 725 func = ESpecialize.specialize,
adamc@443 726 print = CorePrint.p_file CoreEnv.empty
adamc@443 727 }
adamc@443 728
adamc@454 729 val core_untangle = {
adamc@454 730 func = CoreUntangle.untangle,
adamc@454 731 print = CorePrint.p_file CoreEnv.empty
adamc@454 732 }
adamc@454 733
adamc@794 734 val toCore_untangle = transform core_untangle "core_untangle" o toCorify
adamc@454 735
adamc@202 736 val shake = {
adamc@202 737 func = Shake.shake,
adamc@202 738 print = CorePrint.p_file CoreEnv.empty
adamc@202 739 }
adamc@39 740
adamc@454 741 val toShake1 = transform shake "shake1" o toCore_untangle
adamc@110 742
adamc@607 743 val rpcify = {
adamc@607 744 func = Rpcify.frob,
adamc@607 745 print = CorePrint.p_file CoreEnv.empty
adamc@607 746 }
adamc@607 747
adamc@607 748 val toRpcify = transform rpcify "rpcify" o toShake1
adamc@607 749
adamc@642 750 val toCore_untangle2 = transform core_untangle "core_untangle2" o toRpcify
adamc@642 751 val toShake2 = transform shake "shake2" o toCore_untangle2
adamc@642 752
adamc@202 753 val tag = {
adamc@202 754 func = Tag.tag,
adamc@202 755 print = CorePrint.p_file CoreEnv.empty
adamc@202 756 }
adamc@193 757
adamc@642 758 val toTag = transform tag "tag" o toCore_untangle2
adamc@20 759
adamc@202 760 val reduce = {
adamc@202 761 func = Reduce.reduce,
adamc@202 762 print = CorePrint.p_file CoreEnv.empty
adamc@202 763 }
adamc@25 764
adamc@692 765 val toReduce = transform reduce "reduce" o toTag
adamc@23 766
adamc@315 767 val unpoly = {
adamc@315 768 func = Unpoly.unpoly,
adamc@315 769 print = CorePrint.p_file CoreEnv.empty
adamc@315 770 }
adamc@315 771
adamc@315 772 val toUnpoly = transform unpoly "unpoly" o toReduce
adamc@315 773
adamc@202 774 val specialize = {
adamc@202 775 func = Specialize.specialize,
adamc@202 776 print = CorePrint.p_file CoreEnv.empty
adamc@202 777 }
adamc@132 778
adamc@315 779 val toSpecialize = transform specialize "specialize" o toUnpoly
adamc@131 780
adamc@642 781 val toShake3 = transform shake "shake3" o toSpecialize
adamc@133 782
adamc@794 783 val toEspecialize = transform especialize "especialize" o toShake3
adamc@794 784
adamc@794 785 val toShake4 = transform shake "shake4" o toEspecialize
adamc@794 786
adamc@692 787 val marshalcheck = {
adamc@692 788 func = (fn file => (MarshalCheck.check file; file)),
adamc@692 789 print = CorePrint.p_file CoreEnv.empty
adamc@692 790 }
adamc@692 791
adamc@794 792 val toMarshalcheck = transform marshalcheck "marshalcheck" o toShake4
adamc@692 793
adamc@732 794 val effectize = {
adamc@732 795 func = Effective.effectize,
adamc@732 796 print = CorePrint.p_file CoreEnv.empty
adamc@732 797 }
adamc@732 798
adamc@732 799 val toEffectize = transform effectize "effectize" o toMarshalcheck
adamc@732 800
adamc@202 801 val monoize = {
adamc@202 802 func = Monoize.monoize CoreEnv.empty,
adamc@202 803 print = MonoPrint.p_file MonoEnv.empty
adamc@202 804 }
adamc@134 805
adamc@732 806 val toMonoize = transform monoize "monoize" o toEffectize
adamc@96 807
adamc@202 808 val mono_opt = {
adamc@202 809 func = MonoOpt.optimize,
adamc@202 810 print = MonoPrint.p_file MonoEnv.empty
adamc@202 811 }
adamc@29 812
adamc@270 813 val toMono_opt1 = transform mono_opt "mono_opt1" o toMonoize
adamc@5 814
adamc@202 815 val untangle = {
adamc@202 816 func = Untangle.untangle,
adamc@202 817 print = MonoPrint.p_file MonoEnv.empty
adamc@202 818 }
adamc@1 819
adamc@270 820 val toUntangle = transform untangle "untangle" o toMono_opt1
adamc@38 821
adamc@202 822 val mono_reduce = {
adamc@202 823 func = MonoReduce.reduce,
adamc@202 824 print = MonoPrint.p_file MonoEnv.empty
adamc@202 825 }
adamc@16 826
adamc@270 827 val toMono_reduce = transform mono_reduce "mono_reduce" o toUntangle
adamc@39 828
adamc@202 829 val mono_shake = {
adamc@202 830 func = MonoShake.shake,
adamc@202 831 print = MonoPrint.p_file MonoEnv.empty
adamc@202 832 }
adamc@110 833
adamc@270 834 val toMono_shake = transform mono_shake "mono_shake1" o toMono_reduce
adamc@193 835
adamc@572 836 val toMono_opt2 = transform mono_opt "mono_opt2" o toMono_shake
adamc@572 837
adamc@567 838 val jscomp = {
adamc@567 839 func = JsComp.process,
adamc@567 840 print = MonoPrint.p_file MonoEnv.empty
adamc@567 841 }
adamc@567 842
adamc@572 843 val toJscomp = transform jscomp "jscomp" o toMono_opt2
adamc@567 844
adamc@572 845 val toMono_opt3 = transform mono_opt "mono_opt3" o toJscomp
adamc@20 846
adamc@506 847 val fuse = {
adamc@506 848 func = Fuse.fuse,
adamc@506 849 print = MonoPrint.p_file MonoEnv.empty
adamc@506 850 }
adamc@506 851
adamc@572 852 val toFuse = transform fuse "fuse" o toMono_opt3
adamc@506 853
adamc@506 854 val toUntangle2 = transform untangle "untangle2" o toFuse
adamc@506 855
adamc@601 856 val toMono_reduce2 = transform mono_reduce "mono_reduce2" o toUntangle2
adamc@601 857 val toMono_shake2 = transform mono_shake "mono_shake2" o toMono_reduce2
adamc@506 858
adamc@377 859 val pathcheck = {
adamc@377 860 func = (fn file => (PathCheck.check file; file)),
adamc@377 861 print = MonoPrint.p_file MonoEnv.empty
adamc@377 862 }
adamc@377 863
adamc@506 864 val toPathcheck = transform pathcheck "pathcheck" o toMono_shake2
adamc@377 865
adamc@202 866 val cjrize = {
adamc@202 867 func = Cjrize.cjrize,
adamc@202 868 print = CjrPrint.p_file CjrEnv.empty
adamc@202 869 }
adamc@23 870
adamc@377 871 val toCjrize = transform cjrize "cjrize" o toPathcheck
adamc@29 872
adamc@643 873 val scriptcheck = {
adamc@643 874 func = ScriptCheck.classify,
adamc@643 875 print = CjrPrint.p_file CjrEnv.empty
adamc@643 876 }
adamc@643 877
adamc@643 878 val toScriptcheck = transform scriptcheck "scriptcheck" o toCjrize
adamc@643 879
adamc@282 880 val prepare = {
adamc@282 881 func = Prepare.prepare,
adamc@282 882 print = CjrPrint.p_file CjrEnv.empty
adamc@282 883 }
adamc@282 884
adamc@643 885 val toPrepare = transform prepare "prepare" o toScriptcheck
adamc@282 886
adamc@274 887 val sqlify = {
adamc@274 888 func = Cjrize.cjrize,
adamc@274 889 print = CjrPrint.p_sql CjrEnv.empty
adamc@274 890 }
adamc@274 891
adamc@274 892 val toSqlify = transform sqlify "sqlify" o toMono_opt2
adamc@274 893
adamc@764 894 fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
adamc@183 895 let
adamc@855 896 val proto = Settings.currentProtocol ()
adamc@378 897 val urweb_o = clibFile "urweb.o"
adamc@378 898
adamc@832 899 val compile = "gcc " ^ Config.gccArgs ^ " -Wstrict-prototypes -Werror -O3 -I " ^ Config.includ
adamc@832 900 ^ " -c " ^ cname ^ " -o " ^ oname
adamc@853 901 val link = "gcc -Werror -O3 -lm -lmhash -pthread " ^ libs ^ " " ^ urweb_o ^ " " ^ oname
adamc@855 902 ^ " " ^ #link proto ^ " -o " ^ ename
adamc@502 903
adamc@502 904 val (compile, link) =
adamc@502 905 if profile then
adamc@502 906 (compile ^ " -pg", link ^ " -pg")
adamc@502 907 else
adamc@502 908 (compile, link)
adamc@742 909
adamc@742 910 val (compile, link) =
adamc@742 911 if debug then
adamc@742 912 (compile ^ " -g", link ^ " -g")
adamc@742 913 else
adamc@742 914 (compile, link)
adamc@764 915
adamc@764 916 val link = foldl (fn (s, link) => link ^ " " ^ s) link link'
adamc@183 917 in
adamc@183 918 if not (OS.Process.isSuccess (OS.Process.system compile)) then
adamc@183 919 print "C compilation failed\n"
adamc@183 920 else if not (OS.Process.isSuccess (OS.Process.system link)) then
adamc@186 921 print "C linking failed\n"
adamc@183 922 else
adamc@673 923 ()
adamc@183 924 end
adamc@183 925
adamc@202 926 fun compile job =
adamc@282 927 case run toPrepare job of
adamc@244 928 NONE => print "Ur compilation failed\n"
adamc@29 929 | SOME file =>
adamc@202 930 let
adamc@274 931 val job = valOf (run (transform parseUrp "parseUrp") job)
adamc@102 932
adamc@274 933 val (cname, oname, cleanup) =
adamc@274 934 if #debug job then
adamc@457 935 ("/tmp/webapp.c", "/tmp/webapp.o", fn () => ())
adamc@274 936 else
adamc@274 937 let
adamc@274 938 val dir = OS.FileSys.tmpName ()
adamc@403 939 val () = if OS.FileSys.access (dir, []) then
adamc@403 940 OS.FileSys.remove dir
adamc@403 941 else
adamc@403 942 ()
adamc@457 943 val cname = OS.Path.joinDirFile {dir = dir, file = "webapp.c"}
adamc@457 944 val oname = OS.Path.joinDirFile {dir = dir, file = "webapp.o"}
adamc@274 945 in
adamc@274 946 OS.FileSys.mkDir dir;
adamc@274 947 (cname, oname,
adamc@274 948 fn () => (OS.FileSys.remove cname;
adamc@274 949 OS.FileSys.remove oname;
adamc@473 950 OS.FileSys.rmDir dir)
adamc@473 951 handle OS.SysErr _ => OS.FileSys.rmDir dir)
adamc@274 952 end
adamc@274 953 val ename = #exe job
adamc@202 954 in
adamc@274 955 let
adamc@274 956 val outf = TextIO.openOut cname
adamc@274 957 val s = TextIOPP.openOut {dst = outf, wid = 80}
adamc@432 958
adamc@432 959 val hasDb = List.exists (fn (Cjr.DDatabase _, _) => true | _ => false) (#1 file)
adamc@432 960 val libs =
adamc@432 961 if hasDb then
adamc@866 962 #link (Settings.currentDbms ())
adamc@432 963 else
adamc@432 964 ""
adamc@274 965 in
adamc@274 966 Print.fprint s (CjrPrint.p_file CjrEnv.empty file);
adamc@415 967 TextIO.output1 (outf, #"\n");
adamc@274 968 TextIO.closeOut outf;
adamc@102 969
adamc@274 970 case #sql job of
adamc@274 971 NONE => ()
adamc@274 972 | SOME sql =>
adamc@274 973 let
adamc@274 974 val outf = TextIO.openOut sql
adamc@274 975 val s = TextIOPP.openOut {dst = outf, wid = 80}
adamc@274 976 in
adamc@274 977 Print.fprint s (CjrPrint.p_sql CjrEnv.empty file);
adamc@274 978 TextIO.closeOut outf
adamc@274 979 end;
adamc@274 980
adamc@742 981 compileC {cname = cname, oname = oname, ename = ename, libs = libs,
adamc@764 982 profile = #profile job, debug = #debug job, link = #link job};
adamc@274 983
adamc@274 984 cleanup ()
adamc@274 985 end
adamc@274 986 handle ex => (((cleanup ()) handle _ => ()); raise ex)
adamc@202 987 end
adamc@29 988
adamc@1 989 end