diff options
author | Haibo Huang <hhb@google.com> | 2018-08-28 13:51:54 -0700 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2018-08-28 21:00:58 +0000 |
commit | b7f974f39180d46da516fb24eb2b1ca67d56089c (patch) | |
tree | 5f5626f8cde04eb9b6492d7dab0a6f2279d52e6d /runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions | |
parent | bbed35ef4bfde5c3ed2fb5001998b747ce8020a4 (diff) | |
download | antlr-b7f974f39180d46da516fb24eb2b1ca67d56089c.tar.gz |
Update antlr to 3.5.2
1. Add post_update.sh to preserve build.gradle.
2. Add the patches/fix_infinite_recursion.diff to fix infinite
recursion.
3. Run tools/external_updater/updater.sh update antlr
(Should we upgrade to v4?)
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Idafdb1cf6cf2310d983be612f36c5e6596a6e23f
Diffstat (limited to 'runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions')
3 files changed, 10 insertions, 15 deletions
diff --git a/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj index 959a9f9..2c90504 100644 --- a/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj +++ b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj @@ -12,10 +12,6 @@ <AssemblyName>Antlr3.Runtime.JavaExtensions</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SccProjectName>SAK</SccProjectName> - <SccLocalPath>SAK</SccLocalPath> - <SccAuxPath>SAK</SccAuxPath> - <SccProvider>SAK</SccProvider> <TargetFrameworkProfile>Client</TargetFrameworkProfile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -39,7 +35,7 @@ <SignAssembly>true</SignAssembly> </PropertyGroup> <PropertyGroup> - <AssemblyOriginatorKeyFile>..\..\..\..\..\..\..\keys\antlr\Key.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile>..\..\..\..\..\..\..\..\..\keys\antlr\Key.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -80,7 +76,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="..\..\..\..\..\..\..\keys\antlr\Key.snk"> + <None Include="..\..\..\..\..\..\..\..\..\keys\antlr\Key.snk"> <Link>Key.snk</Link> </None> </ItemGroup> diff --git a/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs index 8aa2671..00e66a9 100644 --- a/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs +++ b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs @@ -40,9 +40,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle( "Antlr3.Runtime.JavaExtensions" )] [assembly: AssemblyDescription( "" )] [assembly: AssemblyConfiguration( "" )] -[assembly: AssemblyCompany( "Pixel Mine, Inc." )] +[assembly: AssemblyCompany( "Tunnel Vision Laboratories, LLC" )] [assembly: AssemblyProduct( "Antlr3.Runtime.JavaExtensions" )] -[assembly: AssemblyCopyright( "Copyright © Pixel Mine 2010" )] +[assembly: AssemblyCopyright( "Copyright © Sam Harwell 2013" )] [assembly: AssemblyTrademark( "" )] [assembly: AssemblyCulture( "" )] [assembly: CLSCompliant( true )] @@ -64,7 +64,6 @@ using System.Runtime.InteropServices; * 2. Build is incremented each time the C# port is packaged for release (regardless * of whether it's an incremental or nightly). The value resets to zero whenever * the Major or Minor version is incremented. - * 3. Revision is the Perforce changelist number associated with the release. */ -[assembly: AssemblyVersion("3.3.4.8517")] -[assembly: AssemblyFileVersion("3.3.4.8517")] +[assembly: AssemblyVersion("3.5.0.2")] +[assembly: AssemblyFileVersion("3.5.0.2")] diff --git a/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs index 8432512..837908a 100644 --- a/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs +++ b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs @@ -30,6 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if DEBUG namespace Antlr.Runtime.JavaExtensions { using ObsoleteAttribute = System.ObsoleteAttribute; @@ -38,7 +39,6 @@ namespace Antlr.Runtime.JavaExtensions public static class StringExtensions { -#if DEBUG [Obsolete] public static char charAt( this string str, int index ) { @@ -98,19 +98,19 @@ namespace Antlr.Runtime.JavaExtensions { return str.Replace(oldValue, newValue); } -#endif + [Obsolete] public static string replaceAll( this string str, string regex, string newValue ) { return Regex.Replace( str, regex, newValue ); } + [Obsolete] public static string replaceFirst( this string str, string regex, string replacement ) { return Regex.Replace( str, regex, replacement ); } -#if DEBUG [Obsolete] public static bool startsWith( this string str, string value ) { @@ -146,6 +146,6 @@ namespace Antlr.Runtime.JavaExtensions { return str.Trim(); } -#endif } } +#endif |