comparison src/urweb.grm @ 2241:2b1af5dc6dee

Merge.
author Ziv Scully <ziv@mit.edu>
date Sun, 19 Jul 2015 19:05:16 -0700
parents 39bd1d4007a9
children
comparison
equal deleted inserted replaced
2240:88cc0f44c940 2241:2b1af5dc6dee
1622 if et = "form" then 1622 if et = "form" then
1623 let 1623 let
1624 val e = (EVar (["Basis"], "form", Infer), pos) 1624 val e = (EVar (["Basis"], "form", Infer), pos)
1625 val e = (EApp (e, case #2 tag of 1625 val e = (EApp (e, case #2 tag of
1626 NONE => (EVar (["Basis"], "None", Infer), pos) 1626 NONE => (EVar (["Basis"], "None", Infer), pos)
1627 | SOME (EPrim (Prim.String (_, s)), _) => (EApp ((EVar (["Basis"], "Some", Infer), pos), parseClass s pos), pos)
1627 | SOME c => (EApp ((EVar (["Basis"], "Some", Infer), pos), c), pos)), pos) 1628 | SOME c => (EApp ((EVar (["Basis"], "Some", Infer), pos), c), pos)), pos)
1628 in 1629 in
1629 case #3 tag of 1630 case #3 tag of
1630 NONE => () 1631 NONE => ()
1631 | SOME _ => ErrorMsg.errorAt pos "<form> does not support 'dynClass' attribute"; 1632 | SOME _ => ErrorMsg.errorAt pos "<form> does not support 'dynClass' attribute";