From 781845905c0b6b78844de2b7d932ca36136f67ef Mon Sep 17 00:00:00 2001 From: Jon Daniels Date: Thu, 4 Aug 2016 13:17:00 -0700 Subject: [PATCH] added various keywords to calculator Added functions I commonly use on e.g. google calculator but were missed by parser. Specifically I added: e (constant like pi) tan, arcsin, and arctan log and ln --- Plugins/Wox.Plugin.Calculator/Main.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plugins/Wox.Plugin.Calculator/Main.cs b/Plugins/Wox.Plugin.Calculator/Main.cs index 35228ef14f..2005651529 100644 --- a/Plugins/Wox.Plugin.Calculator/Main.cs +++ b/Plugins/Wox.Plugin.Calculator/Main.cs @@ -10,7 +10,8 @@ namespace Wox.Plugin.Caculator { private static Regex regValidExpressChar = new Regex( @"^(" + - @"sin|cos|ceil|floor|exp|pi|max|min|det|arccos|abs|" + + @"ceil|floor|exp|pi|e|max|min|det|abs|log|ln" + + @"sin|cos|tan|arcsin|arccos|arctan|" + @"eigval|eigvec|eig|sum|polar|plot|round|sort|real|zeta|" + @"bin2dec|hex2dec|oct2dec|" + @"==|~=|&&|\|\||" +