Updated cpp-peglib.peg

Author: yhirose

grammar/cpp-peglib.peg

@@ -24,26 +24,30 @@ Primary <-
 	/ BeginTok  Expression  EndTok
 	/ BeginCapScope  Expression  EndCapScope
 	/ BeginCap  Expression  EndCap
+	/ CapScope
 	/ BackRef
+	/ DictionaryI
 	/ LiteralI
 	/ Dictionary
 	/ Literal
 	/ NegatedClassI
 	/ NegatedClass
 	/ ClassI
 	/ Class
-	/  DOT
+	/ DOT
 
 Identifier <-  IdentCont  Spacing
 
-IdentCont <- IdentStart  IdentRest*
+IdentCont <- <IdentStart  IdentRest*>
 
 IdentStart <-  !"↑"  !"⇑" ([a-zA-Z_%] /  [\u0080-\uFFFF])
 
 IdentRest <-  IdentStart /  [0-9]
 
 Dictionary <-  LiteralD  (PIPE  LiteralD)+
 
+DictionaryI <- LiteralID (PIPE LiteralID)*
+
 lit_ope <-
 	[']  <(![']  Char)*> [']  Spacing
 	/ ["]  <(!["]  Char)*> ["]  Spacing
@@ -52,10 +56,14 @@ Literal <-  lit_ope
 
 LiteralD <-  lit_ope
 
-LiteralI <-
+lit_case_ignore_ope <-
 	[']  <(![']  Char)*>  "'i" Spacing
 	/ ["]  <(!["]  Char)*>  '"i' Spacing
 
+LiteralI <- lit_case_ignore_ope
+
+LiteralID <- lit_case_ignore_ope
+
 # NOTE: The original Brian Ford's paper uses 'zom' instead of 'oom'.
 Class <-  '['  !'^' <(!']'  Range)+>  ']' Spacing
 ClassI <-  '['  !'^' <(!']'  Range)+>  ']i' Spacing
@@ -82,6 +90,8 @@ RepetitionRange <-
 
 Number <-  [0-9]+  Spacing
 
+CapScope <- BeginCapScope Expression EndCapScope
+
 LEFTARROW <-  ("<-" / "←")  Spacing
 
 ~SLASH <-  '/'  Spacing