Mercurial > urweb

comparison src/css.sml @ 1254:935a981f4380

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents c316ca3c9ec6
children 78b36c50daf9
comparison
equal deleted inserted replaced
1198:b52929351402 1254:935a981f4380
285 | DView _ => st 285 | DView _ => st
286 | DDatabase _ => st 286 | DDatabase _ => st
287 | DCookie _ => st 287 | DCookie _ => st
288 | DStyle (_, n, s) => (IM.insert (globals, n, (SOME s, [])), classes) 288 | DStyle (_, n, s) => (IM.insert (globals, n, (SOME s, [])), classes)
289 | DTask _ => st 289 | DTask _ => st
290 | DPolicy _ => st
290 end 291 end
291 292
292 val (globals, classes) = foldl decl (IM.empty, IM.empty) file 293 val (globals, classes) = foldl decl (IM.empty, IM.empty) file
293 in 294 in
294 {Overall = IM.foldl (fn ((_, sm), sm') => merge' (sm, sm')) [] globals, 295 {Overall = IM.foldl (fn ((_, sm), sm') => merge' (sm, sm')) [] globals,