--- sml/trunk/src/cm/parse/cm.grm	1999/05/19 05:14:03	282
+++ sml/trunk/src/cm/parse/cm.grm	1999/05/19 08:20:58	283
@@ -30,7 +30,7 @@
 %nonterm description of S.group
        | alias of S.group
        | group of S.group
-       | permspec of S.permspec
+       | privspec of S.privilegespec
        | opt_exports of S.exports option
        | exports of S.exports
        | export of S.exports
@@ -52,7 +52,8 @@
 
 %pos int
 %verbose
-%arg (context, error', error, recParse, doMember) :
+%arg (grouppath, context, error', error, recParse, doMember) :
+    S.pathname *
     S.context *
     (pos * pos -> string -> (PrettyPrint.ppstream -> unit) -> unit) *
     (pos * pos -> string -> unit) *
@@ -88,17 +89,23 @@
 						 (pathnameleft, pathnameright)
 						 pathname)
 
-group : permspec GROUP opt_exports IS members	(S.group
-						 (permspec, opt_exports,
-						  members))
-      | permspec LIBRARY exports IS members     (S.library
-						 (permspec, exports, members))
+group : privspec GROUP opt_exports IS members   (S.group
+						 (grouppath,
+						  privspec, opt_exports,
+						  members,
+						  error (opt_exportsleft,
+							 opt_exportsright)))
+      | privspec LIBRARY exports IS members     (S.library
+						 (grouppath,
+						  privspec, exports, members,
+						  error (exportsleft,
+							 exportsright)))
 
-permspec : (* empty *)                          (S.initialPermSpec)
-      | permspec word                           (S.require (permspec, word,
+privspec : (* empty *)                          (S.initialPrivilegeSpec)
+         | privspec word                        (S.require (privspec, word,
 							    error (wordleft,
 								   wordright)))
-      | permspec LPAREN word RPAREN             (S.grant (permspec, word,
+         | privspec LPAREN word RPAREN          (S.grant (privspec, word,
 							  error (wordleft,
 								 wordright)))

<script type="text/javascript">//<![CDATA[
		function toggle_ffErrors() {
			var errorsblock = document.getElementById("ffErrorsBlock");
			var errorsgroup = document.getElementById("ffErrors");
			if (errorsblock.style.display == "none") {
				errorsblock.style.display = "block";
				errorsgroup.style.right = "10px";
			} else {
				errorsblock.style.display = "none";
				errorsgroup.style.right = "300px";
			}
		}
//]]></script>
<div id="ffErrors">
<a href="javascript:toggle_ffErrors();">Click to toggle</a>
<div id="ffErrorsBlock">
	<div class="error">does not end with &lt;/html&gt; tag</div>
	<div class="error">does not end with &lt;/body&gt; tag</div>
	<div class="info">The output has ended thus: REN word RPAREN          (S.grant (privspec, word,
 							  error (wordleft,
 								 wordright)))</div>
</div></div>
</body></html>