diff --git a/AILZ80ASM/AILight/AIName.cs b/AILZ80ASM/AILight/AIName.cs index 4386762e..95bab2f4 100644 --- a/AILZ80ASM/AILight/AIName.cs +++ b/AILZ80ASM/AILight/AIName.cs @@ -9,12 +9,33 @@ namespace AILZ80ASM.AILight public static class AIName { private static readonly string RegexPatternLabelValidate = @"^[a-zA-Z0-9_]+$"; + private static readonly Regex CompiledRegexPatternLabelValidate = new Regex( + RegexPatternLabelValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternMacroValidate = @"^[a-zA-Z0-9_()]+$"; + private static readonly Regex CompiledRegexPatternMacroValidate = new Regex( + RegexPatternMacroValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternLocalLabelNOValidate = @"^[a-zA-Z0-9_]+$"; + private static readonly Regex CompiledRegexPatternLocalLabelNOValidate = new Regex( + RegexPatternLocalLabelNOValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternLocalLabelATValidate = @"^@[0-9]+$"; + private static readonly Regex CompiledRegexPatternLocalLabelATValidate = new Regex( + RegexPatternLocalLabelATValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternLocalLabelANValidate = @"^@@(?([0-9]*))$"; + private static readonly Regex CompiledRegexPatternLocalLabelANValidate = new Regex( + RegexPatternLocalLabelANValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternLabelInvalid = @"^[0-9]"; + private static readonly Regex CompiledRegexPatternLabelInvalid = new Regex( + RegexPatternLabelInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternCharMapInvalid = @"^@[a-zA-Z0-9_]+$"; + private static readonly Regex CompiledRegexPatternCharMapInvalid = new Regex( + RegexPatternCharMapInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase + ); public static bool DeclareLabelValidate(string target, AsmLoad asmLoad) { @@ -296,7 +317,7 @@ public static bool ValidateCharMapName(string target, AsmLoad asmLoad) return false; } - return Regex.Match(target, RegexPatternCharMapInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success; + return CompiledRegexPatternCharMapInvalid.Match(target).Success; } /// @@ -343,8 +364,8 @@ private static bool ValidateName(string target, AsmLoad asmLoad) return false; } - return Regex.Match(target, RegexPatternLabelValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success && - !Regex.Match(target, RegexPatternLabelInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success; + return CompiledRegexPatternLabelValidate.Match(target).Success && + !CompiledRegexPatternLabelInvalid.Match(target).Success; } /// @@ -381,8 +402,8 @@ private static bool ValidateNameForMacroName(string target, AsmLoad asmLoad) return false; } - return Regex.Match(target, RegexPatternMacroValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success && - !Regex.Match(target, RegexPatternLabelInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success; + return CompiledRegexPatternMacroValidate.Match(target).Success && + !CompiledRegexPatternLabelInvalid.Match(target).Success; } private static bool ValidateNameForLocalLabel(string target, AsmLoad asmLoad) @@ -398,7 +419,7 @@ private static bool ValidateNameForLocalLabel(string target, AsmLoad asmLoad) return false; } - var regex = Regex.Match(target, RegexPatternLocalLabelANValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var regex = CompiledRegexPatternLocalLabelANValidate.Match(target); if (regex.Success) { var valueString= regex.Groups["labelValue"].Value; @@ -416,8 +437,8 @@ private static bool ValidateNameForLocalLabel(string target, AsmLoad asmLoad) } // @と通常ラベルの処理 - return Regex.Match(target, RegexPatternLocalLabelATValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success || - Regex.Match(target, RegexPatternLocalLabelNOValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success; + return CompiledRegexPatternLocalLabelATValidate.Match(target).Success || + CompiledRegexPatternLocalLabelNOValidate.Match(target).Success; } /// @@ -444,8 +465,8 @@ private static bool ValidateNameForFunction(string target, AsmLoad asmLoad) return false; } - return Regex.Match(target, RegexPatternLabelValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success && - !Regex.Match(target, RegexPatternLabelInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success; + return CompiledRegexPatternLabelValidate.Match(target).Success && + !CompiledRegexPatternLabelInvalid.Match(target).Success; } /// @@ -472,8 +493,8 @@ private static bool ValidateNameForFunctionArgument(string target, AsmLoad asmLo return false; } - return Regex.Match(target, RegexPatternLabelValidate, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success && - !Regex.Match(target, RegexPatternLabelInvalid, RegexOptions.Singleline | RegexOptions.IgnoreCase).Success; + return CompiledRegexPatternLabelValidate.Match(target).Success && + !CompiledRegexPatternLabelInvalid.Match(target).Success; } } diff --git a/AILZ80ASM/AILight/AIValue.cs b/AILZ80ASM/AILight/AIValue.cs index c6f6e40c..4830602a 100644 --- a/AILZ80ASM/AILight/AIValue.cs +++ b/AILZ80ASM/AILight/AIValue.cs @@ -234,32 +234,85 @@ public enum ArgumentTypeEnum /// オペレーション判別・正規表現用 /// private static readonly string RegexPatternOperation = $"^(?({OperationKeysString}))"; + private static readonly Regex CompiledRegexPatternOperation = new Regex( + RegexPatternOperation, RegexOptions.Compiled | RegexOptions.IgnoreCase + ); /// /// オペレーション判別・正規表現用（文字列のみ） /// private static readonly string RegexPatternWordOperation = $"^(?({WordOperationKeysString}))"; + private static readonly Regex CompiledRegexPatternWordOperation = new Regex( + RegexPatternWordOperation, RegexOptions.Compiled | RegexOptions.IgnoreCase + ); /// /// オペレーション判別・正規表現用（記号のみ） /// private static readonly string RegexPatternSymbolOperation = $"^(?({SymbolOperationKeysString}))"; + private static readonly Regex CompiledRegexPatternSymbolOperation = new Regex( + RegexPatternSymbolOperation, RegexOptions.Compiled | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternHexadecimal_HD = @"^\$(?([0-9A-Fa-f]+))$"; + private static readonly Regex CompiledRegexPatternHexadecimal_HD = new Regex( + RegexPatternHexadecimal_HD, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); + private static readonly string RegexPatternHexadecimal_HX = @"^0x(?([0-9A-Fa-f]+))$"; + private static readonly Regex CompiledRegexPatternHexadecimal_HX = new Regex( + RegexPatternHexadecimal_HX, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); + private static readonly string RegexPatternHexadecimal_TH = @"^(?([0-9A-Fa-f]+))H$"; + private static readonly Regex CompiledRegexPatternHexadecimal_TH = new Regex( + RegexPatternHexadecimal_TH, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternOctal_HO = @"^0o(?([0-7]+))$"; + private static readonly Regex CompiledRegexPatternOctal_HO = new Regex( + RegexPatternOctal_HO, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternOctal_TO = @"^(?([0-7]+))O$"; + private static readonly Regex CompiledRegexPatternOctal_TO = new Regex( + RegexPatternOctal_TO, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternBinaryNumber_HB = @"^0b(?([01_]+))$"; + private static readonly Regex CompiledRegexPatternBinaryNumber_HB = new Regex( + RegexPatternBinaryNumber_HB, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternBinaryNumber_TB = @"^(?([01_]+))B$"; + private static readonly Regex CompiledRegexPatternBinaryNumber_TB = new Regex( + RegexPatternBinaryNumber_TB, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternBinaryNumber_HP = @"^%(?([01_]+))$"; + private static readonly Regex CompiledRegexPatternBinaryNumber_HP = new Regex( + RegexPatternBinaryNumber_HP, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternDigit_N = @"^(?(\+|\-|)(\d+))$"; + private static readonly Regex CompiledRegexPatternDigit_N = new Regex( + RegexPatternDigit_N, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternDigit_D = @"^(?(\+|\-|)(\d+))D$"; + private static readonly Regex CompiledRegexPatternDigit_D = new Regex( + RegexPatternDigit_D, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternValue = @"^(?[0-9a-zA-Z_\$#@\.]+)"; + private static readonly Regex CompiledRegexPatternValue = new Regex( + RegexPatternValue, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternFunction = @"^(?[0-9a-zA-Z_]+\s*\()"; + private static readonly Regex CompiledRegexPatternFunction = new Regex( + RegexPatternFunction, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternFunctionWithNamespace = @"^(?[0-9a-zA-Z_]+\.[0-9a-zA-Z_]+\s*\()"; + private static readonly Regex CompiledRegexPatternFunctionWithNamespace = new Regex( + RegexPatternFunctionWithNamespace, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private static readonly string RegexPatternSyntaxSuger_AL = @"^\.@@(?(B|F))"; + private static readonly Regex CompiledRegexPatternSyntaxSuger_AL = new Regex( + RegexPatternSyntaxSuger_AL, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); private string Value { get; set; } = ""; private int ValueInt32 { get; set; } = default(int); @@ -324,7 +377,7 @@ public AIValue(string value, ValueTypeEnum valueType) /// public static bool TryParseFormula(ref string target, out string resultFormula) { - var matchOperation = Regex.Match(target, RegexPatternOperation, RegexOptions.IgnoreCase); + var matchOperation = CompiledRegexPatternOperation.Match(target); if (!matchOperation.Success) { resultFormula = ""; @@ -332,7 +385,7 @@ public static bool TryParseFormula(ref string target, out string resultFormula) } // 記号のみチェック - var matchSymbol = Regex.Match(target, RegexPatternSymbolOperation, RegexOptions.IgnoreCase); + var matchSymbol = CompiledRegexPatternSymbolOperation.Match(target); if (matchSymbol.Success) { resultFormula = matchSymbol.Groups["operation"].Value; @@ -341,7 +394,7 @@ public static bool TryParseFormula(ref string target, out string resultFormula) } // 文字列演算子のチェック - if (!Regex.IsMatch(target, $"{RegexPatternWordOperation}($|\\s+)", RegexOptions.IgnoreCase)) + if (!CompiledRegexPatternWordOperation.IsMatch(target)) { resultFormula = ""; return false; @@ -360,7 +413,7 @@ public static bool TryParseFormula(ref string target, out string resultFormula) if (!string.IsNullOrEmpty(nextTarget)) { - var matchNextSymbol = Regex.Match(nextTarget, RegexPatternSymbolOperation, RegexOptions.IgnoreCase); + var matchNextSymbol = CompiledRegexPatternSymbolOperation.Match(nextTarget); if (matchNextSymbol.Success) { var operationType = OperationTypeTable[matchNextSymbol.Groups["operation"].Value.ToLower()]; @@ -407,12 +460,12 @@ public static bool TryParseFunction(ref string target, out string resultFunction { var functionName = default(string); - var matched = Regex.Match(target, RegexPatternFunction, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var matched = CompiledRegexPatternFunction.Match(target); if (matched.Success) { functionName = matched.Groups["function"].Value; } - var matchedWithNamespace = Regex.Match(target, RegexPatternFunctionWithNamespace, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var matchedWithNamespace = CompiledRegexPatternFunctionWithNamespace.Match(target); if (matchedWithNamespace.Success) { functionName = matchedWithNamespace.Groups["function"].Value; @@ -472,7 +525,7 @@ public static bool TryParseFunction(ref string target, out string resultFunction /// public static bool TryParseSyntaxSuger(ref string target, out string[] resultValues) { - var matched = Regex.Match(target, RegexPatternSyntaxSuger_AL, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var matched = CompiledRegexPatternSyntaxSuger_AL.Match(target); if (matched.Success) { var direction = matched.Groups["direction"].Value; @@ -503,7 +556,7 @@ public static bool TryParseSyntaxSuger(ref string target, out string[] resultVal /// public static bool TryParseValue(ref string target, out string resultValue) { - var matched = Regex.Match(target, RegexPatternValue, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var matched = CompiledRegexPatternValue.Match(target); if (matched.Success) { resultValue = matched.Groups["value"].Value; @@ -1901,9 +1954,9 @@ private static bool TryParse16(string value, out string result) { var matched = default(Match); - if ((matched = Regex.Match(value, RegexPatternHexadecimal_HD, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success || - (matched = Regex.Match(value, RegexPatternHexadecimal_HX, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success || - (matched = Regex.Match(value, RegexPatternHexadecimal_TH, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success) + if ((matched = CompiledRegexPatternHexadecimal_HD.Match(value)).Success || + (matched = CompiledRegexPatternHexadecimal_HX.Match(value)).Success || + (matched = CompiledRegexPatternHexadecimal_TH.Match(value)).Success) { result = matched.Groups["value"].Value.Replace("_", ""); return true; @@ -1923,9 +1976,9 @@ private static bool TryParse2(string value, out string result) { var matched = default(Match); - if ((matched = Regex.Match(value, RegexPatternBinaryNumber_HB, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success || - (matched = Regex.Match(value, RegexPatternBinaryNumber_TB, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success || - (matched = Regex.Match(value, RegexPatternBinaryNumber_HP, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success) + if ((matched = CompiledRegexPatternBinaryNumber_HB.Match(value)).Success || + (matched = CompiledRegexPatternBinaryNumber_TB.Match(value)).Success || + (matched = CompiledRegexPatternBinaryNumber_HP.Match(value)).Success) { result = matched.Groups["value"].Value.Replace("_", ""); return true; @@ -1946,8 +1999,8 @@ private static bool TryParse8(string value, out string result) { var matched = default(Match); - if ((matched = Regex.Match(value, RegexPatternOctal_HO, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success || - (matched = Regex.Match(value, RegexPatternOctal_TO, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success) + if ((matched = CompiledRegexPatternOctal_HO.Match(value)).Success || + (matched = CompiledRegexPatternOctal_TO.Match(value)).Success) { result = matched.Groups["value"].Value.Replace("_", ""); return true; @@ -1968,8 +2021,8 @@ private static bool TryParse10(string value, out string result) { var matched = default(Match); - if ((matched = Regex.Match(value, RegexPatternDigit_N, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success || - (matched = Regex.Match(value, RegexPatternDigit_D, RegexOptions.Singleline | RegexOptions.IgnoreCase)).Success) + if ((matched = CompiledRegexPatternDigit_N.Match(value)).Success || + (matched = CompiledRegexPatternDigit_D.Match(value)).Success) { result = matched.Groups["value"].Value.Replace("_", ""); return true; diff --git a/AILZ80ASM/OperationItems/OperationItemData.cs b/AILZ80ASM/OperationItems/OperationItemData.cs index 58401c8e..596a3f99 100644 --- a/AILZ80ASM/OperationItems/OperationItemData.cs +++ b/AILZ80ASM/OperationItems/OperationItemData.cs @@ -33,7 +33,15 @@ private class DataValue } private static readonly string RegexPatternDataFunction = @"^\[(?[a-z|A-Z|0-9|_]+)\s*=\s*(?[a-z|A-Z|0-9|_|$|%]+)\s*\.\.\s*(?[a-z|A-Z|0-9|_|$|%]+)\s*:\s*(?.+)\]$"; + private static readonly Regex CompiledRegexPatternDataFunction = new Regex( + RegexPatternDataFunction, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); + private static readonly string RegexPatternDataOP = @"(?^\S+)?\s*(?.+)*"; + private static readonly Regex CompiledRegexPatternDataOP = new Regex( + RegexPatternDataOP, RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase + ); + private string[] ValueStrings { get; set; } private DataTypeEnum DataType { get; set; } @@ -53,7 +61,7 @@ private OperationItemData(DataTypeEnum dataType, string[] valueStrings, LineItem public static OperationItemData Create(LineItem lineItem, AsmLoad asmLoad) { - var matched = Regex.Match(lineItem.OperationString, RegexPatternDataOP, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var matched = CompiledRegexPatternDataOP.Match(lineItem.OperationString); var dataType = default(DataTypeEnum); var op1 = matched.Groups["op1"].Value; @@ -98,7 +106,7 @@ public override void PreAssemble(LineDetailExpansionItemOperation lineDetailExpa } } - else if (Regex.IsMatch(item.Value, RegexPatternDataFunction)) + else if (CompiledRegexPatternDataFunction.IsMatch(item.Value)) { ValueList.AddRange(DBDW_Function(item.Value, lineDetailExpansionItemOperation, AsmLoad).Select(m => new DataValue { DataValueType = DataValueTypeEnum.StringValue, StringValue = m })); } @@ -247,7 +255,7 @@ private static string[] DBDW_Function(string op, LineDetailExpansionItemOperatio { var returnValues = new List(); - var matchFunction = Regex.Match(op, RegexPatternDataFunction, RegexOptions.Singleline | RegexOptions.IgnoreCase); + var matchFunction = CompiledRegexPatternDataFunction.Match(op); if (matchFunction.Success) { var variableName = matchFunction.Groups["variable"].Value.Trim(); @@ -265,7 +273,7 @@ private static string[] DBDW_Function(string op, LineDetailExpansionItemOperatio { //ループの展開 var tmpOperation = Regex.Replace(operation, $"\\b{variableName}\\b", $"{currentValue}", RegexOptions.Singleline | RegexOptions.IgnoreCase); - if (Regex.IsMatch(tmpOperation, RegexPatternDataFunction)) + if (CompiledRegexPatternDataFunction.IsMatch(tmpOperation)) { returnValues.AddRange(DBDW_Function(tmpOperation, lineDetailExpansionItemOperation, asmLoad)); }