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,
|
adamc@866
|
58 protocol : string option,
|
adamc@1164
|
59 dbms : string option,
|
adamc@1183
|
60 sigFile : string option,
|
adamc@1183
|
61 safeGets : string list
|
adamc@270
|
62 }
|
adamc@201
|
63
|
adamc@201
|
64 type ('src, 'dst) phase = {
|
adamc@201
|
65 func : 'src -> 'dst,
|
adamc@201
|
66 print : 'dst -> Print.PD.pp_desc
|
adamc@201
|
67 }
|
adamc@201
|
68
|
adamc@201
|
69 type pmap = (string * Time.time) list
|
adamc@201
|
70
|
adamc@201
|
71 type ('src, 'dst) transform = {
|
adamc@201
|
72 func : 'src -> 'dst option,
|
adamc@201
|
73 print : 'dst -> Print.PD.pp_desc,
|
adamc@201
|
74 time : 'src * pmap -> 'dst option * pmap
|
adamc@201
|
75 }
|
adamc@201
|
76
|
adamc@1079
|
77 val debug = ref false
|
adamc@1079
|
78
|
adamc@201
|
79 fun transform (ph : ('src, 'dst) phase) name = {
|
adamc@201
|
80 func = fn input => let
|
adamc@1079
|
81 val () = if !debug then
|
adamc@1079
|
82 print ("Starting " ^ name ^ "....\n")
|
adamc@1079
|
83 else
|
adamc@1079
|
84 ()
|
adamc@201
|
85 val v = #func ph input
|
adamc@201
|
86 in
|
adamc@1079
|
87 if !debug then
|
adamc@1079
|
88 print ("Finished " ^ name ^ ".\n")
|
adamc@1079
|
89 else
|
adamc@1079
|
90 ();
|
adamc@201
|
91 if ErrorMsg.anyErrors () then
|
adamc@201
|
92 NONE
|
adamc@201
|
93 else
|
adamc@201
|
94 SOME v
|
adamc@201
|
95 end,
|
adamc@201
|
96 print = #print ph,
|
adamc@201
|
97 time = fn (input, pmap) => let
|
adamc@1186
|
98 val () = if !debug then
|
adamc@1186
|
99 print ("Starting " ^ name ^ "....\n")
|
adamc@1186
|
100 else
|
adamc@1186
|
101 ()
|
adamc@201
|
102 val befor = Time.now ()
|
adamc@201
|
103 val v = #func ph input
|
adamc@201
|
104 val elapsed = Time.- (Time.now (), befor)
|
adamc@201
|
105 in
|
adamc@1186
|
106 if !debug then
|
adamc@1186
|
107 print ("Finished " ^ name ^ ".\n")
|
adamc@1186
|
108 else
|
adamc@1186
|
109 ();
|
adamc@201
|
110 (if ErrorMsg.anyErrors () then
|
adamc@201
|
111 NONE
|
adamc@201
|
112 else
|
adamc@201
|
113 SOME v,
|
adamc@201
|
114 (name, elapsed) :: pmap)
|
adamc@201
|
115 end
|
adamc@201
|
116 }
|
adamc@201
|
117
|
adamc@346
|
118 fun check (tr : ('src, 'dst) transform) x = (ErrorMsg.resetErrors ();
|
adamc@346
|
119 ignore (#func tr x))
|
adamc@346
|
120
|
adamc@280
|
121 fun run (tr : ('src, 'dst) transform) x = (ErrorMsg.resetErrors ();
|
adamc@280
|
122 #func tr x)
|
adamc@201
|
123
|
adamc@201
|
124 fun runPrint (tr : ('src, 'dst) transform) input =
|
adamc@280
|
125 (ErrorMsg.resetErrors ();
|
adamc@280
|
126 case #func tr input of
|
adamc@280
|
127 NONE => print "Failure\n"
|
adamc@280
|
128 | SOME v =>
|
adamc@280
|
129 (print "Success\n";
|
adamc@280
|
130 Print.print (#print tr v);
|
adamc@280
|
131 print "\n"))
|
adamc@201
|
132
|
adamc@201
|
133 fun time (tr : ('src, 'dst) transform) input =
|
adamc@55
|
134 let
|
adamc@201
|
135 val (_, pmap) = #time tr (input, [])
|
adamc@201
|
136 in
|
adamc@201
|
137 app (fn (name, time) =>
|
adamc@201
|
138 print (name ^ ": " ^ LargeReal.toString (Time.toReal time) ^ "\n")) (rev pmap);
|
adamc@201
|
139 print ("TOTAL: " ^ LargeReal.toString (Time.toReal (foldl Time.+ Time.zeroTime (map #2 pmap))) ^ "\n");
|
adamc@201
|
140 print "\n"
|
adamc@201
|
141 end
|
adamc@55
|
142
|
adamc@201
|
143 fun timePrint (tr : ('src, 'dst) transform) input =
|
adamc@201
|
144 let
|
adamc@201
|
145 val (ro, pmap) = #time tr (input, [])
|
adamc@55
|
146 in
|
adamc@201
|
147 app (fn (name, time) =>
|
adamc@201
|
148 print (name ^ ": " ^ LargeReal.toString (Time.toReal time) ^ "\n")) (rev pmap);
|
adamc@201
|
149 print ("TOTAL: " ^ LargeReal.toString (Time.toReal (foldl Time.+ Time.zeroTime (map #2 pmap))) ^ "\n");
|
adamc@201
|
150 print "\n";
|
adamc@201
|
151 case ro of
|
adamc@201
|
152 NONE => print "Failure\n"
|
adamc@201
|
153 | SOME v =>
|
adamc@201
|
154 (print "Success\n";
|
adamc@201
|
155 Print.print (#print tr v);
|
adamc@201
|
156 print "\n")
|
adamc@55
|
157 end
|
adamc@55
|
158
|
adamc@244
|
159 val parseUrs =
|
adamc@201
|
160 {func = fn filename => let
|
adamc@201
|
161 val fname = OS.FileSys.tmpName ()
|
adamc@201
|
162 val outf = TextIO.openOut fname
|
adamc@201
|
163 val () = TextIO.output (outf, "sig\n")
|
adamc@201
|
164 val inf = TextIO.openIn filename
|
adamc@201
|
165 fun loop () =
|
adamc@201
|
166 case TextIO.inputLine inf of
|
adamc@201
|
167 NONE => ()
|
adamc@201
|
168 | SOME line => (TextIO.output (outf, line);
|
adamc@201
|
169 loop ())
|
adamc@201
|
170 val () = loop ()
|
adamc@201
|
171 val () = TextIO.closeIn inf
|
adamc@201
|
172 val () = TextIO.closeOut outf
|
adamc@201
|
173
|
adamc@201
|
174 val () = (ErrorMsg.resetErrors ();
|
adamc@201
|
175 ErrorMsg.resetPositioning filename;
|
adamc@201
|
176 Lex.UserDeclarations.initialize ())
|
adamc@201
|
177 val file = TextIO.openIn fname
|
adamc@201
|
178 fun get _ = TextIO.input file
|
adamc@201
|
179 fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
|
adamc@201
|
180 val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
|
adamc@244
|
181 val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
|
adamc@201
|
182 in
|
adamc@201
|
183 TextIO.closeIn file;
|
adamc@201
|
184 case absyn of
|
adamc@201
|
185 [(Source.DSgn ("?", (Source.SgnConst sgis, _)), _)] => sgis
|
adamc@201
|
186 | _ => (ErrorMsg.errorAt {file = filename,
|
adamc@201
|
187 first = {line = 0,
|
adamc@201
|
188 char = 0},
|
adamc@201
|
189 last = {line = 0,
|
adamc@201
|
190 char = 0}} "Not a signature";
|
adamc@201
|
191 [])
|
adamc@201
|
192 end
|
adamc@201
|
193 handle LrParser.ParseError => [],
|
adamc@201
|
194 print = Print.p_list_sep Print.PD.newline SourcePrint.p_sgn_item}
|
adamc@55
|
195
|
adamc@1
|
196 (* The main parsing routine *)
|
adamc@244
|
197 val parseUr = {
|
adamc@201
|
198 func = fn filename =>
|
adamc@201
|
199 let
|
adamc@201
|
200 val () = (ErrorMsg.resetErrors ();
|
adamc@201
|
201 ErrorMsg.resetPositioning filename;
|
adamc@201
|
202 Lex.UserDeclarations.initialize ())
|
adamc@201
|
203 val file = TextIO.openIn filename
|
adamc@201
|
204 fun get _ = TextIO.input file
|
adamc@201
|
205 fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
|
adamc@201
|
206 val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
|
adamc@244
|
207 val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
|
adamc@201
|
208 in
|
adamc@201
|
209 TextIO.closeIn file;
|
adamc@201
|
210 case absyn of
|
adamc@201
|
211 [(Source.DSgn ("?", _), _)] =>
|
adamc@201
|
212 (ErrorMsg.errorAt {file = filename,
|
adamc@201
|
213 first = {line = 0,
|
adamc@201
|
214 char = 0},
|
adamc@201
|
215 last = {line = 0,
|
adamc@201
|
216 char = 0}} "File starts with 'sig'";
|
adamc@201
|
217 [])
|
adamc@201
|
218 | _ => absyn
|
adamc@201
|
219 end
|
adamc@201
|
220 handle LrParser.ParseError => [],
|
adamc@201
|
221 print = SourcePrint.p_file}
|
adamc@56
|
222
|
adamc@768
|
223 fun p_job ({prefix, database, exe, sql, sources, debug, profile,
|
adamc@768
|
224 timeout, ffi, link, headers, scripts,
|
adamc@1171
|
225 clientToServer, effectful, benignEffectful, clientOnly, serverOnly, jsFuncs, ...} : job) =
|
adamc@270
|
226 let
|
adamc@270
|
227 open Print.PD
|
adamc@270
|
228 open Print
|
adamc@765
|
229
|
adamc@765
|
230 fun p_ffi name = p_list_sep (box []) (fn (m, s) =>
|
adamc@765
|
231 box [string name, space, string m, string ".", string s, newline])
|
adamc@270
|
232 in
|
adamc@274
|
233 box [if debug then
|
adamc@274
|
234 box [string "DEBUG", newline]
|
adamc@274
|
235 else
|
adamc@274
|
236 box [],
|
adamc@502
|
237 if profile then
|
adamc@502
|
238 box [string "PROFILE", newline]
|
adamc@502
|
239 else
|
adamc@502
|
240 box [],
|
adamc@274
|
241 case database of
|
adamc@270
|
242 NONE => string "No database."
|
adamc@270
|
243 | SOME db => string ("Database: " ^ db),
|
adamc@270
|
244 newline,
|
adamc@274
|
245 string "Exe: ",
|
adamc@274
|
246 string exe,
|
adamc@274
|
247 newline,
|
adamc@274
|
248 case sql of
|
adamc@274
|
249 NONE => string "No SQL file."
|
adamc@274
|
250 | SOME sql => string ("SQL fle: " ^ sql),
|
adamc@673
|
251 newline,
|
adamc@673
|
252 string "Timeout: ",
|
adamc@673
|
253 string (Int.toString timeout),
|
adamc@673
|
254 newline,
|
adamc@764
|
255 p_list_sep (box []) (fn s => box [string "Ffi", space, string s, newline]) ffi,
|
adamc@764
|
256 p_list_sep (box []) (fn s => box [string "Header", space, string s, newline]) headers,
|
adamc@766
|
257 p_list_sep (box []) (fn s => box [string "Script", space, string s, newline]) scripts,
|
adamc@764
|
258 p_list_sep (box []) (fn s => box [string "Link", space, string s, newline]) link,
|
adamc@765
|
259 p_ffi "ClientToServer" clientToServer,
|
adamc@765
|
260 p_ffi "Effectful" effectful,
|
adamc@1171
|
261 p_ffi "BenignEffectful" benignEffectful,
|
adamc@765
|
262 p_ffi "ClientOnly" clientOnly,
|
adamc@765
|
263 p_ffi "ServerOnly" serverOnly,
|
adamc@765
|
264 p_list_sep (box []) (fn ((m, s), s') =>
|
adamc@765
|
265 box [string "JsFunc", space, string m, string ".", string s,
|
adamc@765
|
266 space, string "=", space, string s', newline]) jsFuncs,
|
adamc@270
|
267 string "Sources:",
|
adamc@270
|
268 p_list string sources,
|
adamc@270
|
269 newline]
|
adamc@270
|
270 end
|
adamc@270
|
271
|
adamc@270
|
272 fun trim s =
|
adamc@270
|
273 let
|
adamc@270
|
274 val (_, s) = Substring.splitl Char.isSpace s
|
adamc@270
|
275 val (s, _) = Substring.splitr Char.isSpace s
|
adamc@270
|
276 in
|
adamc@270
|
277 s
|
adamc@270
|
278 end
|
adamc@270
|
279
|
adamc@794
|
280 structure M = BinaryMapFn(struct
|
adamc@794
|
281 type ord_key = string
|
adamc@794
|
282 val compare = String.compare
|
adamc@794
|
283 end)
|
adamc@794
|
284
|
adamc@1089
|
285 val pathmap = ref (M.insert (M.empty, "", Config.libUr))
|
adamc@1089
|
286
|
adamc@1089
|
287 fun addPath (k, v) = pathmap := M.insert (!pathmap, k, v)
|
adamc@1089
|
288
|
adamc@1082
|
289 fun parseUrp' accLibs fname =
|
adamc@767
|
290 let
|
adamc@1089
|
291 val pathmap = ref (!pathmap)
|
adamc@1082
|
292 val bigLibs = ref []
|
adamc@767
|
293
|
adamc@794
|
294 fun pu filename =
|
adamc@794
|
295 let
|
adamc@794
|
296 val dir = OS.Path.dir filename
|
adamc@1151
|
297 fun opener () = TextIO.openIn (OS.Path.joinBaseExt {base = filename, ext = SOME "urp"})
|
adamc@1151
|
298
|
adamc@1151
|
299 val inf = opener ()
|
adamc@1151
|
300
|
adamc@1157
|
301 fun hasSpaceLine () =
|
adamc@1151
|
302 case TextIO.inputLine inf of
|
adamc@1151
|
303 NONE => false
|
adamc@1173
|
304 | SOME s => s = "debug\n" orelse s = "profile\n"
|
adamc@1173
|
305 orelse CharVector.exists (fn ch => ch = #" " orelse ch = #"\t") s orelse hasSpaceLine ()
|
adamc@1151
|
306
|
adamc@1157
|
307 val hasBlankLine = hasSpaceLine ()
|
adamc@1151
|
308
|
adamc@1151
|
309 val inf = (TextIO.closeIn inf; opener ())
|
adamc@767
|
310
|
adamc@794
|
311 fun pathify fname =
|
adamc@794
|
312 if size fname > 0 andalso String.sub (fname, 0) = #"$" then
|
adamc@794
|
313 let
|
adamc@794
|
314 val fname' = Substring.extract (fname, 1, NONE)
|
adamc@794
|
315 val (befor, after) = Substring.splitl (fn ch => ch <> #"/") fname'
|
adamc@794
|
316 in
|
adamc@794
|
317 if Substring.isEmpty after then
|
adamc@794
|
318 fname
|
adamc@794
|
319 else
|
adamc@794
|
320 case M.find (!pathmap, Substring.string befor) of
|
adamc@794
|
321 NONE => fname
|
adamc@794
|
322 | SOME rep => rep ^ Substring.string after
|
adamc@794
|
323 end
|
adamc@794
|
324 else
|
adamc@794
|
325 fname
|
adamc@767
|
326
|
adamc@794
|
327 fun relify fname =
|
adamc@794
|
328 let
|
adamc@794
|
329 val fname = pathify fname
|
adamc@794
|
330 in
|
adamc@794
|
331 OS.Path.concat (dir, fname)
|
adamc@794
|
332 handle OS.Path.Path => fname
|
adamc@794
|
333 end
|
adamc@767
|
334
|
adamc@1089
|
335 fun libify path =
|
adamc@1089
|
336 (if Posix.FileSys.access (path ^ ".urp", []) then
|
adamc@1089
|
337 path
|
adamc@1089
|
338 else
|
adamc@1089
|
339 path ^ "/lib")
|
adamc@1089
|
340 handle SysErr => path
|
adamc@1089
|
341
|
adamc@1089
|
342 fun libify' path =
|
adamc@1089
|
343 (if Posix.FileSys.access (relify path ^ ".urp", []) then
|
adamc@1089
|
344 path
|
adamc@1089
|
345 else
|
adamc@1089
|
346 path ^ "/lib")
|
adamc@1089
|
347 handle SysErr => path
|
adamc@1089
|
348
|
adamc@794
|
349 val absDir = OS.Path.mkAbsolute {path = dir, relativeTo = OS.FileSys.getDir ()}
|
adamc@767
|
350
|
adamc@794
|
351 fun relifyA fname =
|
adamc@794
|
352 OS.Path.mkAbsolute {path = pathify fname, relativeTo = absDir}
|
adamc@767
|
353
|
adamc@794
|
354 fun readSources acc =
|
adamc@794
|
355 case TextIO.inputLine inf of
|
adamc@794
|
356 NONE => rev acc
|
adamc@794
|
357 | SOME line =>
|
adamc@794
|
358 let
|
adamc@794
|
359 val acc = if CharVector.all Char.isSpace line then
|
adamc@794
|
360 acc
|
adamc@794
|
361 else
|
adamc@794
|
362 let
|
adamc@794
|
363 val fname = String.implode (List.filter (fn x => not (Char.isSpace x))
|
adamc@794
|
364 (String.explode line))
|
adamc@1126
|
365 val fname = relifyA fname
|
adamc@794
|
366 in
|
adamc@794
|
367 fname :: acc
|
adamc@794
|
368 end
|
adamc@794
|
369 in
|
adamc@794
|
370 readSources acc
|
adamc@794
|
371 end
|
adamc@767
|
372
|
adamc@794
|
373 val prefix = ref NONE
|
adamc@891
|
374 val database = ref (Settings.getDbstring ())
|
adamc@891
|
375 val exe = ref (Settings.getExe ())
|
adamc@891
|
376 val sql = ref (Settings.getSql ())
|
adamc@857
|
377 val debug = ref (Settings.getDebug ())
|
adamc@794
|
378 val profile = ref false
|
adamc@794
|
379 val timeout = ref NONE
|
adamc@794
|
380 val ffi = ref []
|
adamc@794
|
381 val link = ref []
|
adamc@794
|
382 val headers = ref []
|
adamc@794
|
383 val scripts = ref []
|
adamc@794
|
384 val clientToServer = ref []
|
adamc@794
|
385 val effectful = ref []
|
adamc@1171
|
386 val benignEffectful = ref []
|
adamc@794
|
387 val clientOnly = ref []
|
adamc@794
|
388 val serverOnly = ref []
|
adamc@794
|
389 val jsFuncs = ref []
|
adamc@794
|
390 val rewrites = ref []
|
adamc@794
|
391 val url = ref []
|
adamc@794
|
392 val mime = ref []
|
adamc@794
|
393 val libs = ref []
|
adamc@866
|
394 val protocol = ref NONE
|
adamc@866
|
395 val dbms = ref NONE
|
adamc@1164
|
396 val sigFile = ref (Settings.getSigFile ())
|
adamc@1183
|
397 val safeGets = ref []
|
adamc@767
|
398
|
adamc@794
|
399 fun finish sources =
|
adamc@794
|
400 let
|
adamc@794
|
401 val job = {
|
adamc@794
|
402 prefix = Option.getOpt (!prefix, "/"),
|
adamc@794
|
403 database = !database,
|
adamc@794
|
404 exe = Option.getOpt (!exe, OS.Path.joinBaseExt {base = OS.Path.base filename,
|
adamc@794
|
405 ext = SOME "exe"}),
|
adamc@794
|
406 sql = !sql,
|
adamc@794
|
407 debug = !debug,
|
adamc@794
|
408 profile = !profile,
|
adamc@794
|
409 timeout = Option.getOpt (!timeout, 60),
|
adamc@794
|
410 ffi = rev (!ffi),
|
adamc@794
|
411 link = rev (!link),
|
adamc@794
|
412 headers = rev (!headers),
|
adamc@794
|
413 scripts = rev (!scripts),
|
adamc@794
|
414 clientToServer = rev (!clientToServer),
|
adamc@794
|
415 effectful = rev (!effectful),
|
adamc@1171
|
416 benignEffectful = rev (!benignEffectful),
|
adamc@794
|
417 clientOnly = rev (!clientOnly),
|
adamc@794
|
418 serverOnly = rev (!serverOnly),
|
adamc@794
|
419 jsFuncs = rev (!jsFuncs),
|
adamc@794
|
420 rewrites = rev (!rewrites),
|
adamc@794
|
421 filterUrl = rev (!url),
|
adamc@794
|
422 filterMime = rev (!mime),
|
adamc@866
|
423 sources = sources,
|
adamc@866
|
424 protocol = !protocol,
|
adamc@1164
|
425 dbms = !dbms,
|
adamc@1183
|
426 sigFile = !sigFile,
|
adamc@1183
|
427 safeGets = rev (!safeGets)
|
adamc@794
|
428 }
|
adamc@767
|
429
|
adamc@794
|
430 fun mergeO f (old, new) =
|
adamc@794
|
431 case (old, new) of
|
adamc@794
|
432 (NONE, _) => new
|
adamc@794
|
433 | (_, NONE) => old
|
adamc@794
|
434 | (SOME v1, SOME v2) => SOME (f (v1, v2))
|
adamc@794
|
435
|
adamc@794
|
436 fun same desc = mergeO (fn (x : string, y) =>
|
adamc@794
|
437 (if x = y then
|
adamc@794
|
438 ()
|
adamc@794
|
439 else
|
adamc@794
|
440 ErrorMsg.error ("Multiple "
|
adamc@794
|
441 ^ desc ^ " values that don't agree");
|
adamc@794
|
442 x))
|
adamc@794
|
443
|
adamc@794
|
444 fun merge (old : job, new : job) = {
|
adamc@794
|
445 prefix = #prefix old,
|
adamc@891
|
446 database = mergeO (fn (old, _) => old) (#database old, #database new),
|
adamc@794
|
447 exe = #exe old,
|
adamc@794
|
448 sql = #sql old,
|
adamc@794
|
449 debug = #debug old orelse #debug new,
|
adamc@794
|
450 profile = #profile old orelse #profile new,
|
adamc@794
|
451 timeout = #timeout old,
|
adamc@794
|
452 ffi = #ffi old @ #ffi new,
|
adamc@794
|
453 link = #link old @ #link new,
|
adamc@794
|
454 headers = #headers old @ #headers new,
|
adamc@794
|
455 scripts = #scripts old @ #scripts new,
|
adamc@794
|
456 clientToServer = #clientToServer old @ #clientToServer new,
|
adamc@794
|
457 effectful = #effectful old @ #effectful new,
|
adamc@1171
|
458 benignEffectful = #benignEffectful old @ #benignEffectful new,
|
adamc@794
|
459 clientOnly = #clientOnly old @ #clientOnly new,
|
adamc@794
|
460 serverOnly = #serverOnly old @ #serverOnly new,
|
adamc@794
|
461 jsFuncs = #jsFuncs old @ #jsFuncs new,
|
adamc@794
|
462 rewrites = #rewrites old @ #rewrites new,
|
adamc@794
|
463 filterUrl = #filterUrl old @ #filterUrl new,
|
adamc@794
|
464 filterMime = #filterMime old @ #filterMime new,
|
adamc@1092
|
465 sources = #sources new
|
adamc@1092
|
466 @ List.filter (fn s => List.all (fn s' => s' <> s) (#sources new))
|
adamc@1092
|
467 (#sources old),
|
adamc@866
|
468 protocol = mergeO #2 (#protocol old, #protocol new),
|
adamc@1164
|
469 dbms = mergeO #2 (#dbms old, #dbms new),
|
adamc@1183
|
470 sigFile = mergeO #2 (#sigFile old, #sigFile new),
|
adamc@1183
|
471 safeGets = #safeGets old @ #safeGets new
|
adamc@794
|
472 }
|
adamc@794
|
473 in
|
adamc@1082
|
474 if accLibs then
|
adamc@1082
|
475 foldr (fn (job', job) => merge (job, job')) job (!libs)
|
adamc@1082
|
476 else
|
adamc@1082
|
477 job
|
adamc@794
|
478 end
|
adamc@794
|
479
|
adamc@794
|
480 fun parsePkind s =
|
adamc@794
|
481 case s of
|
adamc@794
|
482 "all" => Settings.Any
|
adamc@794
|
483 | "url" => Settings.Url
|
adamc@794
|
484 | "table" => Settings.Table
|
adamc@794
|
485 | "sequence" => Settings.Sequence
|
adamc@794
|
486 | "view" => Settings.View
|
adamc@794
|
487 | "relation" => Settings.Relation
|
adamc@794
|
488 | "cookie" => Settings.Cookie
|
adamc@794
|
489 | "style" => Settings.Style
|
adamc@794
|
490 | _ => (ErrorMsg.error "Bad path kind spec";
|
adamc@794
|
491 Settings.Any)
|
adamc@794
|
492
|
adamc@794
|
493 fun parseFrom s =
|
adamc@794
|
494 if size s > 1 andalso String.sub (s, size s - 2) = #"/" andalso String.sub (s, size s - 1) = #"*" then
|
adamc@794
|
495 (Settings.Prefix, String.substring (s, 0, size s - 1))
|
adamc@794
|
496 else
|
adamc@794
|
497 (Settings.Exact, s)
|
adamc@794
|
498
|
adamc@794
|
499 fun parseFkind s =
|
adamc@794
|
500 case s of
|
adamc@794
|
501 "url" => url
|
adamc@794
|
502 | "mime" => mime
|
adamc@794
|
503 | _ => (ErrorMsg.error "Bad filter kind";
|
adamc@794
|
504 url)
|
adamc@794
|
505
|
adamc@794
|
506 fun parsePattern s =
|
adamc@794
|
507 if size s > 0 andalso String.sub (s, size s - 1) = #"*" then
|
adamc@794
|
508 (Settings.Prefix, String.substring (s, 0, size s - 1))
|
adamc@794
|
509 else
|
adamc@794
|
510 (Settings.Exact, s)
|
adamc@794
|
511
|
adamc@794
|
512 fun read () =
|
adamc@794
|
513 case TextIO.inputLine inf of
|
adamc@794
|
514 NONE => finish []
|
adamc@794
|
515 | SOME "\n" => finish (readSources [])
|
adamc@794
|
516 | SOME line =>
|
adamc@794
|
517 let
|
adamc@794
|
518 val (cmd, arg) = Substring.splitl (fn x => not (Char.isSpace x)) (Substring.full line)
|
adamc@794
|
519 val cmd = Substring.string (trim cmd)
|
adamc@794
|
520 val arg = Substring.string (trim arg)
|
adamc@794
|
521
|
adamc@794
|
522 fun ffiS () =
|
adamc@794
|
523 case String.fields (fn ch => ch = #".") arg of
|
adamc@794
|
524 [m, x] => (m, x)
|
adamc@794
|
525 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func");
|
adamc@794
|
526 ("", ""))
|
adamc@794
|
527
|
adamc@794
|
528 fun ffiM () =
|
adamc@794
|
529 case String.fields (fn ch => ch = #"=") arg of
|
adamc@794
|
530 [f, s] =>
|
adamc@794
|
531 (case String.fields (fn ch => ch = #".") f of
|
adamc@794
|
532 [m, x] => ((m, x), s)
|
adamc@794
|
533 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func=func'");
|
adamc@794
|
534 (("", ""), "")))
|
adamc@794
|
535 | _ => (ErrorMsg.error (cmd ^ " argument not of the form Module.func=func'");
|
adamc@794
|
536 (("", ""), ""))
|
adamc@794
|
537 in
|
adamc@794
|
538 case cmd of
|
adamc@794
|
539 "prefix" =>
|
adamc@794
|
540 (case !prefix of
|
adamc@794
|
541 NONE => ()
|
adamc@794
|
542 | SOME _ => ErrorMsg.error "Duplicate 'prefix' directive";
|
adamc@794
|
543 prefix := SOME arg)
|
adamc@794
|
544 | "database" =>
|
adamc@794
|
545 (case !database of
|
adamc@891
|
546 NONE => database := SOME arg
|
adamc@891
|
547 | SOME _ => ())
|
adamc@1164
|
548 | "dbms" =>
|
adamc@1164
|
549 (case !dbms of
|
adamc@1164
|
550 NONE => dbms := SOME arg
|
adamc@1164
|
551 | SOME _ => ())
|
adamc@1164
|
552 | "sigfile" =>
|
adamc@1164
|
553 (case !sigFile of
|
adamc@1164
|
554 NONE => sigFile := SOME arg
|
adamc@1164
|
555 | SOME _ => ())
|
adamc@794
|
556 | "exe" =>
|
adamc@794
|
557 (case !exe of
|
adamc@891
|
558 NONE => exe := SOME (relify arg)
|
adamc@891
|
559 | SOME _ => ())
|
adamc@794
|
560 | "sql" =>
|
adamc@794
|
561 (case !sql of
|
adamc@891
|
562 NONE => sql := SOME (relify arg)
|
adamc@891
|
563 | SOME _ => ())
|
adamc@794
|
564 | "debug" => debug := true
|
adamc@794
|
565 | "profile" => profile := true
|
adamc@794
|
566 | "timeout" =>
|
adamc@794
|
567 (case !timeout of
|
adamc@794
|
568 NONE => ()
|
adamc@794
|
569 | SOME _ => ErrorMsg.error "Duplicate 'timeout' directive";
|
adamc@794
|
570 timeout := SOME (valOf (Int.fromString arg)))
|
adamc@794
|
571 | "ffi" => ffi := relify arg :: !ffi
|
adamc@1061
|
572 | "link" => let
|
adamc@1096
|
573 val arg = if size arg >= 1
|
adamc@1096
|
574 andalso String.sub (arg, 0) = #"-" then
|
adamc@1061
|
575 arg
|
adamc@1061
|
576 else
|
adamc@1061
|
577 relifyA arg
|
adamc@1061
|
578 in
|
adamc@1061
|
579 link := arg :: !link
|
adamc@1061
|
580 end
|
adamc@794
|
581 | "include" => headers := relifyA arg :: !headers
|
adamc@794
|
582 | "script" => scripts := arg :: !scripts
|
adamc@794
|
583 | "clientToServer" => clientToServer := ffiS () :: !clientToServer
|
adamc@1183
|
584 | "safeGet" => safeGets := arg :: !safeGets
|
adamc@1184
|
585 | "effectful" => effectful := ffiS () :: !effectful
|
adamc@1171
|
586 | "benignEffectful" => benignEffectful := ffiS () :: !benignEffectful
|
adamc@794
|
587 | "clientOnly" => clientOnly := ffiS () :: !clientOnly
|
adamc@794
|
588 | "serverOnly" => serverOnly := ffiS () :: !serverOnly
|
adamc@794
|
589 | "jsFunc" => jsFuncs := ffiM () :: !jsFuncs
|
adamc@794
|
590 | "rewrite" =>
|
adamc@794
|
591 let
|
adamc@794
|
592 fun doit (pkind, from, to) =
|
adamc@794
|
593 let
|
adamc@794
|
594 val pkind = parsePkind pkind
|
adamc@794
|
595 val (kind, from) = parseFrom from
|
adamc@794
|
596 in
|
adamc@794
|
597 rewrites := {pkind = pkind, kind = kind, from = from, to = to} :: !rewrites
|
adamc@794
|
598 end
|
adamc@794
|
599 in
|
adamc@794
|
600 case String.tokens Char.isSpace arg of
|
adamc@794
|
601 [pkind, from, to] => doit (pkind, from, to)
|
adamc@794
|
602 | [pkind, from] => doit (pkind, from, "")
|
adamc@794
|
603 | _ => ErrorMsg.error "Bad 'rewrite' syntax"
|
adamc@794
|
604 end
|
adamc@794
|
605 | "allow" =>
|
adamc@794
|
606 (case String.tokens Char.isSpace arg of
|
adamc@794
|
607 [fkind, pattern] =>
|
adamc@794
|
608 let
|
adamc@794
|
609 val fkind = parseFkind fkind
|
adamc@794
|
610 val (kind, pattern) = parsePattern pattern
|
adamc@794
|
611 in
|
adamc@794
|
612 fkind := {action = Settings.Allow, kind = kind, pattern = pattern} :: !fkind
|
adamc@794
|
613 end
|
adamc@794
|
614 | _ => ErrorMsg.error "Bad 'allow' syntax")
|
adamc@794
|
615 | "deny" =>
|
adamc@794
|
616 (case String.tokens Char.isSpace arg of
|
adamc@794
|
617 [fkind, pattern] =>
|
adamc@794
|
618 let
|
adamc@794
|
619 val fkind = parseFkind fkind
|
adamc@794
|
620 val (kind, pattern) = parsePattern pattern
|
adamc@794
|
621 in
|
adamc@794
|
622 fkind := {action = Settings.Deny, kind = kind, pattern = pattern} :: !fkind
|
adamc@794
|
623 end
|
adamc@794
|
624 | _ => ErrorMsg.error "Bad 'deny' syntax")
|
adamc@1082
|
625 | "library" => if accLibs then
|
adamc@1089
|
626 libs := pu (libify (relify arg)) :: !libs
|
adamc@1082
|
627 else
|
adamc@1089
|
628 bigLibs := libify' arg :: !bigLibs
|
adamc@794
|
629 | "path" =>
|
adamc@794
|
630 (case String.fields (fn ch => ch = #"=") arg of
|
adamc@794
|
631 [n, v] => pathmap := M.insert (!pathmap, n, v)
|
adamc@794
|
632 | _ => ErrorMsg.error "path argument not of the form name=value'")
|
adamc@794
|
633 | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'");
|
adamc@794
|
634 read ()
|
adamc@794
|
635 end
|
adamc@794
|
636
|
adamc@1151
|
637 val job = if hasBlankLine then
|
adamc@1151
|
638 read ()
|
adamc@1151
|
639 else
|
adamc@1151
|
640 finish (readSources [])
|
adamc@767
|
641 in
|
adamc@794
|
642 TextIO.closeIn inf;
|
adamc@794
|
643 Settings.setUrlPrefix (#prefix job);
|
adamc@794
|
644 Settings.setTimeout (#timeout job);
|
adamc@794
|
645 Settings.setHeaders (#headers job);
|
adamc@794
|
646 Settings.setScripts (#scripts job);
|
adamc@794
|
647 Settings.setClientToServer (#clientToServer job);
|
adamc@794
|
648 Settings.setEffectful (#effectful job);
|
adamc@1171
|
649 Settings.setBenignEffectful (#benignEffectful job);
|
adamc@794
|
650 Settings.setClientOnly (#clientOnly job);
|
adamc@794
|
651 Settings.setServerOnly (#serverOnly job);
|
adamc@794
|
652 Settings.setJsFuncs (#jsFuncs job);
|
adamc@794
|
653 Settings.setRewriteRules (#rewrites job);
|
adamc@794
|
654 Settings.setUrlRules (#filterUrl job);
|
adamc@794
|
655 Settings.setMimeRules (#filterMime job);
|
adamc@866
|
656 Option.app Settings.setProtocol (#protocol job);
|
adamc@866
|
657 Option.app Settings.setDbms (#dbms job);
|
adamc@1183
|
658 Settings.setSafeGets (#safeGets job);
|
adamc@794
|
659 job
|
adamc@767
|
660 end
|
adamc@767
|
661 in
|
adamc@1082
|
662 {Job = pu fname, Libs = !bigLibs}
|
adamc@767
|
663 end
|
adamc@767
|
664
|
adamc@1082
|
665 fun p_job' {Job = j, Libs = _ : string list} = p_job j
|
adamc@1082
|
666
|
adamc@270
|
667 val parseUrp = {
|
adamc@1083
|
668 func = #Job o parseUrp' true,
|
adamc@270
|
669 print = p_job
|
adamc@270
|
670 }
|
adamc@270
|
671
|
adamc@1082
|
672 val parseUrp' = {
|
adamc@1083
|
673 func = parseUrp' false,
|
adamc@1082
|
674 print = p_job'
|
adamc@1082
|
675 }
|
adamc@1082
|
676
|
adamc@270
|
677 val toParseJob = transform parseUrp "parseJob"
|
adamc@1082
|
678 val toParseJob' = transform parseUrp' "parseJob'"
|
adamc@1082
|
679
|
adamc@1082
|
680 fun op o (tr2 : ('b, 'c) transform, tr1 : ('a, 'b) transform) = {
|
adamc@1082
|
681 func = fn input => case #func tr1 input of
|
adamc@1082
|
682 NONE => NONE
|
adamc@1082
|
683 | SOME v => #func tr2 v,
|
adamc@1082
|
684 print = #print tr2,
|
adamc@1082
|
685 time = fn (input, pmap) => let
|
adamc@1082
|
686 val (ro, pmap) = #time tr1 (input, pmap)
|
adamc@1082
|
687 in
|
adamc@1082
|
688 case ro of
|
adamc@1082
|
689 NONE => (NONE, pmap)
|
adamc@1082
|
690 | SOME v => #time tr2 (v, pmap)
|
adamc@1082
|
691 end
|
adamc@1082
|
692 }
|
adamc@270
|
693
|
adamc@56
|
694 fun capitalize "" = ""
|
adamc@56
|
695 | capitalize s = str (Char.toUpper (String.sub (s, 0))) ^ String.extract (s, 1, NONE)
|
adamc@56
|
696
|
adamc@1090
|
697 structure SM = BinaryMapFn(struct
|
adamc@1090
|
698 type ord_key = string
|
adamc@1090
|
699 val compare = String.compare
|
adamc@1090
|
700 end)
|
adamc@1090
|
701
|
adamc@1090
|
702 val moduleRoots = ref ([] : (string * string) list)
|
adamc@1090
|
703 fun addModuleRoot (k, v) = moduleRoots := (k, v) :: !moduleRoots
|
adamc@1090
|
704
|
adamc@1090
|
705 structure SS = BinarySetFn(struct
|
adamc@1090
|
706 type ord_key = string
|
adamc@1090
|
707 val compare = String.compare
|
adamc@1090
|
708 end)
|
adamc@1090
|
709
|
adamc@201
|
710 val parse = {
|
adamc@764
|
711 func = fn {database, sources = fnames, ffi, ...} : job =>
|
adamc@201
|
712 let
|
adamc@1090
|
713 val mrs = !moduleRoots
|
adamc@1090
|
714
|
adamc@834
|
715 val anyErrors = ref false
|
adamc@834
|
716 fun checkErrors () = anyErrors := (!anyErrors orelse ErrorMsg.anyErrors ())
|
adamc@201
|
717 fun nameOf fname = capitalize (OS.Path.file fname)
|
adamc@109
|
718
|
adamc@764
|
719 fun parseFfi fname =
|
adamc@764
|
720 let
|
adamc@764
|
721 val mname = nameOf fname
|
adamc@764
|
722 val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
|
adamc@764
|
723
|
adamc@764
|
724 val loc = {file = urs,
|
adamc@764
|
725 first = ErrorMsg.dummyPos,
|
adamc@764
|
726 last = ErrorMsg.dummyPos}
|
adamc@764
|
727
|
adamc@764
|
728 val sgn = (Source.SgnConst (#func parseUrs urs), loc)
|
adamc@764
|
729 in
|
adamc@834
|
730 checkErrors ();
|
adamc@764
|
731 (Source.DFfiStr (mname, sgn), loc)
|
adamc@764
|
732 end
|
adamc@764
|
733
|
adamc@1090
|
734 val defed = ref SS.empty
|
adamc@1092
|
735 val fulls = ref SS.empty
|
adamc@1090
|
736
|
adamc@201
|
737 fun parseOne fname =
|
adamc@201
|
738 let
|
adamc@201
|
739 val mname = nameOf fname
|
adamc@244
|
740 val ur = OS.Path.joinBaseExt {base = fname, ext = SOME "ur"}
|
adamc@244
|
741 val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
|
adamc@56
|
742
|
adamc@201
|
743 val sgnO =
|
adamc@244
|
744 if Posix.FileSys.access (urs, []) then
|
adamc@244
|
745 SOME (Source.SgnConst (#func parseUrs urs),
|
adamc@244
|
746 {file = urs,
|
adamc@201
|
747 first = ErrorMsg.dummyPos,
|
adamc@201
|
748 last = ErrorMsg.dummyPos})
|
adamc@834
|
749 before checkErrors ()
|
adamc@201
|
750 else
|
adamc@201
|
751 NONE
|
adamc@56
|
752
|
adamc@244
|
753 val loc = {file = ur,
|
adamc@201
|
754 first = ErrorMsg.dummyPos,
|
adamc@201
|
755 last = ErrorMsg.dummyPos}
|
adamc@56
|
756
|
adamc@244
|
757 val ds = #func parseUr ur
|
adamc@1090
|
758 val d = (Source.DStr (mname, sgnO, (Source.StrConst ds, loc)), loc)
|
adamc@1090
|
759
|
adamc@1126
|
760 val fname = OS.Path.mkCanonical fname
|
adamc@1090
|
761 val d = case List.find (fn (root, name) =>
|
adamc@1090
|
762 String.isPrefix (root ^ "/") fname) mrs of
|
adamc@1090
|
763 NONE => d
|
adamc@1090
|
764 | SOME (root, name) =>
|
adamc@1090
|
765 let
|
adamc@1090
|
766 val fname = String.extract (fname, size root + 1, NONE)
|
adamc@1090
|
767 val pieces = name :: String.tokens (fn ch => ch = #"/") fname
|
adamc@1090
|
768 val pieces = List.filter (fn s => size s > 0
|
adamc@1090
|
769 andalso Char.isAlpha (String.sub (s, 0)))
|
adamc@1090
|
770 pieces
|
adamc@1090
|
771 val pieces = map capitalize pieces
|
adamc@1092
|
772 val full = String.concatWith "." pieces
|
adamc@1090
|
773
|
adamc@1090
|
774 fun makeD prefix pieces =
|
adamc@1090
|
775 case pieces of
|
adamc@1090
|
776 [] => (ErrorMsg.error "Empty module path";
|
adamc@1090
|
777 (Source.DStyle "Boo", loc))
|
adamc@1090
|
778 | [_] => d
|
adamc@1090
|
779 | piece :: pieces =>
|
adamc@1090
|
780 let
|
adamc@1146
|
781 val this = case prefix of
|
adamc@1146
|
782 "" => piece
|
adamc@1146
|
783 | _ => prefix ^ "." ^ piece
|
adamc@1090
|
784 val old = SS.member (!defed, this)
|
adamc@1146
|
785
|
adamc@1146
|
786 fun notThere (ch, s) =
|
adamc@1146
|
787 Substring.isEmpty (#2 (Substring.splitl
|
adamc@1146
|
788 (fn ch' => ch' <> ch) s))
|
adamc@1146
|
789
|
adamc@1146
|
790 fun simOpen () =
|
adamc@1146
|
791 SS.foldl (fn (full, ds) =>
|
adamc@1146
|
792 if String.isPrefix (this ^ ".") full
|
adamc@1146
|
793 andalso notThere (#".",
|
adamc@1146
|
794 Substring.extract (full,
|
adamc@1146
|
795 size
|
adamc@1146
|
796 this + 1,
|
adamc@1146
|
797 NONE)) then
|
adamc@1146
|
798 let
|
adamc@1146
|
799 val parts = String.tokens
|
adamc@1146
|
800 (fn ch => ch = #".") full
|
adamc@1146
|
801
|
adamc@1146
|
802 val part = List.last parts
|
adamc@1146
|
803
|
adamc@1146
|
804 val imp = if length parts >= 2 then
|
adamc@1146
|
805 (Source.StrProj
|
adamc@1146
|
806 ((Source.StrVar
|
adamc@1146
|
807 (List.nth (parts,
|
adamc@1146
|
808 length
|
adamc@1146
|
809 parts
|
adamc@1146
|
810 - 2)),
|
adamc@1146
|
811 loc),
|
adamc@1146
|
812 part), loc)
|
adamc@1146
|
813 else
|
adamc@1146
|
814 (Source.StrVar part, loc)
|
adamc@1146
|
815 in
|
adamc@1146
|
816 (Source.DStr (part, NONE, imp),
|
adamc@1146
|
817 loc) :: ds
|
adamc@1146
|
818 end
|
adamc@1146
|
819 else
|
adamc@1146
|
820 ds) [] (!fulls)
|
adamc@1090
|
821 in
|
adamc@1090
|
822 defed := SS.add (!defed, this);
|
adamc@1090
|
823 (Source.DStr (piece, NONE,
|
adamc@1090
|
824 (Source.StrConst (if old then
|
adamc@1146
|
825 simOpen ()
|
adamc@1146
|
826 @ [makeD this pieces]
|
adamc@1090
|
827 else
|
adamc@1146
|
828 [makeD this pieces]), loc)),
|
adamc@1090
|
829 loc)
|
adamc@1090
|
830 end
|
adamc@1090
|
831 in
|
adamc@1092
|
832 if SS.member (!fulls, full) then
|
adamc@1092
|
833 ErrorMsg.error ("Rooted module " ^ full ^ " has multiple versions.")
|
adamc@1092
|
834 else
|
adamc@1092
|
835 ();
|
adamc@1146
|
836
|
adamc@1090
|
837 makeD "" pieces
|
adamc@1146
|
838 before ignore (foldl (fn (new, path) =>
|
adamc@1146
|
839 let
|
adamc@1146
|
840 val new' = case path of
|
adamc@1146
|
841 "" => new
|
adamc@1146
|
842 | _ => path ^ "." ^ new
|
adamc@1146
|
843 in
|
adamc@1146
|
844 fulls := SS.add (!fulls, new');
|
adamc@1146
|
845 new'
|
adamc@1146
|
846 end) "" pieces)
|
adamc@1090
|
847 end
|
adamc@201
|
848 in
|
adamc@834
|
849 checkErrors ();
|
adamc@1090
|
850 d
|
adamc@201
|
851 end
|
adamc@56
|
852
|
adamc@764
|
853 val dsFfi = map parseFfi ffi
|
adamc@201
|
854 val ds = map parseOne fnames
|
adamc@1090
|
855 val loc = ErrorMsg.dummySpan
|
adamc@201
|
856 in
|
adamc@834
|
857 if !anyErrors then
|
adamc@834
|
858 ErrorMsg.error "Parse failure"
|
adamc@834
|
859 else
|
adamc@834
|
860 ();
|
adamc@834
|
861
|
adamc@201
|
862 let
|
adamc@1126
|
863 val final = List.last fnames
|
adamc@1126
|
864 val final = case List.find (fn (root, name) =>
|
adamc@1126
|
865 String.isPrefix (root ^ "/") final) mrs of
|
adamc@1126
|
866 NONE => (Source.StrVar (nameOf final), loc)
|
adamc@1126
|
867 | SOME (root, name) =>
|
adamc@1126
|
868 let
|
adamc@1126
|
869 val m = (Source.StrVar name, loc)
|
adamc@1126
|
870 val final = String.extract (final, size root + 1, NONE)
|
adamc@1126
|
871 in
|
adamc@1126
|
872 foldl (fn (x, m) => (Source.StrProj (m, capitalize x), loc))
|
adamc@1126
|
873 m (String.fields (fn ch => ch = #"/") final)
|
adamc@1126
|
874 end
|
adamc@271
|
875
|
adamc@764
|
876 val ds = dsFfi @ ds
|
adamc@1126
|
877 @ [(Source.DExport final, loc)]
|
adamc@1090
|
878
|
adamc@1090
|
879 val ds = case database of
|
adamc@1090
|
880 NONE => ds
|
adamc@1090
|
881 | SOME s => (Source.DDatabase s, loc) :: ds
|
adamc@201
|
882 in
|
adamc@1090
|
883 ds
|
adamc@201
|
884 end handle Empty => ds
|
adamc@201
|
885 end,
|
adamc@201
|
886 print = SourcePrint.p_file
|
adamc@201
|
887 }
|
adamc@56
|
888
|
adamc@270
|
889 val toParse = transform parse "parse" o toParseJob
|
adamc@38
|
890
|
adamc@378
|
891 fun libFile s = OS.Path.joinDirFile {dir = Config.libUr,
|
adamc@378
|
892 file = s}
|
adamc@378
|
893 fun clibFile s = OS.Path.joinDirFile {dir = Config.libC,
|
adamc@378
|
894 file = s}
|
adamc@378
|
895
|
adamc@201
|
896 val elaborate = {
|
adamc@201
|
897 func = fn file => let
|
adamc@378
|
898 val basis = #func parseUrs (libFile "basis.urs")
|
adamc@378
|
899 val topSgn = #func parseUrs (libFile "top.urs")
|
adamc@378
|
900 val topStr = #func parseUr (libFile "top.ur")
|
adamc@201
|
901 in
|
adamc@325
|
902 Elaborate.elabFile basis topStr topSgn ElabEnv.empty file
|
adamc@201
|
903 end,
|
adamc@201
|
904 print = ElabPrint.p_file ElabEnv.empty
|
adamc@201
|
905 }
|
adamc@5
|
906
|
adamc@270
|
907 val toElaborate = transform elaborate "elaborate" o toParse
|
adamc@201
|
908
|
adamc@448
|
909 val unnest = {
|
adamc@448
|
910 func = Unnest.unnest,
|
adamc@448
|
911 print = ElabPrint.p_file ElabEnv.empty
|
adamc@448
|
912 }
|
adamc@448
|
913
|
adamc@448
|
914 val toUnnest = transform unnest "unnest" o toElaborate
|
adamc@448
|
915
|
adamc@313
|
916 val termination = {
|
adamc@313
|
917 func = (fn file => (Termination.check file; file)),
|
adamc@313
|
918 print = ElabPrint.p_file ElabEnv.empty
|
adamc@313
|
919 }
|
adamc@313
|
920
|
adamc@448
|
921 val toTermination = transform termination "termination" o toUnnest
|
adamc@313
|
922
|
adamc@201
|
923 val explify = {
|
adamc@201
|
924 func = Explify.explify,
|
adamc@201
|
925 print = ExplPrint.p_file ExplEnv.empty
|
adamc@201
|
926 }
|
adamc@201
|
927
|
adamc@625
|
928 val toExplify = transform explify "explify" o toUnnest
|
adamc@201
|
929
|
adamc@201
|
930 val corify = {
|
adamc@201
|
931 func = Corify.corify,
|
adamc@201
|
932 print = CorePrint.p_file CoreEnv.empty
|
adamc@201
|
933 }
|
adamc@201
|
934
|
adamc@270
|
935 val toCorify = transform corify "corify" o toExplify
|
adamc@201
|
936
|
adamc@482
|
937 (*val reduce_local = {
|
adamc@482
|
938 func = ReduceLocal.reduce,
|
adamc@482
|
939 print = CorePrint.p_file CoreEnv.empty
|
adamc@482
|
940 }
|
adamc@482
|
941
|
adamc@482
|
942 val toReduce_local = transform reduce_local "reduce_local" o toCorify*)
|
adamc@482
|
943
|
adamc@443
|
944 val especialize = {
|
adamc@443
|
945 func = ESpecialize.specialize,
|
adamc@443
|
946 print = CorePrint.p_file CoreEnv.empty
|
adamc@443
|
947 }
|
adamc@443
|
948
|
adamc@454
|
949 val core_untangle = {
|
adamc@454
|
950 func = CoreUntangle.untangle,
|
adamc@454
|
951 print = CorePrint.p_file CoreEnv.empty
|
adamc@454
|
952 }
|
adamc@454
|
953
|
adamc@794
|
954 val toCore_untangle = transform core_untangle "core_untangle" o toCorify
|
adamc@454
|
955
|
adamc@202
|
956 val shake = {
|
adamc@202
|
957 func = Shake.shake,
|
adamc@202
|
958 print = CorePrint.p_file CoreEnv.empty
|
adamc@202
|
959 }
|
adamc@39
|
960
|
adamc@454
|
961 val toShake1 = transform shake "shake1" o toCore_untangle
|
adamc@110
|
962
|
adamc@607
|
963 val rpcify = {
|
adamc@607
|
964 func = Rpcify.frob,
|
adamc@607
|
965 print = CorePrint.p_file CoreEnv.empty
|
adamc@607
|
966 }
|
adamc@607
|
967
|
adamc@607
|
968 val toRpcify = transform rpcify "rpcify" o toShake1
|
adamc@607
|
969
|
adamc@642
|
970 val toCore_untangle2 = transform core_untangle "core_untangle2" o toRpcify
|
adamc@642
|
971 val toShake2 = transform shake "shake2" o toCore_untangle2
|
adamc@1181
|
972
|
adamc@1186
|
973 val toEspecialize1 = transform especialize "especialize1" o toShake2
|
adamc@1181
|
974
|
adamc@1062
|
975 val toCore_untangle3 = transform core_untangle "core_untangle3" o toEspecialize1
|
adamc@1062
|
976 val toShake3 = transform shake "shake3" o toCore_untangle3
|
adamc@642
|
977
|
adamc@202
|
978 val tag = {
|
adamc@202
|
979 func = Tag.tag,
|
adamc@202
|
980 print = CorePrint.p_file CoreEnv.empty
|
adamc@202
|
981 }
|
adamc@193
|
982
|
adamc@1062
|
983 val toTag = transform tag "tag" o toShake3
|
adamc@20
|
984
|
adamc@202
|
985 val reduce = {
|
adamc@202
|
986 func = Reduce.reduce,
|
adamc@202
|
987 print = CorePrint.p_file CoreEnv.empty
|
adamc@202
|
988 }
|
adamc@25
|
989
|
adamc@692
|
990 val toReduce = transform reduce "reduce" o toTag
|
adamc@23
|
991
|
adamc@1186
|
992 val toShakey = transform shake "shakey" o toReduce
|
adamc@1186
|
993
|
adamc@1186
|
994 val unpoly = {
|
adamc@1186
|
995 func = Unpoly.unpoly,
|
adamc@1186
|
996 print = CorePrint.p_file CoreEnv.empty
|
adamc@1186
|
997 }
|
adamc@1186
|
998
|
adamc@1186
|
999 val toUnpoly = transform unpoly "unpoly" o toShakey
|
adamc@315
|
1000
|
adamc@202
|
1001 val specialize = {
|
adamc@202
|
1002 func = Specialize.specialize,
|
adamc@202
|
1003 print = CorePrint.p_file CoreEnv.empty
|
adamc@202
|
1004 }
|
adamc@132
|
1005
|
adamc@1186
|
1006 val toSpecialize = transform specialize "specialize" o toUnpoly
|
adamc@131
|
1007
|
adamc@1062
|
1008 val toShake4 = transform shake "shake4" o toSpecialize
|
adamc@133
|
1009
|
adamc@1062
|
1010 val toEspecialize2 = transform especialize "especialize2" o toShake4
|
adamc@794
|
1011
|
adamc@1062
|
1012 val toReduce2 = transform reduce "reduce2" o toEspecialize2
|
adamc@898
|
1013
|
adamc@1062
|
1014 val toShake5 = transform shake "shake5" o toReduce2
|
adamc@794
|
1015
|
adamc@692
|
1016 val marshalcheck = {
|
adamc@692
|
1017 func = (fn file => (MarshalCheck.check file; file)),
|
adamc@692
|
1018 print = CorePrint.p_file CoreEnv.empty
|
adamc@692
|
1019 }
|
adamc@692
|
1020
|
adamc@1062
|
1021 val toMarshalcheck = transform marshalcheck "marshalcheck" o toShake5
|
adamc@692
|
1022
|
adamc@732
|
1023 val effectize = {
|
adamc@732
|
1024 func = Effective.effectize,
|
adamc@732
|
1025 print = CorePrint.p_file CoreEnv.empty
|
adamc@732
|
1026 }
|
adamc@732
|
1027
|
adamc@732
|
1028 val toEffectize = transform effectize "effectize" o toMarshalcheck
|
adamc@732
|
1029
|
adamc@1170
|
1030 val css = {
|
adamc@1170
|
1031 func = Css.summarize,
|
adamc@1170
|
1032 print = fn _ => Print.box []
|
adamc@1170
|
1033 }
|
adamc@1170
|
1034
|
adamc@1170
|
1035 val toCss = transform css "css" o toShake5
|
adamc@1170
|
1036
|
adamc@202
|
1037 val monoize = {
|
adamc@202
|
1038 func = Monoize.monoize CoreEnv.empty,
|
adamc@202
|
1039 print = MonoPrint.p_file MonoEnv.empty
|
adamc@202
|
1040 }
|
adamc@134
|
1041
|
adamc@732
|
1042 val toMonoize = transform monoize "monoize" o toEffectize
|
adamc@96
|
1043
|
adamc@202
|
1044 val mono_opt = {
|
adamc@910
|
1045 func = MonoOpt.optimize,
|
adamc@202
|
1046 print = MonoPrint.p_file MonoEnv.empty
|
adamc@202
|
1047 }
|
adamc@29
|
1048
|
adamc@270
|
1049 val toMono_opt1 = transform mono_opt "mono_opt1" o toMonoize
|
adamc@5
|
1050
|
adamc@202
|
1051 val untangle = {
|
adamc@202
|
1052 func = Untangle.untangle,
|
adamc@202
|
1053 print = MonoPrint.p_file MonoEnv.empty
|
adamc@202
|
1054 }
|
adamc@1
|
1055
|
adamc@270
|
1056 val toUntangle = transform untangle "untangle" o toMono_opt1
|
adamc@38
|
1057
|
adamc@202
|
1058 val mono_reduce = {
|
adamc@202
|
1059 func = MonoReduce.reduce,
|
adamc@202
|
1060 print = MonoPrint.p_file MonoEnv.empty
|
adamc@202
|
1061 }
|
adamc@16
|
1062
|
adamc@270
|
1063 val toMono_reduce = transform mono_reduce "mono_reduce" o toUntangle
|
adamc@39
|
1064
|
adamc@202
|
1065 val mono_shake = {
|
adamc@202
|
1066 func = MonoShake.shake,
|
adamc@202
|
1067 print = MonoPrint.p_file MonoEnv.empty
|
adamc@202
|
1068 }
|
adamc@110
|
1069
|
adamc@270
|
1070 val toMono_shake = transform mono_shake "mono_shake1" o toMono_reduce
|
adamc@193
|
1071
|
adamc@572
|
1072 val toMono_opt2 = transform mono_opt "mono_opt2" o toMono_shake
|
adamc@572
|
1073
|
adamc@567
|
1074 val jscomp = {
|
adamc@567
|
1075 func = JsComp.process,
|
adamc@567
|
1076 print = MonoPrint.p_file MonoEnv.empty
|
adamc@567
|
1077 }
|
adamc@567
|
1078
|
adamc@572
|
1079 val toJscomp = transform jscomp "jscomp" o toMono_opt2
|
adamc@567
|
1080
|
adamc@910
|
1081 val toMono_opt3 = transform mono_opt "mono_opt3" o toJscomp
|
adamc@20
|
1082
|
adamc@506
|
1083 val fuse = {
|
adamc@506
|
1084 func = Fuse.fuse,
|
adamc@506
|
1085 print = MonoPrint.p_file MonoEnv.empty
|
adamc@506
|
1086 }
|
adamc@506
|
1087
|
adamc@572
|
1088 val toFuse = transform fuse "fuse" o toMono_opt3
|
adamc@506
|
1089
|
adamc@506
|
1090 val toUntangle2 = transform untangle "untangle2" o toFuse
|
adamc@506
|
1091
|
adamc@601
|
1092 val toMono_reduce2 = transform mono_reduce "mono_reduce2" o toUntangle2
|
adamc@601
|
1093 val toMono_shake2 = transform mono_shake "mono_shake2" o toMono_reduce2
|
adamc@916
|
1094 val toMono_opt4 = transform mono_opt "mono_opt4" o toMono_shake2
|
adamc@1017
|
1095 val toMono_reduce3 = transform mono_reduce "mono_reduce3" o toMono_opt4
|
adamc@1185
|
1096 val toFuse2 = transform fuse "fuse2" o toMono_reduce3
|
adamc@916
|
1097 val toUntangle3 = transform untangle "untangle3" o toFuse2
|
adamc@916
|
1098 val toMono_shake3 = transform mono_shake "mono_shake3" o toUntangle3
|
adamc@506
|
1099
|
adamc@377
|
1100 val pathcheck = {
|
adamc@377
|
1101 func = (fn file => (PathCheck.check file; file)),
|
adamc@377
|
1102 print = MonoPrint.p_file MonoEnv.empty
|
adamc@377
|
1103 }
|
adamc@377
|
1104
|
adamc@916
|
1105 val toPathcheck = transform pathcheck "pathcheck" o toMono_shake3
|
adamc@377
|
1106
|
adamc@202
|
1107 val cjrize = {
|
adamc@202
|
1108 func = Cjrize.cjrize,
|
adamc@202
|
1109 print = CjrPrint.p_file CjrEnv.empty
|
adamc@202
|
1110 }
|
adamc@23
|
1111
|
adamc@377
|
1112 val toCjrize = transform cjrize "cjrize" o toPathcheck
|
adamc@29
|
1113
|
adamc@643
|
1114 val scriptcheck = {
|
adamc@643
|
1115 func = ScriptCheck.classify,
|
adamc@643
|
1116 print = CjrPrint.p_file CjrEnv.empty
|
adamc@643
|
1117 }
|
adamc@643
|
1118
|
adamc@643
|
1119 val toScriptcheck = transform scriptcheck "scriptcheck" o toCjrize
|
adamc@643
|
1120
|
adamc@282
|
1121 val prepare = {
|
adamc@282
|
1122 func = Prepare.prepare,
|
adamc@282
|
1123 print = CjrPrint.p_file CjrEnv.empty
|
adamc@282
|
1124 }
|
adamc@282
|
1125
|
adamc@643
|
1126 val toPrepare = transform prepare "prepare" o toScriptcheck
|
adamc@282
|
1127
|
adamc@879
|
1128 val checknest = {
|
adamc@879
|
1129 func = fn f => if #supportsNestedPrepared (Settings.currentDbms ()) then f else Checknest.annotate f,
|
adamc@879
|
1130 print = CjrPrint.p_file CjrEnv.empty
|
adamc@879
|
1131 }
|
adamc@879
|
1132
|
adamc@879
|
1133 val toChecknest = transform checknest "checknest" o toPrepare
|
adamc@879
|
1134
|
adamc@274
|
1135 val sqlify = {
|
adamc@274
|
1136 func = Cjrize.cjrize,
|
adamc@274
|
1137 print = CjrPrint.p_sql CjrEnv.empty
|
adamc@274
|
1138 }
|
adamc@274
|
1139
|
adamc@274
|
1140 val toSqlify = transform sqlify "sqlify" o toMono_opt2
|
adamc@274
|
1141
|
adamc@764
|
1142 fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
|
adamc@183
|
1143 let
|
adamc@855
|
1144 val proto = Settings.currentProtocol ()
|
adamc@1095
|
1145
|
adamc@1095
|
1146 val lib = if Settings.getStaticLinking () then
|
adamc@1132
|
1147 #linkStatic proto ^ " " ^ Config.lib ^ "/../liburweb.a"
|
adamc@1095
|
1148 else
|
adamc@1106
|
1149 "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto
|
adamc@378
|
1150
|
adamc@1094
|
1151 val compile = "gcc " ^ Config.gccArgs ^ " -Wimplicit -Werror -O3 -fno-inline -I " ^ Config.includ
|
adamc@1096
|
1152 ^ " " ^ #compile proto
|
adamc@832
|
1153 ^ " -c " ^ cname ^ " -o " ^ oname
|
adamc@1096
|
1154
|
adamc@1095
|
1155 val link = "gcc -Werror -O3 -lm -lmhash -pthread " ^ Config.gccArgs ^ " " ^ libs ^ " " ^ lib ^ " " ^ oname
|
adamc@1095
|
1156 ^ " -o " ^ ename
|
adamc@502
|
1157
|
adamc@502
|
1158 val (compile, link) =
|
adamc@502
|
1159 if profile then
|
adamc@502
|
1160 (compile ^ " -pg", link ^ " -pg")
|
adamc@502
|
1161 else
|
adamc@502
|
1162 (compile, link)
|
adamc@742
|
1163
|
adamc@742
|
1164 val (compile, link) =
|
adamc@742
|
1165 if debug then
|
adamc@742
|
1166 (compile ^ " -g", link ^ " -g")
|
adamc@742
|
1167 else
|
adamc@742
|
1168 (compile, link)
|
adamc@764
|
1169
|
adamc@764
|
1170 val link = foldl (fn (s, link) => link ^ " " ^ s) link link'
|
adamc@183
|
1171 in
|
adamc@1045
|
1172 OS.Process.isSuccess (OS.Process.system compile)
|
adamc@1045
|
1173 andalso OS.Process.isSuccess (OS.Process.system link)
|
adamc@183
|
1174 end
|
adamc@183
|
1175
|
adamc@202
|
1176 fun compile job =
|
adamc@879
|
1177 case run toChecknest job of
|
adamc@1045
|
1178 NONE => false
|
adamc@29
|
1179 | SOME file =>
|
adamc@202
|
1180 let
|
adamc@274
|
1181 val job = valOf (run (transform parseUrp "parseUrp") job)
|
adamc@102
|
1182
|
adamc@274
|
1183 val (cname, oname, cleanup) =
|
adamc@274
|
1184 if #debug job then
|
adamc@457
|
1185 ("/tmp/webapp.c", "/tmp/webapp.o", fn () => ())
|
adamc@274
|
1186 else
|
adamc@274
|
1187 let
|
adamc@274
|
1188 val dir = OS.FileSys.tmpName ()
|
adamc@403
|
1189 val () = if OS.FileSys.access (dir, []) then
|
adamc@403
|
1190 OS.FileSys.remove dir
|
adamc@403
|
1191 else
|
adamc@403
|
1192 ()
|
adamc@457
|
1193 val cname = OS.Path.joinDirFile {dir = dir, file = "webapp.c"}
|
adamc@457
|
1194 val oname = OS.Path.joinDirFile {dir = dir, file = "webapp.o"}
|
adamc@274
|
1195 in
|
adamc@274
|
1196 OS.FileSys.mkDir dir;
|
adamc@274
|
1197 (cname, oname,
|
adamc@274
|
1198 fn () => (OS.FileSys.remove cname;
|
adamc@274
|
1199 OS.FileSys.remove oname;
|
adamc@473
|
1200 OS.FileSys.rmDir dir)
|
adamc@473
|
1201 handle OS.SysErr _ => OS.FileSys.rmDir dir)
|
adamc@274
|
1202 end
|
adamc@274
|
1203 val ename = #exe job
|
adamc@202
|
1204 in
|
adamc@274
|
1205 let
|
adamc@274
|
1206 val outf = TextIO.openOut cname
|
adamc@274
|
1207 val s = TextIOPP.openOut {dst = outf, wid = 80}
|
adamc@432
|
1208
|
adamc@432
|
1209 val hasDb = List.exists (fn (Cjr.DDatabase _, _) => true | _ => false) (#1 file)
|
adamc@432
|
1210 val libs =
|
adamc@432
|
1211 if hasDb then
|
adamc@866
|
1212 #link (Settings.currentDbms ())
|
adamc@432
|
1213 else
|
adamc@432
|
1214 ""
|
adamc@274
|
1215 in
|
adamc@274
|
1216 Print.fprint s (CjrPrint.p_file CjrEnv.empty file);
|
adamc@415
|
1217 TextIO.output1 (outf, #"\n");
|
adamc@274
|
1218 TextIO.closeOut outf;
|
adamc@102
|
1219
|
adamc@274
|
1220 case #sql job of
|
adamc@274
|
1221 NONE => ()
|
adamc@274
|
1222 | SOME sql =>
|
adamc@274
|
1223 let
|
adamc@274
|
1224 val outf = TextIO.openOut sql
|
adamc@274
|
1225 val s = TextIOPP.openOut {dst = outf, wid = 80}
|
adamc@274
|
1226 in
|
adamc@274
|
1227 Print.fprint s (CjrPrint.p_sql CjrEnv.empty file);
|
adamc@274
|
1228 TextIO.closeOut outf
|
adamc@274
|
1229 end;
|
adamc@274
|
1230
|
adamc@742
|
1231 compileC {cname = cname, oname = oname, ename = ename, libs = libs,
|
adamc@1045
|
1232 profile = #profile job, debug = #debug job, link = #link job}
|
adamc@274
|
1233
|
adamc@1045
|
1234 before cleanup ()
|
adamc@274
|
1235 end
|
adamc@274
|
1236 handle ex => (((cleanup ()) handle _ => ()); raise ex)
|
adamc@202
|
1237 end
|
adamc@29
|
1238
|
adamc@1045
|
1239 fun compiler job =
|
adamc@1045
|
1240 if compile job then
|
adamc@1045
|
1241 ()
|
adamc@1045
|
1242 else
|
adamc@1045
|
1243 OS.Process.exit OS.Process.failure
|
adamc@1045
|
1244
|
adamc@1
|
1245 end
|