diff --git a/Editor/ObfusPasses/SymbolObfus/DebugNameMaker.cs b/Editor/ObfusPasses/SymbolObfus/DebugNameMaker.cs index acacf83..90483d7 100644 --- a/Editor/ObfusPasses/SymbolObfus/DebugNameMaker.cs +++ b/Editor/ObfusPasses/SymbolObfus/DebugNameMaker.cs @@ -8,9 +8,16 @@ namespace Obfuz.ObfusPasses.SymbolObfus private class TestNameScope : NameScopeBase { private int _nextIndex; - protected override void BuildNewName(StringBuilder nameBuilder, string originalName) + protected override void BuildNewName(StringBuilder nameBuilder, string originalName, string lastName) { - nameBuilder.Append($"<{originalName}>{_nextIndex++}"); + if (string.IsNullOrEmpty(lastName)) + { + nameBuilder.Append($"${originalName}"); + } + else + { + nameBuilder.Append($"${originalName}{_nextIndex++}"); + } } } @@ -18,10 +25,5 @@ namespace Obfuz.ObfusPasses.SymbolObfus { return new TestNameScope(); } - - public override string GetNewName(ParamDef param, string originalName) - { - return $"${originalName}"; - } } } diff --git a/Editor/ObfusPasses/SymbolObfus/NameScope.cs b/Editor/ObfusPasses/SymbolObfus/NameScope.cs index e56d9cc..7fedd40 100644 --- a/Editor/ObfusPasses/SymbolObfus/NameScope.cs +++ b/Editor/ObfusPasses/SymbolObfus/NameScope.cs @@ -16,7 +16,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus _nextIndex = 0; } - protected override void BuildNewName(StringBuilder nameBuilder, string originalName) + protected override void BuildNewName(StringBuilder nameBuilder, string originalName, string lastName) { for (int i = _nextIndex++; ;) { diff --git a/Editor/ObfusPasses/SymbolObfus/NameScopeBase.cs b/Editor/ObfusPasses/SymbolObfus/NameScopeBase.cs index 2d5f0b9..7bb0774 100644 --- a/Editor/ObfusPasses/SymbolObfus/NameScopeBase.cs +++ b/Editor/ObfusPasses/SymbolObfus/NameScopeBase.cs @@ -20,16 +20,18 @@ namespace Obfuz.ObfusPasses.SymbolObfus } - protected abstract void BuildNewName(StringBuilder nameBuilder, string originalName); + protected abstract void BuildNewName(StringBuilder nameBuilder, string originalName, string lastName); private string CreateNewName(string originalName) { var nameBuilder = new StringBuilder(); + string lastName = null; while (true) { nameBuilder.Clear(); - BuildNewName(nameBuilder, originalName); + BuildNewName(nameBuilder, originalName, lastName); string newName = nameBuilder.ToString(); + lastName = newName; if (_preservedNames.Add(newName)) { return newName;