Ticket #4807: Changes.diff

astparser.py

@@ -107 +107 @@
             msg += ": %s" % (self._msg)
         return msg
 
+class ArguementError(ParserError):
+     """Class for error during executing."""
+     
+     def __init__(self, msg, start, eqn, end=None):
+         ParserError.__init__(self, msg, start, end)
+     
+     def __str__(self):
+         msg=''
+         msg += ": %s" % (self._msg)
+         return msg
+
 class Helper:
 
     def __init__(self, parent):
@@ -462 +473 @@
                 return ret
             except Exception, e:
                 msg = str(e)
-                raise RuntimeError(msg, ofs)
+                raise ArguementError(msg, ofs, 0)
+               
 
         elif isinstance(node, ast.Num):
             if type(node.n) == types.FloatType:

calculate.py

@@ -42 +42 @@
 from shareable_activity import ShareableActivity
 from layout import CalcLayout
 from mathlib import MathLib
-from astparser import AstParser, ParserError, RuntimeError
+from astparser import AstParser, ParserError, RuntimeError, ArguementError
 from svgimage import SVGImage
 
 from decimal import Decimal

functions.py

@@ -112 +112 @@
 'abs(x), return absolute value of x, which means -x for x < 0')
 
 def acos(x):
-    return _inv_scale_angle(math.acos(x))
+    if x>1 or x<-1:
+        raise ValueError(_('acos(x) only defined for x E [-1,1]'))
+    else:
+        return _inv_scale_angle(math.acos(x))
 acos.__doc__ = _(
 'acos(x), return the arc cosine of x. This is the angle for which the cosine \
 is x. Defined for -1 <= x < 1')
@@ -136 +139 @@
 add.__doc__ = _('add(x, y), return x + y')
 
 def asin(x):
+    if x>1 or x<-1:
+        raise ValueError(_('asin(x) only defined for x E [-1,1]'))
     return _inv_scale_angle(math.asin(x))
 asin.__doc__ = _(
 'asin(x), return the arc sine of x. This is the angle for which the sine is x. \
@@ -227 +232 @@
 exp.__doc__ = _('exp(x), return the natural exponent of x. Given by e^x')
 
 def factorial(n):
+    if n<0:
+        raise ValueError(_('Factorial(x) is only defined for integers x>=0'))
+
     if type(n) not in (types.IntType, types.LongType):
-        raise ValueError(_('Factorial only defined for integers'))
+        raise ValueError(_('Factorial(x) is only defined for integers x>=0'))
 
     if n == 0:
         return 1
@@ -283 +291 @@
 floor.__doc__ = _('floor(x), return the largest integer smaller than x.')
 
 def inv(x):
-    return 1 / x
+    if x==0:
+        raise ValueError(_('Can not divide by zero'))
+    return div(1, x)
 inv.__doc__ = _('inv(x), return the inverse of x, which is 1 / x')
 
 def is_int(n):
@@ -304 +314 @@
 
 def ln(x):
     if float(x) > 0:
-        return math.log(float(x))
+        return div(math.log(float(x)),math.log(math.e))
     else:
         raise ValueError(_('Logarithm(x) only defined for x > 0'))
 ln.__doc__ = _(