From 4f5ed933439cd05009b41a90d1be1e96e5d0a10f Mon Sep 17 00:00:00 2001 From: luan devecchi Date: Thu, 6 Sep 2018 13:36:20 -0300 Subject: [PATCH 1/2] Update ExpressionEvaluator.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changing regex to accept "ç" and accentuation --- CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs index 78e8555..64ddbd9 100644 --- a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs +++ b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs @@ -16,7 +16,7 @@ public class ExpressionEvaluator { #region Regex declarations - private static readonly Regex varOrFunctionRegEx = new Regex(@"^((?[+-])|(?(?[?])?\.)?)(?[a-zA-Z_][a-zA-Z0-9_]*)\s*((?(?[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?([+][+]|--)(?![a-zA-Z0-9_]))|((?[<](?>[^<>]+|(?[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled); + private static readonly Regex varOrFunctionRegEx = new Regex(@"^((?[+-])|(?(?[?])?\.)?)(?[a-zA-ZáàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ_][a-zA-ZáàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ0-9_]*)\s*((?(?[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?([+][+]|--)(?![a-zA-Z0-9_]))|((?[<](?>[^<>]+|(?[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);Compiled); private static readonly Regex numberRegex = new Regex(@"^(?[+-])?\d+(?\.?\d+(e[+-]?\d+)?)?(?ul|[fdulm])?", RegexOptions.IgnoreCase); private static readonly Regex stringBeginningRegex = new Regex("^(?[$])?(?[@])?[\"]"); private static readonly Regex internalCharRegex = new Regex(@"^['](\\[']|[^'])*[']"); From 18b949492885f73045fd8edf6ad191380d43e107 Mon Sep 17 00:00:00 2001 From: luan devecchi Date: Thu, 6 Sep 2018 13:55:55 -0300 Subject: [PATCH 2/2] Update ExpressionEvaluator.cs --- CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs index 64ddbd9..ee3b19b 100644 --- a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs +++ b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs @@ -16,7 +16,7 @@ public class ExpressionEvaluator { #region Regex declarations - private static readonly Regex varOrFunctionRegEx = new Regex(@"^((?[+-])|(?(?[?])?\.)?)(?[a-zA-ZáàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ_][a-zA-ZáàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ0-9_]*)\s*((?(?[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?([+][+]|--)(?![a-zA-Z0-9_]))|((?[<](?>[^<>]+|(?[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);Compiled); + private static readonly Regex varOrFunctionRegEx = new Regex(@"^((?[+-])|(?(?[?])?\.)?)(?[a-zA-ZáàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ_][a-zA-ZáàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ0-9_]*)\s*((?(?[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?([+][+]|--)(?![a-zA-Z0-9_]))|((?[<](?>[^<>]+|(?[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled); private static readonly Regex numberRegex = new Regex(@"^(?[+-])?\d+(?\.?\d+(e[+-]?\d+)?)?(?ul|[fdulm])?", RegexOptions.IgnoreCase); private static readonly Regex stringBeginningRegex = new Regex("^(?[$])?(?[@])?[\"]"); private static readonly Regex internalCharRegex = new Regex(@"^['](\\[']|[^'])*[']");