clean up grammar by using <-[class]>

fperrad · Mar 30, 2009 · 66cf8ef · 66cf8ef
1 parent e83a324
commit 66cf8ef
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -237,7 +237,7 @@ token Str {
 }
 
 token EscapedChar {
-    '\\' <!Newline> (.)
+    '\\' (<-[\n]>)
     {*}
 }
 
@@ -394,17 +394,15 @@ token AutoLink {
 }
 
 token AutoLinkUrl {
-    '<' ( <[A..Za..z]>+ '://' [ <!Newline> <!_Gt> . ]+ ) '>'
+    '<' ( <[A..Za..z]>+ '://' <-[>\n]>+ ) '>'
     {*}
 }
 
 token AutoLinkEmail {
-    '<' ( <[\-.A..Za..z0..9_]>+ '@' [ <!Newline> <!_Gt> . ]+ ) '>'
+    '<' ( <[\-.A..Za..z0..9_]>+ '@' <-[>\n]>+ ) '>'
     {*}
 }
 
-token _Gt { '>' }
-
 token Reference {
     <.NonindentSpace> <!_EmptyLabel> <Label> ':' <.Spnl> <RefSrc> <.Spnl> <RefTitle> <.BlankLine>*
     {*}
@@ -509,14 +507,10 @@ token RawHtml {
 token BlankLine { <.Sp> <.Newline> {*} }
 
 token Quoted {
-    | <._Quote> [ <!_Quote> . ]* <._Quote>
-    | <._Apos> [ <!_Apos> . ]* <._Apos>
+    | '"' <-["]>* '"'
+    | '\'' <-[']>* '\''
 }
 
-token _Quote { '"' }
-
-token _Apos { '\'' }
-
 token HtmlAttribute {
     <._HtmlName> <.Spnl> [ '=' <.Spnl> [ <.Quoted> | <.Nonspacechar>+] ]? <.Spnl>
 }