diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-08-19 11:02:23 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-08-19 11:02:23 -0400 |
| commit | 598756dc69f89cf2dd2b889cad63a7a690ae7ed7 (patch) | |
| tree | 5fc521225e717163c30ea494a5839c26725eec2e /src/urweb.grm | |
| parent | 7ea9d17bad72cf2829c75d8d241fafa70b2c9b94 (diff) | |
| parent | fb6e6599b35df9cfa05786772868b1a3d2e58ac3 (diff) | |
Merge branch 'upstream' into dfsg_clean20150819+dfsg
Conflicts:
doc/intro.ur
Diffstat (limited to 'src/urweb.grm')
| -rw-r--r-- | src/urweb.grm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/urweb.grm b/src/urweb.grm index 7fc34793..50dacf21 100644 --- a/src/urweb.grm +++ b/src/urweb.grm @@ -1624,6 +1624,7 @@ xmlOne : NOTAGS (EApp ((EVar (["Basis"], "cdata", Infer) val e = (EVar (["Basis"], "form", Infer), pos) val e = (EApp (e, case #2 tag of NONE => (EVar (["Basis"], "None", Infer), pos) + | SOME (EPrim (Prim.String (_, s)), _) => (EApp ((EVar (["Basis"], "Some", Infer), pos), parseClass s pos), pos) | SOME c => (EApp ((EVar (["Basis"], "Some", Infer), pos), c), pos)), pos) in case #3 tag of |