Pycalc release v1.0.8.

Author: Mephody

final_task/pycalc/pycalc.py

@@ -67,7 +67,7 @@ def __init__(self):
 
                 "space":    full_info(None,                 None, None,  r'[ \n\t]+',        None),
                 "int_n":    full_info(None,                 None, None,  r'[0-9]+',          self.tag_number),
-                "int_f":    full_info(None,                 None, None,  r'[0-9]+\.[0-9]',   self.tag_number),
+                "int_f":    full_info(None,                 None, None,  r'[0-9]+\.[0-9]+',   self.tag_number),
                 "int_f2":   full_info(None,                 None, None,  r'\.[0-9]',         self.tag_number),
 
 
@@ -183,7 +183,7 @@ def rpn_from_stacked_string(self, stack):
                 elif item == ",":
                     while temporary_stack[-1] != "(":
                         rpn_stack.append(temporary_stack.pop())
-                elif self.operators[temporary_stack[-1]].priority <= self.operators[item].priority:
+                elif self.operators[temporary_stack[-1]].priority < self.operators[item].priority:
                     temporary_stack.append(item)
                 else:
                     temp_priority = self.operators[item].priority
@@ -254,6 +254,9 @@ def calculate(self, input_string):
         except RuntimeError as rerror:
             print(rerror.args[0])
             exit(1)
+        except ValueError as verror:
+            print(verror.args[0])
+            exit(1)
         return result
 
     @staticmethod
@@ -283,6 +286,8 @@ def get_math_operators(math_priority, tag_operators, tag_constants, tuple_templa
                     math_constants.update({item: tuple_template(math.__dict__.get(item), None, None, item,
                                                                 tag_constants)})
 
+        math_operators.update({'log': tuple_template(math.log, math_priority, 1, 'log', tag_operators)})
+
         return math_operators, math_constants
 
     @staticmethod
@@ -302,7 +307,7 @@ def lexer(characters, token_exprs, tuple_template):
                         tokens.append(token)
                     break
             if not match:
-                raise RuntimeError('Illegal character: %s\n' % characters[pos])
+                raise RuntimeError('ERROR: Illegal character: %s\n' % characters[pos])
             else:
                 pos = match.end(0)
         return tokens
@@ -319,3 +324,7 @@ def main():
 
 if __name__ == '__main__':
     main()
+
+# calc = PyCalc()
+# result = calc.calculate('6 < = 6')
+# print(result)