Merge pull request #1 from antlr/unified-tool

CLSCompliant version for mono
antlr · Nov 17, 2014 · bfb819e · bfb819e
2 parents 195a11e + 710a4b1
commit bfb819e
Show file tree

Hide file tree

Showing 92 changed files with 11,716 additions and 1,874 deletions.
diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.mono.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.mono.csproj
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.3.0\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.3.0\build\Antlr4.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E1A46D9D-66CB-46E8-93B0-7FC87299ABEF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Antlr4.Runtime</RootNamespace>
+    <AssemblyName>Antlr4.Runtime</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <BaseIntermediateOutputPath>obj\net20\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\net20\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NET20;NET20PLUS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\net20\Release\</OutputPath>
+    <DefineConstants>TRACE;NET20;NET20PLUS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\..\..\..\..\keys\antlr\antlr-net20.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AntlrFileStream.cs" />
+    <Compile Include="AntlrInputStream.cs" />
+    <Compile Include="Atn\AbstractPredicateTransition.cs" />
+    <Compile Include="Atn\ActionTransition.cs" />
+    <Compile Include="Atn\AmbiguityInfo.cs" />
+    <Compile Include="Atn\ArrayPredictionContext.cs" />
+    <Compile Include="Atn\ATN.cs" />
+    <Compile Include="Atn\ATNConfig.cs" />
+    <Compile Include="Atn\ATNConfigSet.cs" />
+    <Compile Include="Atn\ATNDeserializationOptions.cs" />
+    <Compile Include="Atn\ATNDeserializer.cs" />
+    <Compile Include="Atn\ConflictInfo.cs" />
+    <Compile Include="Dfa\AcceptStateInfo.cs" />
+    <Compile Include="Dfa\EmptyEdgeMap`1.cs" />
+    <Compile Include="IVocabulary.cs" />
+    <Compile Include="Vocabulary.cs" />
+    <None Include="Atn\ATNSerializer.cs" />
+    <Compile Include="Atn\ATNSimulator.cs" />
+    <Compile Include="Atn\ATNState.cs" />
+    <Compile Include="Atn\ATNType.cs" />
+    <Compile Include="Atn\AtomTransition.cs" />
+    <Compile Include="Atn\BasicBlockStartState.cs" />
+    <Compile Include="Atn\BasicState.cs" />
+    <Compile Include="Atn\BlockEndState.cs" />
+    <Compile Include="Atn\BlockStartState.cs" />
+    <Compile Include="Atn\ContextSensitivityInfo.cs" />
+    <Compile Include="Atn\DecisionEventInfo.cs" />
+    <Compile Include="Atn\DecisionInfo.cs" />
+    <Compile Include="Atn\DecisionState.cs" />
+    <Compile Include="Atn\EmptyPredictionContext.cs" />
+    <Compile Include="Atn\EpsilonTransition.cs" />
+    <Compile Include="Atn\ErrorInfo.cs" />
+    <Compile Include="Atn\ILexerAction.cs" />
+    <Compile Include="Atn\LexerActionExecutor.cs" />
+    <Compile Include="Atn\LexerActionType.cs" />
+    <Compile Include="Atn\LexerATNSimulator.cs" />
+    <Compile Include="Atn\LexerChannelAction.cs" />
+    <Compile Include="Atn\LexerCustomAction.cs" />
+    <Compile Include="Atn\LexerIndexedCustomAction.cs" />
+    <Compile Include="Atn\LexerModeAction.cs" />
+    <Compile Include="Atn\LexerMoreAction.cs" />
+    <Compile Include="Atn\LexerPopModeAction.cs" />
+    <Compile Include="Atn\LexerPushModeAction.cs" />
+    <Compile Include="Atn\LexerSkipAction.cs" />
+    <Compile Include="Atn\LexerTypeAction.cs" />
+    <Compile Include="Atn\LL1Analyzer.cs" />
+    <Compile Include="Atn\LookaheadEventInfo.cs" />
+    <Compile Include="Atn\LoopEndState.cs" />
+    <Compile Include="Atn\NotSetTransition.cs" />
+    <Compile Include="Atn\OrderedATNConfigSet.cs" />
+    <Compile Include="Atn\ParseInfo.cs" />
+    <Compile Include="Atn\ParserATNSimulator.cs" />
+    <Compile Include="Atn\PlusBlockStartState.cs" />
+    <Compile Include="Atn\PlusLoopbackState.cs" />
+    <Compile Include="Atn\PrecedencePredicateTransition.cs" />
+    <Compile Include="Atn\PredicateEvalInfo.cs" />
+    <Compile Include="Atn\PredicateTransition.cs" />
+    <Compile Include="Atn\PredictionContext.cs" />
+    <Compile Include="Atn\PredictionContextCache.cs" />
+    <Compile Include="Atn\PredictionMode.cs" />
+    <Compile Include="Atn\ProfilingATNSimulator.cs" />
+    <Compile Include="Atn\RangeTransition.cs" />
+    <Compile Include="Atn\RuleStartState.cs" />
+    <Compile Include="Atn\RuleStopState.cs" />
+    <Compile Include="Atn\RuleTransition.cs" />
+    <Compile Include="Atn\SemanticContext.cs" />
+    <Compile Include="Atn\SetTransition.cs" />
+    <Compile Include="Atn\SimulatorState.cs" />
+    <Compile Include="Atn\SingletonPredictionContext.cs" />
+    <Compile Include="Atn\StarBlockStartState.cs" />
+    <Compile Include="Atn\StarLoopbackState.cs" />
+    <Compile Include="Atn\StarLoopEntryState.cs" />
+    <Compile Include="Atn\StateType.cs" />
+    <Compile Include="Atn\TokensStartState.cs" />
+    <Compile Include="Atn\Transition.cs" />
+    <Compile Include="Atn\TransitionType.cs" />
+    <Compile Include="Atn\WildcardTransition.cs" />
+    <Compile Include="BailErrorStrategy.cs" />
+    <Compile Include="BaseErrorListener.cs" />
+    <Compile Include="BufferedTokenStream.cs" />
+    <Compile Include="CommonToken.cs" />
+    <Compile Include="CommonTokenFactory.cs" />
+    <Compile Include="CommonTokenStream.cs" />
+    <Compile Include="ConsoleErrorListener.cs" />
+    <Compile Include="DefaultErrorStrategy.cs" />
+    <Compile Include="Dependents.cs" />
+    <Compile Include="Dfa\AbstractEdgeMap`1.cs" />
+    <Compile Include="Dfa\ArrayEdgeMap`1.cs" />
+    <Compile Include="Dfa\DFA.cs" />
+    <Compile Include="Dfa\DFASerializer.cs" />
+    <Compile Include="Dfa\DFAState.cs" />
+    <Compile Include="Dfa\IEdgeMap`1.cs" />
+    <Compile Include="Dfa\LexerDFASerializer.cs" />
+    <Compile Include="Dfa\SingletonEdgeMap`1.cs" />
+    <Compile Include="Dfa\SparseEdgeMap`1.cs" />
+    <Compile Include="DiagnosticErrorListener.cs" />
+    <Compile Include="FailedPredicateException.cs" />
+    <Compile Include="IAntlrErrorListener`1.cs" />
+    <Compile Include="IAntlrErrorStrategy.cs" />
+    <Compile Include="ICharStream.cs" />
+    <Compile Include="IIntStream.cs" />
+    <Compile Include="InputMismatchException.cs" />
+    <Compile Include="InterpreterRuleContext.cs" />
+    <Compile Include="IParserErrorListener.cs" />
+    <Compile Include="IRecognizer.cs" />
+    <Compile Include="IToken.cs" />
+    <Compile Include="ITokenFactory.cs" />
+    <Compile Include="ITokenSource.cs" />
+    <Compile Include="ITokenStream.cs" />
+    <Compile Include="IWritableToken.cs" />
+    <Compile Include="Lexer.cs" />
+    <Compile Include="LexerInterpreter.cs" />
+    <Compile Include="LexerNoViableAltException.cs" />
+    <Compile Include="ListTokenSource.cs" />
+    <Compile Include="Misc\Args.cs" />
+    <None Include="Misc\Array2DHashSet`1.cs" />
+    <Compile Include="Misc\MurmurHash.cs" />
+    <Compile Include="Misc\NullableAttribute.cs" />
+    <None Include="Misc\DoubleKeyMap`3.cs" />
+    <Compile Include="Misc\IIntSet.cs" />
+    <Compile Include="Misc\Interval.cs" />
+    <Compile Include="Misc\IntervalSet.cs" />
+    <Compile Include="Misc\MultiMap`2.cs" />
+    <Compile Include="Misc\NotNullAttribute.cs" />
+    <None Include="Misc\OrderedHashSet`1.cs" />
+    <Compile Include="Misc\ParseCanceledException.cs" />
+    <Compile Include="Misc\RuleDependencyChecker.cs" />
+    <None Include="Misc\RuleDependencyProcessor.cs" />
+    <None Include="Misc\TestRig.cs" />
+    <Compile Include="Misc\Utils.cs" />
+    <Compile Include="NoViableAltException.cs" />
+    <Compile Include="Parser.cs" />
+    <Compile Include="ParserInterpreter.cs" />
+    <Compile Include="ParserRuleContext.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ProxyErrorListener`1.cs" />
+    <Compile Include="ProxyParserErrorListener.cs" />
+    <Compile Include="RecognitionException.cs" />
+    <Compile Include="RuleContext.cs" />
+    <Compile Include="RuleDependencyAttribute.cs" />
+    <Compile Include="RuleVersionAttribute.cs" />
+    <Compile Include="Sharpen\Arrays.cs" />
+    <Compile Include="Sharpen\AtomicReference`1.cs" />
+    <Compile Include="Sharpen\BitSet.cs" />
+    <Compile Include="Sharpen\Collections.cs" />
+    <Compile Include="Sharpen\Compat\CollectionDebuggerView`2.cs" />
+    <Compile Include="Sharpen\Compat\ConcurrentDictionary`2.cs" />
+    <Compile Include="Sharpen\Compat\Enumerable.cs" />
+    <Compile Include="Sharpen\Compat\ExtensionAttribute.cs" />
+    <Compile Include="Sharpen\Compat\Funcs.cs" />
+    <Compile Include="Sharpen\Compat\HashSet`1.cs" />
+    <Compile Include="Sharpen\Compat\IStructuralComparable.cs" />
+    <Compile Include="Sharpen\Compat\IStructuralEquatable.cs" />
+    <Compile Include="Sharpen\Compat\SplitOrderedList`2.cs" />
+    <Compile Include="Sharpen\Compat\Tuple.cs" />
+    <Compile Include="Sharpen\Compat\Tuples.cs" />
+    <Compile Include="Sharpen\DictionaryExtensions.cs" />
+    <Compile Include="Sharpen\ListExtensions.cs" />
+    <Compile Include="Sharpen\Runtime.cs" />
+    <Compile Include="Sharpen\SequenceEqualityComparer`1.cs" />
+    <Compile Include="TokenStreamRewriter.cs" />
+    <Compile Include="TokenTypes.cs" />
+    <Compile Include="Tree\AbstractParseTreeVisitor`1.cs" />
+    <Compile Include="Tree\ErrorNodeImpl.cs" />
+    <Compile Include="Tree\IErrorNode.cs" />
+    <Compile Include="Tree\IParseTree.cs" />
+    <Compile Include="Tree\IParseTreeListener.cs" />
+    <Compile Include="Tree\IParseTreeVisitor`1.cs" />
+    <Compile Include="Tree\IRuleNode.cs" />
+    <Compile Include="Tree\ISyntaxTree.cs" />
+    <Compile Include="Tree\ITerminalNode.cs" />
+    <Compile Include="Tree\ITree.cs" />
+    <Compile Include="Tree\ParseTreeProperty`1.cs" />
+    <Compile Include="Tree\ParseTreeWalker.cs" />
+    <Compile Include="Tree\Pattern\Chunk.cs" />
+    <Compile Include="Tree\Pattern\ParseTreeMatch.cs" />
+    <Compile Include="Tree\Pattern\ParseTreePattern.cs" />
+    <Compile Include="Tree\Pattern\ParseTreePatternMatcher.cs" />
+    <Compile Include="Tree\Pattern\RuleTagToken.cs" />
+    <Compile Include="Tree\Pattern\TagChunk.cs" />
+    <Compile Include="Tree\Pattern\TextChunk.cs" />
+    <Compile Include="Tree\Pattern\TokenTagToken.cs" />
+    <Compile Include="Tree\TerminalNodeImpl.cs" />
+    <Compile Include="Tree\Trees.cs" />
+    <Compile Include="Tree\Xpath\XPath.cs" />
+    <Compile Include="Tree\Xpath\XPathElement.cs" />
+    <Compile Include="Tree\Xpath\XPathLexerErrorListener.cs" />
+    <Compile Include="Tree\Xpath\XPathRuleAnywhereElement.cs" />
+    <Compile Include="Tree\Xpath\XPathRuleElement.cs" />
+    <Compile Include="Tree\Xpath\XPathTokenAnywhereElement.cs" />
+    <Compile Include="Tree\Xpath\XPathTokenElement.cs" />
+    <Compile Include="Tree\Xpath\XPathWildcardAnywhereElement.cs" />
+    <Compile Include="Tree\Xpath\XPathWildcardElement.cs" />
+    <Compile Include="UnbufferedCharStream.cs" />
+    <Compile Include="UnbufferedTokenStream.cs" />
+    <None Include="packages.Antlr4.Runtime.net20.config" />
+    <Compile Include="Tree\Xpath\XPathLexer.cs" />
+    <None Include="Tree\Xpath\XPathLexer.g4">
+      <Generator>MSBuild:Compile</Generator>
+      <CustomToolNamespace>Antlr4.Runtime.Tree.Xpath</CustomToolNamespace>
+    </None>
+    <Compile Include="Recognizer.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\build\KeyReporting.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Antlr4.4.3.0\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.3.0\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.3.0\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.3.0\build\Antlr4.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.3.0\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.3.0\build\Antlr4.targets')" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/runtime/CSharp/Antlr4.Runtime/Atn/ATN.cs b/runtime/CSharp/Antlr4.Runtime/Atn/ATN.cs
@@ -102,10 +102,10 @@ public class ATN
         private readonly ConcurrentDictionary<PredictionContext, PredictionContext> contextCache = new ConcurrentDictionary<PredictionContext, PredictionContext>();
 
         [NotNull]
