From e1ea17cb21e3193a99cfd93d7e264ba0176f66f5 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sun, 6 May 2012 15:46:25 -0400 Subject: Fix bugs in support for 'style' and 'dynStyle' --- src/css.sml | 26 +++++++++++++++++--------- src/monoize.sml | 12 ++++++++---- src/tag.sml | 32 +++++++++++++++++++------------- 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/src/css.sml b/src/css.sml index 07160898..8ed6a05a 100644 --- a/src/css.sml +++ b/src/css.sml @@ -145,17 +145,21 @@ fun summarize file = (EApp ( (EApp ( (EApp ( - (ECApp ( - (ECApp ( + (EApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( - (EFfi ("Basis", "tag"), - _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), - (ECon (_, _, _, SOME (ENamed class, _)), _)), _), + (ECApp ( + (ECApp ( + (EFfi ("Basis", "tag"), + _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + (ECon (_, _, _, SOME (ENamed class, _)), _)), _), + _), _), + _), _), _), _), attrs), _), tag), _), @@ -185,16 +189,20 @@ fun summarize file = (EApp ( (EApp ( (EApp ( - (ECApp ( - (ECApp ( + (EApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( - (EFfi ("Basis", "tag"), - _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + (ECApp ( + (ECApp ( + (EFfi ("Basis", "tag"), + _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + _), _), + _), _), _), _), _), _), attrs), _), diff --git a/src/monoize.sml b/src/monoize.sml index 564be889..46feacf8 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -3663,16 +3663,20 @@ fun monoExp (env, st, fm) (all as (e, loc)) = (L.EApp ( (L.EApp ( (L.EApp ( - (L.ECApp ( - (L.ECApp ( + (L.EApp ( + (L.EApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( - (L.EFfi ("Basis", "tag"), - _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + (L.ECApp ( + (L.ECApp ( + (L.EFfi ("Basis", "tag"), + _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + _), _), + _), _), _), _), _), _), attrs), _), diff --git a/src/tag.sml b/src/tag.sml index 6037cb17..9c4807c6 100644 --- a/src/tag.sml +++ b/src/tag.sml @@ -110,19 +110,23 @@ fun exp env (e, s) = (EApp ( (EApp ( (EApp ( - (ECApp ( - (ECApp ( + (EApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( - (EFfi ("Basis", "tag"), - loc), given), _), absent), _), outer), _), inner), _), - useOuter), _), useInner), _), bindOuter), _), bindInner), _), - class), _), - dynClass), _), + (ECApp ( + (ECApp ( + (EFfi ("Basis", "tag"), + loc), given), _), absent), _), outer), _), inner), _), + useOuter), _), useInner), _), bindOuter), _), bindInner), _), + class), _), + dynClass), _), + style), _), + dynStyle), _), attrs), _), tag), _), xml) => @@ -152,18 +156,20 @@ fun exp env (e, s) = (EApp ( (EApp ( (EApp ( - (ECApp ( - (ECApp ( + (EApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( (ECApp ( - (EFfi ("Basis", "tag"), - loc), given), loc), absent), loc), outer), loc), inner), loc), - useOuter), loc), useInner), loc), bindOuter), loc), bindInner), loc), - class), loc), dynClass), loc), + (ECApp ( + (ECApp ( + (EFfi ("Basis", "tag"), + loc), given), loc), absent), loc), outer), loc), inner), loc), + useOuter), loc), useInner), loc), bindOuter), loc), bindInner), loc), + class), loc), dynClass), loc), style), loc), dynStyle), loc), (ERecord xets, loc)), loc), tag), loc), xml), s) -- cgit v1.2.3