merge
authorTim L <lebot@rpi.edu>
Mon, 09 Jul 2012 17:34:07 -0400
changeset 3851 53677459f79c
parent 3850 6a2dc0f9575c (current diff)
parent 3849 76efd232e9ce (diff)
child 3852 96e0c4f675e7
merge
--- a/model/grammar/ll.html	Mon Jul 09 17:33:51 2012 -0400
+++ b/model/grammar/ll.html	Mon Jul 09 17:34:07 2012 -0400
@@ -585,9 +585,11 @@
 | "~"<br/>
 | "&amp;"<br/>
 | "+"<br/>
+| "*"<br/>
 | "?"<br/>
 | "#"<br/>
-| "$"</code></td>
+| "$"<br/>
+| "!"</code></td>
 </tr>
 </tbody>
 
--- a/model/grammar/ll.js	Mon Jul 09 17:33:51 2012 -0400
+++ b/model/grammar/ll.js	Mon Jul 09 17:34:07 2012 -0400
@@ -586,9 +586,11 @@
 '| "~"<br/> ' + 
 '| "&amp;"<br/> ' + 
 '| "+"<br/> ' + 
+'| "*"<br/> ' + 
 '| "?"<br/> ' + 
 '| "#"<br/> ' + 
-'| "$"</code></td> ' + 
+'| "$"<br/> ' + 
+'| "!"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Mon Jul 09 17:33:51 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf	Mon Jul 09 17:34:07 2012 -0400
@@ -194,7 +194,7 @@
 
 [100s] PN_LOCAL ::= ( PN_CHARS_U | [0-9] | PN_CHARS_OTHERS ) ( ( PN_CHARS | '.' | PN_CHARS_OTHERS )*  ( PN_CHARS | PN_CHARS_OTHERS ) ) ?
 
-[160s] PN_CHARS_OTHERS ::= PERCENT | '/' | '@' | '~' | '&' | '+' | '?' | '#' | '$'
+[160s] PN_CHARS_OTHERS ::= PERCENT | '/' | '@' | '~' | '&' | '+'  | '*' | '?' | '#' | '$' | '!'
 
 [161s] PERCENT ::= '%' HEX HEX
 
--- a/model/grammar/yack/prov-n-LL.bnf.html	Mon Jul 09 17:33:51 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Mon Jul 09 17:34:07 2012 -0400
@@ -584,9 +584,11 @@
 | "~"<br/>
 | "&amp;"<br/>
 | "+"<br/>
+| "*"<br/>
 | "?"<br/>
 | "#"<br/>
-| "$"</code></td>
+| "$"<br/>
+| "!"</code></td>
 </tr>
 </tbody>
 
--- a/model/grammar/yack/prov-n.bnf	Mon Jul 09 17:33:51 2012 -0400
+++ b/model/grammar/yack/prov-n.bnf	Mon Jul 09 17:34:07 2012 -0400
@@ -215,7 +215,7 @@
  
 [100s] PN_LOCAL ::= ( PN_CHARS_U | [0-9] | PN_CHARS_OTHERS ) ( ( PN_CHARS | '.' | PN_CHARS_OTHERS )*  ( PN_CHARS | PN_CHARS_OTHERS ) ) ?
 
-[160s] PN_CHARS_OTHERS ::= PERCENT | '/' | '@' | '~' | '&' | '+' | '?' | '#' | '$'
+[160s] PN_CHARS_OTHERS ::= PERCENT | '/' | '@' | '~' | '&' | '+' | '*' | '?' | '#' | '$' | '!'
 
 [161s] PERCENT ::= '%' HEX HEX