Ticket #2537: 0001-replace-fraction_sep-with-period-before-parsing-usin.patch

calculate.py

@@ -24 +24 @@
 import os
 from gettext import gettext as _
 import string
+import re
 import logging
 _logger = logging.getLogger('Calculate')
 
@@ -48 +49 @@
 from decimal import Decimal
 from rational import Rational
 
+
 def findchar(text, chars, ofs=0):
     '''
     Find a character in set <chars> starting from offset ofs.
@@ -448 +450 @@
     def process_async(self, eqn):
         """Parse and process an equation asynchronously."""
 
+    def replace_fraction_seperator(self, text):
+        '''
+        Replace the fraction separator with '.'
+        '''
+        match = text.group(0)
+        return match.replace(self.ml.fraction_sep, '.')
+
     def process(self):
         """Parse the equation entered and show the result"""
 
         s = unicode(self.text_entry.get_text())
         label = unicode(self.label_entry.get_text())
         _logger.debug('process(): parsing %r, label: %r', s, label)
+        # Replace the fraction separator with a period before parsing
+        # A simple replace won't work, e.g. plot(x*x,x=-1,0..1,)
+        s = re.sub(r'\d+\,\d*', self.replace_fraction_seperator, s)
         try:
             tree = self.parser.parse(s)
             res = self.parser.evaluate(tree)