changeset 1754:a1380fc15cb5

Fix bugs in support for 'style' and 'dynStyle'
author Adam Chlipala <adam@chlipala.net>
date Sun, 06 May 2012 15:46:25 -0400
parents 957168662198
children e9587120831a
files src/css.sml src/monoize.sml src/tag.sml
diffstat 3 files changed, 44 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/css.sml	Sun May 06 15:34:10 2012 -0400
+++ b/src/css.sml	Sun May 06 15:46:25 2012 -0400
@@ -145,17 +145,21 @@
                          (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 @@
                          (EApp (
                           (EApp (
                            (EApp (
-                            (ECApp (
-                             (ECApp (
+                            (EApp (
+                             (EApp (
                               (ECApp (
                                (ECApp (
                                 (ECApp (
                                  (ECApp (
                                   (ECApp (
                                    (ECApp (
-                                    (EFfi ("Basis", "tag"),
-                                     _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                                    (ECApp (
+                                     (ECApp (
+                                      (EFfi ("Basis", "tag"),
+                                       _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                              _), _),
+                             _), _),
                             _), _),
                            _), _),
                           attrs), _),
--- a/src/monoize.sml	Sun May 06 15:34:10 2012 -0400
+++ b/src/monoize.sml	Sun May 06 15:46:25 2012 -0400
@@ -3663,16 +3663,20 @@
                          (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), _),
--- a/src/tag.sml	Sun May 06 15:34:10 2012 -0400
+++ b/src/tag.sml	Sun May 06 15:46:25 2012 -0400
@@ -110,19 +110,23 @@
              (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 @@
                        (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)