diff src/urweb.grm @ 1864:1aa9629e3a4c

Allow [where con] to descend within submodule structure; open submodule constraints while checking later signature items
author Adam Chlipala <adam@chlipala.net>
date Mon, 19 Aug 2013 12:25:32 -0400
parents 146ec8e90063
children d6b0ee53dc93
line wrap: on
line diff
--- a/src/urweb.grm	Sat Aug 10 10:13:40 2013 -0400
+++ b/src/urweb.grm	Mon Aug 19 12:25:32 2013 -0400
@@ -802,8 +802,8 @@
                                                                  List.take (ms, length ms - 1),
                                                                  List.nth (ms, length ms - 1)),
                                          s (mpathleft, mpathright))
-       | sgntm WHERE CON SYMBOL EQ cexp (SgnWhere (sgntm, SYMBOL, cexp), s (sgntmleft, cexpright))
-       | sgntm WHERE LTYPE SYMBOL EQ cexp(SgnWhere (sgntm, SYMBOL, cexp), s (sgntmleft, cexpright))
+       | sgntm WHERE CON path EQ cexp   (SgnWhere (sgntm, #1 path, #2 path, cexp), s (sgntmleft, cexpright))
+       | sgntm WHERE LTYPE path EQ cexp (SgnWhere (sgntm, #1 path, #2 path, cexp), s (sgntmleft, cexpright))
        | LPAREN sgn RPAREN              (sgn)
 
 cexpO  :                                (NONE)