Parsing with different fraction separator, #5319

2 files changed, 5 insertions, 3 deletions

diff --git a/eqnparser.py b/eqnparser.py
index eb6e68e..bdcf1b2 100644
--- a/eqnparser.py
+++ b/eqnparser.py
@@ -379,7 +379,7 @@ class EqnParser:
             ps.next()
 
 # part after dot
-        if ps.char == '.':
+        if ps.char == '.' or ps.char == self.ml.fraction_sep:
             ps.next()
             while ps.more() and ps.char in self.DIGITS:
                 ps.next()
diff --git a/mathlib.py b/mathlib.py
index 5dc10d7..4c3fe3b 100644
--- a/mathlib.py
+++ b/mathlib.py
@@ -38,6 +38,8 @@ class MathLib:
         self.constants = {}
         self.set_angle_type(self.ANGLE_DEG)
 
+        self.setup_i18n()
+
 #Constants should maybe become variables in eqnparser.py
         self.set_constant('true', True)
         self.set_constant('false', False)
@@ -53,8 +55,6 @@ class MathLib:
         self.set_constant('c_n', self.parse_number('0'))                        #neutron properties
         self.set_constant('m_n', self.parse_number('1.6749272928e-27'))
 
-        self.setup_i18n()
-
     def setup_i18n(self):
         loc = locale.localeconv()
 
@@ -105,6 +105,8 @@ class MathLib:
             return None
 
     def parse_number(self, s):
+        s = s.replace(self.fraction_sep, '.')
+
         try:
             d = Decimal(s)
             if self.is_int(d):