Catch exceptions evaluating expression

2014-01-16 19:09:11 +04:00
parent e7d31b127d
commit 73de3ae9ab
3 changed files with 14 additions and 1 deletions
@@ -234,7 +234,11 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
        if (functions == null) return null

        val (function, checker) = functions
-        val actualResult = function(receiver.value, parameter.value)
+        val actualResult = try {
+            function(receiver.value, parameter.value)
+        } catch (e: Exception) {
+            null
+        }
        if (checker == emptyBinaryFun) {
            return actualResult
        }