Skip to content

Commit d7194ec

Browse files
wiredwizwiredwiz
committed
Merge branch 'RuntimeStandard'
2 parents 887d414 + ea116ff commit d7194ec

29 files changed

+84
-128
lines changed

‎Code Grapher/Code Grapher.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
35-
<HintPath>..\packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
34+
<Reference Include="Antlr4.Runtime.Standard, Version=4.13.1.0, Culture=neutral, PublicKeyToken=e78b2c5abd1fcb3f, processorArchitecture=MSIL">
35+
<HintPath>..\packages\Antlr4.Runtime.Standard.4.13.1\lib\net45\Antlr4.Runtime.Standard.dll</HintPath>
3636
</Reference>
3737
<Reference Include="AutomaticGraphLayout">
3838
<HintPath>..\References\AutomaticGraphLayout.dll</HintPath>
@@ -60,6 +60,5 @@
6060
<ItemGroup>
6161
<None Include="packages.config" />
6262
</ItemGroup>
63-
<ItemGroup />
6463
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6564
</Project>

‎Code Grapher/ParseTreeGrapher.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ private void FormatNodes(Graph graph, ITree tree, IList<string> parserRules)
100100
ruleFailedAndMatchedNothing =
101101
// ReSharper disable once ComplexConditionExpression
102102
context.exception != null &&
103-
context.stop != null
104-
&& context.stop.TokenIndex < context.start.TokenIndex;
103+
context.Stop != null
104+
&& context.Stop.TokenIndex < context.Start.TokenIndex;
105105

106106
if (tree is IErrorNode || ruleFailedAndMatchedNothing)
107107
node.Label.FontColor = Color.Red;

‎Code Grapher/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Code Grapher")]
13-
[assembly: AssemblyCopyright("Copyright © 2020")]
13+
[assembly: AssemblyCopyright("Copyright © 2023")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,7 +32,7 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.3.23321.0")]
36-
[assembly: AssemblyFileVersion("1.3.23321.0")]
35+
[assembly: AssemblyVersion("2.0.23321.1")]
36+
[assembly: AssemblyFileVersion("2.0.23321.1")]
3737

38-
[assembly: AssemblyInformationalVersion("1.3.23321.0")]
38+
[assembly: AssemblyInformationalVersion("2.0.23321.1")]

‎Code Grapher/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net461" />
3+
<package id="Antlr4.Runtime.Standard" version="4.13.1" targetFramework="net461" />
44
</packages>

‎Common/Common.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Org.Edgerunner.ANTLR4.Tools.Common</RootNamespace>
1111
<AssemblyName>Edgerunner.ANTLR4.Tools.Common</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -31,8 +32,8 @@
3132
<WarningLevel>4</WarningLevel>
3233
</PropertyGroup>
3334
<ItemGroup>
34-
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
35-
<HintPath>..\packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
35+
<Reference Include="Antlr4.Runtime.Standard, Version=4.13.1.0, Culture=neutral, PublicKeyToken=e78b2c5abd1fcb3f, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Antlr4.Runtime.Standard.4.13.1\lib\net45\Antlr4.Runtime.Standard.dll</HintPath>
3637
</Reference>
3738
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
3839
<HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>

‎Common/Grammar/DetailedToken.cs‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -91,38 +91,6 @@ public DetailedToken(int type)
9191
{
9292
}
9393

94-
/// <summary>Explicitly set the text for this token.</summary>
95-
/// <remarks>
96-
/// Explicitly set the text for this token. If {code text} is not
97-
/// <see langword="null" />
98-
/// , then
99-
/// <see cref="P:Antlr4.Runtime.CommonToken.Text" />
100-
/// will return this value rather than
101-
/// extracting the text from the input.
102-
/// </remarks>
103-
/// <value>
104-
/// The explicit text of the token, or
105-
/// <see langword="null" />
106-
/// if the text
107-
/// should be obtained from the input along with the start and stop indexes
108-
/// of the token.
109-
/// </value>
110-
public override string Text
111-
{
112-
get
113-
{
114-
if (!string.IsNullOrEmpty(text))
115-
return text;
116-
ICharStream inputStream = InputStream;
117-
if (inputStream == null)
118-
return null;
119-
int size = inputStream.Size;
120-
return start < size && stop < size ? inputStream.GetText(Interval.Of(start, stop)) : "<EOF>";
121-
}
122-
123-
set => text = value;
124-
}
125-
12694
/// <summary>
12795
/// Gets the token display text.
12896
/// </summary>

‎Common/Grammar/DetailedTokenFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public DetailedToken Create(Tuple<ITokenSource, ICharStream> source, int type, s
9090
new DetailedToken(source, type, channel, start, stop) { Line = line, Column = charPositionInLine };
9191
if (text != null)
9292
token.Text = text;
93-
else if (source.Item2 != null)
93+
else if (source.Item2 != null & stop >= start)
9494
token.Text = source.Item2.GetText(Interval.Of(start, stop));
9595
if (source.Item1 is IRecognizer recognizer)
9696
token.TypeName = token.Type > -1 ? recognizer.Vocabulary.GetDisplayName(token.Type) : string.Empty;

‎Common/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Common")]
13-
[assembly: AssemblyCopyright("Copyright © 2020")]
13+
[assembly: AssemblyCopyright("Copyright © 2023")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,7 +32,7 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.3.23321.0")]
36-
[assembly: AssemblyFileVersion("1.3.23321.0")]
35+
[assembly: AssemblyVersion("2.0.23321.1")]
36+
[assembly: AssemblyFileVersion("2.0.23321.1")]
3737

38-
[assembly: AssemblyInformationalVersion("1.3.23321.0")]
38+
[assembly: AssemblyInformationalVersion("2.0.23321.1")]

‎Common/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net461" />
3+
<package id="Antlr4.Runtime.Standard" version="4.13.1" targetFramework="net461" />
44
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net461" />
55
</packages>

‎Grun.Net.sln‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.28307.1022
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.6.33829.357
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grun", "Grun\Grun.csproj", "{B614368A-F4C9-409F-8896-CB1DA204AD6D}"
66
EndProject
@@ -64,21 +64,9 @@ Global
6464
SolutionGuid = {A1CB1A18-09C5-4D7F-916D-2346D29A8563}
6565
EndGlobalSection
6666
GlobalSection(AutomaticVersions) = postSolution
67-
UpdateAssemblyVersion = True
68-
UpdateAssemblyFileVersion = True
69-
UpdateAssemblyInfoVersion = True
70-
ShouldCreateLogs = True
71-
AdvancedSettingsExpanded = True
72-
AssemblyVersionSettings = None.None.None.None
73-
AssemblyFileVersionSettings = None.None.None.None
74-
AssemblyInfoVersionSettings = None.None.None.None
75-
UpdatePackageVersion = False
76-
AssemblyInfoVersionType = SettingsVersion
77-
InheritWinAppVersionFrom = None
7867
UpdateAssemblyVersion.Release|Any CPU = True
7968
UpdateAssemblyFileVersion.Release|Any CPU = True
8069
UpdateAssemblyInfoVersion.Release|Any CPU = True
81-
ShouldCreateLogs.Release|Any CPU = True
8270
AssemblyVersionSettings.Release|Any CPU = None.None.DateStamp.IncrementWithResetOnIncrease
8371
AssemblyFileVersionSettings.Release|Any CPU = None.None.DateStamp.IncrementWithResetOnIncrease
8472
AssemblyInfoVersionSettings.Release|Any CPU = None.None.DateStamp.IncrementWithResetOnIncrease

0 commit comments

Comments
 (0)