Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Tokenizer project namespace to Dax.Tokenizer #7

Merged
merged 3 commits into from
Feb 22, 2024
Merged

Rename Tokenizer project namespace to Dax.Tokenizer #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b2018d
Rename Tokenizer project folder
albertospelta Feb 22, 2024
5223cb5
Rename Tokenizer .csproj and namespace
albertospelta Feb 22, 2024
07a9e46
Update Tokenizer project references
albertospelta Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dax.Vpax.Obfuscator.CI.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"src\\Dax.Vpax.Obfuscator.CLI\\Dax.Vpax.Obfuscator.CLI.csproj",
"src\\Dax.Vpax.Obfuscator.Common\\Dax.Vpax.Obfuscator.Common.csproj",
"src\\Dax.Vpax.Obfuscator\\Dax.Vpax.Obfuscator.csproj",
"src\\TabularEditor.Dax.Tokenizer\\TabularEditor.Dax.Tokenizer.csproj",
"src\\Dax.Tokenizer\\Dax.Tokenizer.csproj",
"tests\\Dax.Vpax.Obfuscator.Common.Tests\\Dax.Vpax.Obfuscator.Common.Tests.csproj",
"tests\\Dax.Vpax.Obfuscator.Tests\\Dax.Vpax.Obfuscator.Tests.csproj"
]
Expand Down
2 changes: 1 addition & 1 deletion Dax.Vpax.Obfuscator.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32414.318
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Obfuscator.Common", "src\Dax.Vpax.Obfuscator.Common\Dax.Vpax.Obfuscator.Common.csproj", "{80F06AB5-55E7-4190-9ADB-0724B9AD5509}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TabularEditor.Dax.Tokenizer", "src\TabularEditor.Dax.Tokenizer\TabularEditor.Dax.Tokenizer.csproj", "{D1B0052F-6048-4FFC-A7F3-93DD27351077}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Tokenizer", "src\Dax.Tokenizer\Dax.Tokenizer.csproj", "{D1B0052F-6048-4FFC-A7F3-93DD27351077}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Obfuscator.Common.Tests", "tests\Dax.Vpax.Obfuscator.Common.Tests\Dax.Vpax.Obfuscator.Common.Tests.csproj", "{1887308A-AB4C-40D4-B13A-B5240D4E90F6}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion ...enizer/TabularEditor.Dax.Tokenizer.csproj → src/Dax.Tokenizer/Dax.Tokenizer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Authors>Tabular Editor ApS</Authors>
<Company>Tabular Editor ApS</Company>
<Product>Dax Tokenizer</Product>
<PackageProjectUrl>https://github.com/sql-bi/Vpax-Obfuscator/tree/main/src/TabularEditor.Dax.Tokenizer</PackageProjectUrl>
<PackageProjectUrl>https://github.com/sql-bi/Vpax-Obfuscator/tree/main/src/Dax.Tokenizer</PackageProjectUrl>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ularEditor.Dax.Tokenizer/DaxCharStream.cs → src/Dax.Tokenizer/DaxCharStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Antlr4.Runtime;
using Antlr4.Runtime.Misc;

namespace TabularEditor.Dax.Tokenizer
namespace Dax.Tokenizer
{
public class DaxCharStream : ICharStream
{
Expand Down Expand Up @@ -78,4 +78,4 @@ public void Seek(int index)
stream.Seek(index);
}
}
}
}
2 changes: 1 addition & 1 deletion src/TabularEditor.Dax.Tokenizer/DaxLexer.cs → src/Dax.Tokenizer/DaxLexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Antlr4.Runtime;