-        public DFA[] decisionToDFA = new DFA[0];
+		public DFA[] decisionToDFA = new DFA[0];
 
         [NotNull]
-        public DFA[] modeToDFA = new DFA[0];
+		public DFA[] modeToDFA = new DFA[0];
 
         protected internal readonly ConcurrentDictionary<int, int> LL1Table = new ConcurrentDictionary<int, int>();
 
@@ -145,15 +145,6 @@ public virtual PredictionContext GetCachedContext(PredictionContext context)
             return PredictionContext.GetCachedContext(context, contextCache, new PredictionContext.IdentityHashMap());
         }
 
-        public DFA[] DecisionToDfa
-        {
-            get
-            {
-                System.Diagnostics.Debug.Assert(decisionToDFA != null && decisionToDFA.Length == decisionToState.Count);
-                return decisionToDFA;
-            }
-        }
-
         /// <summary>
         /// Compute the set of valid tokens that can occur starting in state
         /// <paramref name="s"/>
@@ -308,7 +299,7 @@ public virtual IntervalSet GetExpectedTokens(int stateNumber, RuleContext contex
                 following = NextTokens(rt.followState);
                 expected.AddAll(following);
                 expected.Remove(TokenConstants.Epsilon);
-                ctx = ctx.parent;
+                ctx = ctx.Parent;
             }
             if (following.Contains(TokenConstants.Epsilon))
             {

diff --git a/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs b/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs
@@ -305,7 +305,7 @@ public virtual Antlr4.Runtime.Atn.ATNConfig AppendContext(PredictionContext cont
 
         public virtual bool Contains(Antlr4.Runtime.Atn.ATNConfig subconfig)
         {
-            if (this.State.stateNumber != subconfig.State.stateNumber || this.Alt != subconfig.Alt || !this.SemanticContext.Equals(subconfig.SemanticContext))
+            if (this.state.stateNumber != subconfig.State.stateNumber || this.Alt != subconfig.Alt || !this.SemanticContext.Equals(subconfig.SemanticContext))
             {
                 return false;
             }