From ad7708a4dcdee7968de22a018bf86e354cd5d077 Mon Sep 17 00:00:00 2001 From: Simen Samuelsen Date: Thu, 6 Jan 2022 15:54:37 +0100 Subject: [PATCH 1/2] =?UTF-8?q?allowing=20international=20letters=20like?= =?UTF-8?q?=20=C3=A6=C3=B8=C3=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/definition/DmnVariableDefinition.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs b/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs index 4ec6f3b..b566f72 100644 --- a/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs +++ b/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs @@ -140,10 +140,10 @@ public static string NormalizeVariableName(string name) if (string.IsNullOrWhiteSpace(retVal)) throw new ArgumentException($"Variable name is null or empty",nameof(name)); - if (retVal.Any(c => !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '_'))) + if (retVal.Any(c => char.IsLetter(c) || char.IsDigit(c) || c == '_'))) throw new ArgumentException($"Variable name '{name}' contains invalid character", nameof(name)); - if (!(retVal[0] >= 'a' && retVal[0] <= 'z' || retVal[0] >= 'A' && retVal[0] <= 'Z')) + if (!char.IsLetter(retVal[0]) throw new ArgumentException($"Variable name '{nameof(name)}' must start with letter", nameof(name)); return retVal; From 90b64407c442cec5034f4766530928096f26fdb8 Mon Sep 17 00:00:00 2001 From: Simen Samuelsen Date: Thu, 6 Jan 2022 23:07:55 +0100 Subject: [PATCH 2/2] fix missing () and adding ! --- .../engine/definition/DmnVariableDefinition.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs b/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs index b566f72..3962516 100644 --- a/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs +++ b/net.adamec.lib.common.dmn.engine/engine/definition/DmnVariableDefinition.cs @@ -140,10 +140,10 @@ public static string NormalizeVariableName(string name) if (string.IsNullOrWhiteSpace(retVal)) throw new ArgumentException($"Variable name is null or empty",nameof(name)); - if (retVal.Any(c => char.IsLetter(c) || char.IsDigit(c) || c == '_'))) + if (retVal.Any(c => !(char.IsLetter(c) || char.IsDigit(c) || c == '_'))) throw new ArgumentException($"Variable name '{name}' contains invalid character", nameof(name)); - if (!char.IsLetter(retVal[0]) + if (!char.IsLetter(retVal[0])) throw new ArgumentException($"Variable name '{nameof(name)}' must start with letter", nameof(name)); return retVal;