Fix the parser so it doesn't silently fail. Speed up by using

mdboom · mdboom · commit e422891d9fb1 · 2007-08-21T19:08:55.000Z
pyparsing's packrat feature.

svn path=/trunk/matplotlib/; revision=3725
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -30,7 +30,6 @@
     r'\bigwedge'            : ('cmex10',   4),
     r'\bigvee'              : ('cmex10',  37),
     r'\coprod'              : ('cmex10',  42),
-    r'\sqrt'                : ('cmex10',  48),
     r'\leftbrace'           : ('cmex10',  92),
     r'{'                    : ('cmex10',  92),
     r'\{'                   : ('cmex10',  92),
@@ -317,7 +316,6 @@
     r'\Pi'              : ('psyr', 213),
     r'\prod'            : ('psyr', 213),
     r'\surd'            : ('psyr', 214),
-    r'\sqrt'            : ('psyr', 214),
     r'\cdot'            : ('psyr', 215),
     r'\urcorner'        : ('psyr', 216),
     r'\vee'             : ('psyr', 217),
@@ -2046,7 +2044,6 @@
 'rightzigzagarrow': 8669,
 'rightarrow': 8594,
 'leftarrow': 8592,
-'sqrt': 8730,
 'twoheaddownarrow': 8609,
 'oint': 8750,
 'bigvee': 8897,
@@ -2556,7 +2553,6 @@
 'rightzigzagarrow': 'uni21DD',
 'rightarrow': 'uni2192',
 'leftarrow': 'uni2190',
-'sqrt': 'uni221A',
 'twoheaddownarrow': 'uni21A1',
 'oint': 'uni222E',
 'bigvee': 'uni22C1',
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -143,7 +143,7 @@
      Combine, Group, Optional, Forward, NotAny, alphas, nums, alphanums, \
      StringStart, StringEnd, ParseFatalException, FollowedBy, Regex, \
      operatorPrecedence, opAssoc, ParseResults, Or, Suppress, oneOf, \
-     ParseException, MatchFirst
+     ParseException, MatchFirst, NoMatch
 
 from matplotlib.afm import AFM
 from matplotlib.cbook import enumerate, iterable, Bunch, get_realpath_and_stat, \
@@ -1806,12 +1806,12 @@ def __init__(self):
                      + rbrace
                      ).setParseAction(self.customspace).setName('customspace')
 
-        symbol       =(Regex(r"[a-zA-Z0-9 +\-*/<>=:,.;!'@()[\]]")
-                     ^  Combine(
-                          bslash
-                        + oneOf(tex2uni.keys())
-                        )
-                      ).setParseAction(self.symbol).leaveWhitespace()
+        symbol       =(Regex(r"([a-zA-Z0-9 +\-*/<>=:,.;!'@()])|(\\[%${}\[\]])")
+                     | Combine(
+                         bslash
+                       + oneOf(tex2uni.keys())
+                       )
+                     ).setParseAction(self.symbol).leaveWhitespace()
 
         accent       = Group(
                          Combine(bslash + accent)
@@ -1823,7 +1823,7 @@ def __init__(self):
 
         group        = Group(
                          start_group
-                       + OneOrMore(
+                       + ZeroOrMore(
                            autoDelim
                          | simple)
                        + end_group
@@ -1907,7 +1907,7 @@ def __init__(self):
 
         math         = OneOrMore(
                        autoDelim
-                     | simple
+                     ^ simple
                      ).setParseAction(self.math).setName("math")
 
         math_delim   =(~bslash
@@ -1916,16 +1916,18 @@ def __init__(self):
         non_math     = Regex(r"(?:[^$]|(?:\\\$))*"
                      ).setParseAction(self.non_math).setName("non_math").leaveWhitespace()
 
-        self._expression <<(
-                         non_math
-                       + ZeroOrMore(
-                           Suppress(math_delim)
-                         + math
-                         + Suppress(math_delim)
-                         + non_math
-                         )
-                       )
-
+        self._expression << (
+            non_math
+          + ZeroOrMore(
+                Suppress(math_delim)
+              + math
+              + Suppress(math_delim)
+              + non_math
+            )  
+          ) + StringEnd()
+
+        self._expression.enablePackrat()
+        
         self.clear()
 
     def clear(self):
@@ -1966,6 +1968,7 @@ def push_state(self):
         self._state_stack.append(self.get_state().copy())
 
     def finish(self, s, loc, toks):
+        #~ print "finish", toks
         self._expr = Hlist(toks)
         return [self._expr]
 