namespace TabularEditor.Dax.Tokenizer
namespace Dax.Tokenizer
{
internal partial class DaxLexer

Check warning on line 5 in src/Dax.Tokenizer/DaxLexer.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

'DaxLexer' does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute

Check warning on line 5 in src/Dax.Tokenizer/DaxLexer.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

'DaxLexer' does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute
{
public DaxLexer(ICharStream input, DaxLocale locale) : this(input)
{
Expand Down
2 changes: 1 addition & 1 deletion ...ditor.Dax.Tokenizer/DaxLexer.generated.cs → src/Dax.Tokenizer/DaxLexer.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// Ambiguous reference in cref attribute
#pragma warning disable 419

namespace TabularEditor.Dax.Tokenizer {
namespace Dax.Tokenizer {
#pragma warning disable 3021
using System;
using System.IO;
Expand Down
2 changes: 1 addition & 1 deletion src/TabularEditor.Dax.Tokenizer/DaxLocale.cs → src/Dax.Tokenizer/DaxLocale.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace TabularEditor.Dax.Tokenizer
namespace Dax.Tokenizer
{
public enum DaxLocale
{
Expand Down
2 changes: 1 addition & 1 deletion src/TabularEditor.Dax.Tokenizer/DaxToken.cs → src/Dax.Tokenizer/DaxToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Antlr4.Runtime;

namespace TabularEditor.Dax.Tokenizer
namespace Dax.Tokenizer
{
public sealed partial class DaxToken
{
Expand All @@ -23,7 +23,7 @@
if (!token.CommentOrWhitespace) return token;
ix--;
}
return null;

Check warning on line 26 in src/Dax.Tokenizer/DaxToken.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

Possible null reference return.

Check warning on line 26 in src/Dax.Tokenizer/DaxToken.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

Possible null reference return.
}
}

Expand All @@ -35,7 +35,7 @@
if (!token.CommentOrWhitespace) return token;
ix++;
}
return null;

Check warning on line 38 in src/Dax.Tokenizer/DaxToken.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

Possible null reference return.

Check warning on line 38 in src/Dax.Tokenizer/DaxToken.cs

View workflow job for this annotation

GitHub Actions / build-and-test 

Possible null reference return.
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...ditor.Dax.Tokenizer/DaxToken.generated.cs → src/Dax.Tokenizer/DaxToken.generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace TabularEditor.Dax.Tokenizer
namespace Dax.Tokenizer
{
public sealed partial class DaxToken
{
Expand Down Expand Up @@ -225,4 +225,4 @@ public sealed partial class DaxToken
/// <summary>https://dax.guide/UNKNOWN_CHAR</summary>
public const int UNKNOWN_CHAR=111;
}
}
}
2 changes: 1 addition & 1 deletion ...bularEditor.Dax.Tokenizer/DaxTokenizer.cs → src/Dax.Tokenizer/DaxTokenizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Antlr4.Runtime;

namespace TabularEditor.Dax.Tokenizer
namespace Dax.Tokenizer
{
public static class DaxTokenizer
{
Expand Down
3 changes: 3 additions & 0 deletions src/Dax.Tokenizer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Dax.Tokenizer

TODO
0 src/TabularEditor.Dax.Tokenizer/version.json → src/Dax.Tokenizer/version.json
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<ProjectReference Include="..\Dax.Vpax.Obfuscator.Common\Dax.Vpax.Obfuscator.Common.csproj" PrivateAssets="all" />
<ProjectReference Include="..\TabularEditor.Dax.Tokenizer\TabularEditor.Dax.Tokenizer.csproj" PrivateAssets="all" />
<ProjectReference Include="..\Dax.Tokenizer\Dax.Tokenizer.csproj" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand All @@ -32,7 +32,7 @@
<BuildAction>None</BuildAction>
<PackagePath>lib\net462\</PackagePath>
</_PackageFiles>
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net462\TabularEditor.Dax.Tokenizer.dll">
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net462\Dax.Tokenizer.dll">
<BuildAction>None</BuildAction>
<PackagePath>lib\net462\</PackagePath>
</_PackageFiles>
Expand All @@ -41,7 +41,7 @@
<BuildAction>None</BuildAction>
<PackagePath>lib\netcoreapp3.1\</PackagePath>
</_PackageFiles>
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_netcoreapp3.1\TabularEditor.Dax.Tokenizer.dll">
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_netcoreapp3.1\Dax.Tokenizer.dll">
<BuildAction>None</BuildAction>
<PackagePath>lib\netcoreapp3.1\</PackagePath>
</_PackageFiles>
Expand All @@ -50,7 +50,7 @@
<BuildAction>None</BuildAction>
<PackagePath>lib\net6.0\</PackagePath>
</_PackageFiles>
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net6.0\TabularEditor.Dax.Tokenizer.dll">
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net6.0\Dax.Tokenizer.dll">
<BuildAction>None</BuildAction>
<PackagePath>lib\net6.0\</PackagePath>
</_PackageFiles>
Expand All @@ -59,7 +59,7 @@
<BuildAction>None</BuildAction>
<PackagePath>lib\net8.0\</PackagePath>
</_PackageFiles>
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net8.0\TabularEditor.Dax.Tokenizer.dll">
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net8.0\Dax.Tokenizer.dll">
<BuildAction>None</BuildAction>
<PackagePath>lib\net8.0\</PackagePath>
</_PackageFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Dax.Vpax.Obfuscator/DaxModelDeobfuscator.DeobfuscateExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Dax.Vpax.Obfuscator.Extensions;
using System.Text;
using TabularEditor.Dax.Tokenizer;
using Dax.Tokenizer;

namespace Dax.Vpax.Obfuscator;

Expand Down
2 changes: 1 addition & 1 deletion src/Dax.Vpax.Obfuscator/DaxModelObfuscator.ObfuscateExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Dax.Vpax.Obfuscator.Extensions;
using System.Text;
using TabularEditor.Dax.Tokenizer;
using Dax.Tokenizer;

namespace Dax.Vpax.Obfuscator;

Expand Down
2 changes: 1 addition & 1 deletion src/Dax.Vpax.Obfuscator/Extensions/DaxTokenExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Diagnostics;
using TabularEditor.Dax.Tokenizer;
using Dax.Tokenizer;

namespace Dax.Vpax.Obfuscator.Extensions;

Expand Down
3 changes: 0 additions & 3 deletions src/TabularEditor.Dax.Tokenizer/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/Dax.Vpax.Obfuscator.Tests/Dax.Vpax.Obfuscator.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Dax.Vpax.Obfuscator.Common\Dax.Vpax.Obfuscator.Common.csproj" />
<ProjectReference Include="..\..\src\Dax.Vpax.Obfuscator\Dax.Vpax.Obfuscator.csproj" />
<ProjectReference Include="..\..\src\TabularEditor.Dax.Tokenizer\TabularEditor.Dax.Tokenizer.csproj" />
<ProjectReference Include="..\..\src\Dax.Tokenizer\Dax.Tokenizer.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion tests/Dax.Vpax.Obfuscator.Tests/DaxModelDeobfuscatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Dax.Metadata;
using Dax.Vpax.Obfuscator.Common;
using Dax.Vpax.Obfuscator.Tests.TestUtils;
using TabularEditor.Dax.Tokenizer;
using Dax.Tokenizer;
using Xunit;

namespace Dax.Vpax.Obfuscator.Tests;
Expand Down
2 changes: 1 addition & 1 deletion tests/Dax.Vpax.Obfuscator.Tests/DaxModelObfuscatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Globalization;
using Dax.Metadata;
using Dax.Vpax.Obfuscator.Tests.TestUtils;
using TabularEditor.Dax.Tokenizer;
using Dax.Tokenizer;
using Xunit;

namespace Dax.Vpax.Obfuscator.Tests;
Expand Down
Loading