From b4ceb2022a1484af13df30604de342772a4d935a Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Mon, 28 Dec 2020 16:01:38 +0300 Subject: [PATCH] Simplify structure of csharp runtime files, remove not used .sln file, use PackageIcon property instead of outdated PackageIcon in Antlr4.csproj --- .../test/runtime/csharp/BaseCSharpTest.java | 2 +- runtime/CSharp/Antlr.png | Bin 0 -> 1603 bytes .../Antlr4.Runtime.csproj => Antlr4.csproj} | 10 ++++-- runtime/CSharp/{runtime => }/Antlr4.snk | Bin .../Antlr4.Runtime => }/AntlrFileStream.cs | 0 .../Antlr4.Runtime => }/AntlrInputStream.cs | 0 .../CSharp/Antlr4.Runtime => }/Atn/ATN.cs | 0 .../Antlr4.Runtime => }/Atn/ATNConfig.cs | 0 .../Antlr4.Runtime => }/Atn/ATNConfigSet.cs | 0 .../Atn/ATNDeserializationOptions.cs | 0 .../Atn/ATNDeserializer.cs | 0 .../Antlr4.Runtime => }/Atn/ATNSimulator.cs | 0 .../Antlr4.Runtime => }/Atn/ATNState.cs | 0 .../CSharp/Antlr4.Runtime => }/Atn/ATNType.cs | 0 .../Atn/AbstractPredicateTransition.cs | 0 .../Atn/ActionTransition.cs | 0 .../Antlr4.Runtime => }/Atn/AmbiguityInfo.cs | 0 .../Atn/ArrayPredictionContext.cs | 0 .../Antlr4.Runtime => }/Atn/AtomTransition.cs | 0 .../Atn/BasicBlockStartState.cs | 0 .../Antlr4.Runtime => }/Atn/BasicState.cs | 0 .../Antlr4.Runtime => }/Atn/BlockEndState.cs | 0 .../Atn/BlockStartState.cs | 0 .../Antlr4.Runtime => }/Atn/ConflictInfo.cs | 0 .../Atn/ContextSensitivityInfo.cs | 0 .../Atn/DecisionEventInfo.cs | 0 .../Antlr4.Runtime => }/Atn/DecisionInfo.cs | 0 .../Antlr4.Runtime => }/Atn/DecisionState.cs | 0 .../Atn/EmptyPredictionContext.cs | 0 .../Atn/EpsilonTransition.cs | 0 .../Antlr4.Runtime => }/Atn/ErrorInfo.cs | 0 .../Antlr4.Runtime => }/Atn/ILexerAction.cs | 0 .../Antlr4.Runtime => }/Atn/LL1Analyzer.cs | 0 .../Antlr4.Runtime => }/Atn/LexerATNConfig.cs | 0 .../Atn/LexerATNSimulator.cs | 0 .../Atn/LexerActionExecutor.cs | 0 .../Atn/LexerActionType.cs | 0 .../Atn/LexerChannelAction.cs | 0 .../Atn/LexerCustomAction.cs | 0 .../Atn/LexerIndexedCustomAction.cs | 0 .../Atn/LexerModeAction.cs | 0 .../Atn/LexerMoreAction.cs | 0 .../Atn/LexerPopModeAction.cs | 0 .../Atn/LexerPushModeAction.cs | 0 .../Atn/LexerSkipAction.cs | 0 .../Atn/LexerTypeAction.cs | 0 .../Atn/LookaheadEventInfo.cs | 0 .../Antlr4.Runtime => }/Atn/LoopEndState.cs | 0 .../Antlr4.Runtime => }/Atn/MergeCache.cs | 0 .../Atn/NotSetTransition.cs | 0 .../Antlr4.Runtime => }/Atn/ParseInfo.cs | 0 .../Atn/ParserATNSimulator.cs | 0 .../Atn/PlusBlockStartState.cs | 0 .../Atn/PlusLoopbackState.cs | 0 .../Atn/PrecedencePredicateTransition.cs | 0 .../Atn/PredicateEvalInfo.cs | 0 .../Atn/PredicateTransition.cs | 0 .../Atn/PredictionContext.cs | 0 .../Atn/PredictionContextCache.cs | 0 .../Antlr4.Runtime => }/Atn/PredictionMode.cs | 0 .../Atn/ProfilingATNSimulator.cs | 0 .../Atn/RangeTransition.cs | 0 .../Antlr4.Runtime => }/Atn/RuleStartState.cs | 0 .../Antlr4.Runtime => }/Atn/RuleStopState.cs | 0 .../Antlr4.Runtime => }/Atn/RuleTransition.cs | 0 .../Atn/SemanticContext.cs | 0 .../Antlr4.Runtime => }/Atn/SetTransition.cs | 0 .../Antlr4.Runtime => }/Atn/SimulatorState.cs | 0 .../Atn/SingletonPredictionContext.cs | 0 .../Atn/StarBlockStartState.cs | 0 .../Atn/StarLoopEntryState.cs | 0 .../Atn/StarLoopbackState.cs | 0 .../Antlr4.Runtime => }/Atn/StateType.cs | 0 .../Atn/TokensStartState.cs | 0 .../Antlr4.Runtime => }/Atn/Transition.cs | 0 .../Antlr4.Runtime => }/Atn/TransitionType.cs | 0 .../Atn/WildcardTransition.cs | 0 .../Antlr4.Runtime => }/BailErrorStrategy.cs | 0 .../Antlr4.Runtime => }/BaseErrorListener.cs | 0 .../BufferedTokenStream.cs | 0 .../CSharp/Antlr4.Runtime => }/CharStreams.cs | 0 .../CSharp/Antlr4.Runtime => }/CommonToken.cs | 0 .../Antlr4.Runtime => }/CommonTokenFactory.cs | 0 .../Antlr4.Runtime => }/CommonTokenStream.cs | 0 .../ConsoleErrorListener.cs | 0 .../DefaultErrorStrategy.cs | 0 .../CSharp/Antlr4.Runtime => }/Dependents.cs | 0 .../Dfa/AbstractEdgeMap.cs | 0 .../Dfa/AcceptStateInfo.cs | 0 .../Antlr4.Runtime => }/Dfa/ArrayEdgeMap.cs | 0 .../CSharp/Antlr4.Runtime => }/Dfa/DFA.cs | 0 .../Antlr4.Runtime => }/Dfa/DFASerializer.cs | 0 .../Antlr4.Runtime => }/Dfa/DFAState.cs | 0 .../Antlr4.Runtime => }/Dfa/EmptyEdgeMap.cs | 0 .../Antlr4.Runtime => }/Dfa/IEdgeMap.cs | 0 .../Dfa/LexerDFASerializer.cs | 0 .../Dfa/SingletonEdgeMap.cs | 0 .../Antlr4.Runtime => }/Dfa/SparseEdgeMap.cs | 0 .../DiagnosticErrorListener.cs | 0 .../FailedPredicateException.cs | 0 .../IAntlrErrorListener.cs | 0 .../IAntlrErrorStrategy.cs | 0 .../CSharp/Antlr4.Runtime => }/ICharStream.cs | 0 .../CSharp/Antlr4.Runtime => }/IIntStream.cs | 0 .../IParserErrorListener.cs | 0 .../CSharp/Antlr4.Runtime => }/IRecognizer.cs | 0 .../CSharp/Antlr4.Runtime => }/IToken.cs | 0 .../Antlr4.Runtime => }/ITokenFactory.cs | 0 .../Antlr4.Runtime => }/ITokenSource.cs | 0 .../Antlr4.Runtime => }/ITokenStream.cs | 0 .../CSharp/Antlr4.Runtime => }/IVocabulary.cs | 0 .../Antlr4.Runtime => }/IWritableToken.cs | 0 .../InputMismatchException.cs | 0 .../InterpreterRuleContext.cs | 0 .../CSharp/Antlr4.Runtime => }/Lexer.cs | 0 .../Antlr4.Runtime => }/LexerInterpreter.cs | 0 .../LexerNoViableAltException.cs | 0 .../Antlr4.Runtime => }/ListTokenSource.cs | 0 .../CSharp/Antlr4.Runtime => }/Misc/Args.cs | 0 .../Antlr4.Runtime => }/Misc/ArrayList.cs | 0 .../Antlr4.Runtime => }/Misc/IIntSet.cs | 0 .../Antlr4.Runtime => }/Misc/Interval.cs | 0 .../Antlr4.Runtime => }/Misc/IntervalSet.cs | 0 .../Antlr4.Runtime => }/Misc/MultiMap.cs | 0 .../Antlr4.Runtime => }/Misc/MurmurHash.cs | 0 .../Misc/NotNullAttribute.cs | 0 .../Misc/NullableAttribute.cs | 0 .../CSharp/Antlr4.Runtime => }/Misc/Pair.cs | 0 .../Misc/ParseCanceledException.cs | 0 .../Misc/RuleDependencyChecker.cs | 0 .../CSharp/Antlr4.Runtime => }/Misc/Utils.cs | 0 .../NoViableAltException.cs | 0 .../CSharp/Antlr4.Runtime => }/Parser.cs | 0 .../Antlr4.Runtime => }/ParserInterpreter.cs | 0 .../Antlr4.Runtime => }/ParserRuleContext.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Antlr4.Runtime => }/ProxyErrorListener.cs | 0 .../ProxyParserErrorListener.cs | 0 .../RecognitionException.cs | 0 .../CSharp/Antlr4.Runtime => }/Recognizer.cs | 0 .../CSharp/Antlr4.Runtime => }/RuleContext.cs | 0 .../RuleDependencyAttribute.cs | 0 .../RuleVersionAttribute.cs | 0 .../Antlr4.Runtime => }/Sharpen/Arrays.cs | 0 .../Sharpen/AtomicReference.cs | 0 .../Antlr4.Runtime => }/Sharpen/BitSet.cs | 0 .../Sharpen/Collections.cs | 0 .../Sharpen/DictionaryExtensions.cs | 0 .../Sharpen/ListExtensions.cs | 0 .../Antlr4.Runtime => }/Sharpen/Runtime.cs | 0 .../Sharpen/SequenceEqualityComparer.cs | 0 .../TokenStreamRewriter.cs | 0 .../CSharp/Antlr4.Runtime => }/TokenTypes.cs | 0 .../Tree/AbstractParseTreeVisitor.cs | 0 .../Antlr4.Runtime => }/Tree/ErrorNodeImpl.cs | 0 .../Antlr4.Runtime => }/Tree/IErrorNode.cs | 0 .../Antlr4.Runtime => }/Tree/IParseTree.cs | 0 .../Tree/IParseTreeListener.cs | 0 .../Tree/IParseTreeVisitor.cs | 0 .../Antlr4.Runtime => }/Tree/IRuleNode.cs | 0 .../Antlr4.Runtime => }/Tree/ISyntaxTree.cs | 0 .../Antlr4.Runtime => }/Tree/ITerminalNode.cs | 0 .../CSharp/Antlr4.Runtime => }/Tree/ITree.cs | 0 .../Tree/ParseTreeProperty.cs | 0 .../Tree/ParseTreeWalker.cs | 0 .../Antlr4.Runtime => }/Tree/Pattern/Chunk.cs | 0 .../Tree/Pattern/ParseTreeMatch.cs | 0 .../Tree/Pattern/ParseTreePattern.cs | 0 .../Tree/Pattern/ParseTreePatternMatcher.cs | 0 .../Tree/Pattern/RuleTagToken.cs | 0 .../Tree/Pattern/TagChunk.cs | 0 .../Tree/Pattern/TextChunk.cs | 0 .../Tree/Pattern/TokenTagToken.cs | 0 .../Tree/TerminalNodeImpl.cs | 0 .../CSharp/Antlr4.Runtime => }/Tree/Trees.cs | 0 .../Antlr4.Runtime => }/Tree/Xpath/XPath.cs | 0 .../Tree/Xpath/XPathElement.cs | 0 .../Tree/Xpath/XPathLexer.cs | 0 .../Tree/Xpath/XPathLexer.g4 | 0 .../Tree/Xpath/XPathLexer.tokens | 0 .../Tree/Xpath/XPathLexerErrorListener.cs | 0 .../Tree/Xpath/XPathRuleAnywhereElement.cs | 0 .../Tree/Xpath/XPathRuleElement.cs | 0 .../Tree/Xpath/XPathTokenAnywhereElement.cs | 0 .../Tree/Xpath/XPathTokenElement.cs | 0 .../Xpath/XPathWildcardAnywhereElement.cs | 0 .../Tree/Xpath/XPathWildcardElement.cs | 0 .../UnbufferedCharStream.cs | 0 .../UnbufferedTokenStream.cs | 0 .../CSharp/Antlr4.Runtime => }/Vocabulary.cs | 0 runtime/CSharp/runtime/CSharp/Antlr4.sln | 34 ------------------ tool-testsuite/pom.xml | 1 - 192 files changed, 8 insertions(+), 39 deletions(-) create mode 100644 runtime/CSharp/Antlr.png rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj => Antlr4.csproj} (91%) rename runtime/CSharp/{runtime => }/Antlr4.snk (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/AntlrFileStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/AntlrInputStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATN.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNConfig.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNConfigSet.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNDeserializationOptions.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNDeserializer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNSimulator.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ATNType.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/AbstractPredicateTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ActionTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/AmbiguityInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ArrayPredictionContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/AtomTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/BasicBlockStartState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/BasicState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/BlockEndState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/BlockStartState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ConflictInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ContextSensitivityInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/DecisionEventInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/DecisionInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/DecisionState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/EmptyPredictionContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/EpsilonTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ErrorInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ILexerAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LL1Analyzer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerATNConfig.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerATNSimulator.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerActionExecutor.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerActionType.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerChannelAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerCustomAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerIndexedCustomAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerModeAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerMoreAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerPopModeAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerPushModeAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerSkipAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LexerTypeAction.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LookaheadEventInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/LoopEndState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/MergeCache.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/NotSetTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ParseInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ParserATNSimulator.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PlusBlockStartState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PlusLoopbackState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PrecedencePredicateTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PredicateEvalInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PredicateTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PredictionContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PredictionContextCache.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/PredictionMode.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/ProfilingATNSimulator.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/RangeTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/RuleStartState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/RuleStopState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/RuleTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/SemanticContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/SetTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/SimulatorState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/SingletonPredictionContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/StarBlockStartState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/StarLoopEntryState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/StarLoopbackState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/StateType.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/TokensStartState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/Transition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/TransitionType.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Atn/WildcardTransition.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/BailErrorStrategy.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/BaseErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/BufferedTokenStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/CharStreams.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/CommonToken.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/CommonTokenFactory.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/CommonTokenStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ConsoleErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/DefaultErrorStrategy.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dependents.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/AbstractEdgeMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/AcceptStateInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/ArrayEdgeMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/DFA.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/DFASerializer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/DFAState.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/EmptyEdgeMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/IEdgeMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/LexerDFASerializer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/SingletonEdgeMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Dfa/SparseEdgeMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/DiagnosticErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/FailedPredicateException.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IAntlrErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IAntlrErrorStrategy.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ICharStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IIntStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IParserErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IRecognizer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IToken.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ITokenFactory.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ITokenSource.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ITokenStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IVocabulary.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/IWritableToken.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/InputMismatchException.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/InterpreterRuleContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Lexer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/LexerInterpreter.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/LexerNoViableAltException.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ListTokenSource.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/Args.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/ArrayList.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/IIntSet.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/Interval.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/IntervalSet.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/MultiMap.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/MurmurHash.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/NotNullAttribute.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/NullableAttribute.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/Pair.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/ParseCanceledException.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/RuleDependencyChecker.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Misc/Utils.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/NoViableAltException.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Parser.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ParserInterpreter.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ParserRuleContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Properties/AssemblyInfo.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ProxyErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/ProxyParserErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/RecognitionException.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Recognizer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/RuleContext.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/RuleDependencyAttribute.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/RuleVersionAttribute.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/Arrays.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/AtomicReference.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/BitSet.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/Collections.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/DictionaryExtensions.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/ListExtensions.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/Runtime.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Sharpen/SequenceEqualityComparer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/TokenStreamRewriter.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/TokenTypes.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/AbstractParseTreeVisitor.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/ErrorNodeImpl.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/IErrorNode.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/IParseTree.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/IParseTreeListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/IParseTreeVisitor.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/IRuleNode.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/ISyntaxTree.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/ITerminalNode.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/ITree.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/ParseTreeProperty.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/ParseTreeWalker.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/Chunk.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/ParseTreeMatch.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/ParseTreePattern.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/ParseTreePatternMatcher.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/RuleTagToken.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/TagChunk.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/TextChunk.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Pattern/TokenTagToken.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/TerminalNodeImpl.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Trees.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPath.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathLexer.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathLexer.g4 (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathLexer.tokens (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathLexerErrorListener.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathRuleAnywhereElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathRuleElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathTokenAnywhereElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathTokenElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathWildcardAnywhereElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Tree/Xpath/XPathWildcardElement.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/UnbufferedCharStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/UnbufferedTokenStream.cs (100%) rename runtime/CSharp/{runtime/CSharp/Antlr4.Runtime => }/Vocabulary.cs (100%) delete mode 100644 runtime/CSharp/runtime/CSharp/Antlr4.sln diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java index bc356fd8f..79b87f4d0 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/BaseCSharpTest.java @@ -324,7 +324,7 @@ public class BaseCSharpTest implements RuntimeTestSupport { // find runtime package final ClassLoader loader = Thread.currentThread().getContextClassLoader(); - final URL runtimeProj = loader.getResource("CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj"); + final URL runtimeProj = loader.getResource("CSharp/Antlr4.csproj"); if (runtimeProj == null) { throw new RuntimeException("C# runtime project file not found!"); } diff --git a/runtime/CSharp/Antlr.png b/runtime/CSharp/Antlr.png new file mode 100644 index 0000000000000000000000000000000000000000..01f16f6a7f977e3c3637d22fa8ede242d6a4f5a1 GIT binary patch literal 1603 zcmaJ>X;2eq7*2`xLKG2Nh=}U~(oP|}8wi+%fC)(?E%69w;sq?pLLwv^cNemNwKeIC zIFdm}Y>POh6_r{X(JI=J2vkAF;(-S`R<7}=t+qftDhg;f2-qLRo!R}q_nqf?-g9=# z(#4BBrt+q8I2;dUf=tbxbJ;gw@&jLE{XIh>d{#)9dxa2iO*GmU03*jrl<0!F{+ATSJ} zv&7)*q_nD~Ks-U>fRGP|>EK8Nh>YMP5wIvi6bcAn1cnd+1V@D-Fe;2fVFVa?KsFkw z&p_2O#YimH5`zYswxAGXwOaYsa6Un1LWoEtf?xq85QMRaFe=YXV@#Nt3LI6C;gpUv zT4*C-23(3*I*~(*K{nIZC73K@vSwDy;2D3m2A9j^A3RJ1y4mFv^&=jr4-{kwh z!c=me1&7o)MdXk=c5oSiu22>4V5<8ocgV6w20WjJZf#q|o3Fag6wqsH-b2_IK)gsUGvmxyt>5St9-8ts2Z zJ?dij$8{ZBT-F#{eca6MJIOBgj^N6x9FAL!QYJ}eem$sJuiv@M`_(_EGK-M(#zMxg zqC~9-Z3+B%OCeLD{zU-pDSXo9TYT)ZUAKphmKbEbn=RhRKJTl64&Rx@&3BL&b2dg* z-g?$iu%fs5QXSEC>RCJ0BdRY*Su)h7PH&vdc>8m$cKd_X?rSDK?Ed7XV^4FMb6N_w zc~*3%-P&-o_1lO(RZJN-HM{k2S_m^^gU58@T7PaImk~UVE3)-6Yv$h(U^CnOS26)k z&WgZ0FB(F+KYSH`xnQnaxvdOz=YQVp{Gv9%HxWORML_vd#hTC{HQW zpAfy@Q9kJzZ(994;jZo??2!LGQx}sOlwJ4L^v&0fmRvuH)h$?gWzbT)A}flzZ?WpO&XZOt|#*Y@|f(^P^{gE$cz<<6@(G z#dbI(G&61+uSJJ;*PQWr8q?yhOh2(IyOm1W-m|}@stD=KupO7syX0q{CyO_EO7g2B z_a0e3luF)R2b5|W`=_3|bTTpaDy2!8wc$O#mkEwn-yH4dQNfV9rRV&^iPcM(8-K3s zbFVqswe2HbYLl_jQsckufZXds$CR#ytv|HW(L38J+m1Oeh7Z1MJiZQAaP#IZ%6)&Z zvEX)bU&eyvZD)g@L^&k`d1rBc_RnyEO}}CEXU(5#KaewK;l6 zlC+~?Mqgq0Zrpj{9S485`N;j%j+|=siGhRl=rm9JB*Cic_PVuRw*mRyr^SjJ2mY=V z2x4DsmCx^TJF%>?Oi?lCcv5r&^<8a+L7S+5F)|K+bvP04|+rRP5Z!7=+ literal 0 HcmV?d00001 diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj b/runtime/CSharp/Antlr4.csproj similarity index 91% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj rename to runtime/CSharp/Antlr4.csproj index 0da3e7abe..97e9dcef5 100644 --- a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj +++ b/runtime/CSharp/Antlr4.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591;CS1574;CS1580 true Antlr4.Runtime.Standard - ../../Antlr4.snk + Antlr4.snk true true Antlr4.Runtime.Standard @@ -19,8 +19,7 @@ true BSD-3-Clause https://github.com/antlr/antlr4 - - https://raw.github.com/antlr/website-antlr4/master/images/icons/antlr.png + Antlr.png https://github.com/antlr/antlr4/releases antlr parsing grammar false @@ -44,4 +43,9 @@ true lib\Release + + + PreserveNewest + + diff --git a/runtime/CSharp/runtime/Antlr4.snk b/runtime/CSharp/Antlr4.snk similarity index 100% rename from runtime/CSharp/runtime/Antlr4.snk rename to runtime/CSharp/Antlr4.snk diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs b/runtime/CSharp/AntlrFileStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs rename to runtime/CSharp/AntlrFileStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/AntlrInputStream.cs b/runtime/CSharp/AntlrInputStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/AntlrInputStream.cs rename to runtime/CSharp/AntlrInputStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATN.cs b/runtime/CSharp/Atn/ATN.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATN.cs rename to runtime/CSharp/Atn/ATN.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs b/runtime/CSharp/Atn/ATNConfig.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs rename to runtime/CSharp/Atn/ATNConfig.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfigSet.cs b/runtime/CSharp/Atn/ATNConfigSet.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfigSet.cs rename to runtime/CSharp/Atn/ATNConfigSet.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNDeserializationOptions.cs b/runtime/CSharp/Atn/ATNDeserializationOptions.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNDeserializationOptions.cs rename to runtime/CSharp/Atn/ATNDeserializationOptions.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNDeserializer.cs b/runtime/CSharp/Atn/ATNDeserializer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNDeserializer.cs rename to runtime/CSharp/Atn/ATNDeserializer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNSimulator.cs b/runtime/CSharp/Atn/ATNSimulator.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNSimulator.cs rename to runtime/CSharp/Atn/ATNSimulator.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNState.cs b/runtime/CSharp/Atn/ATNState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNState.cs rename to runtime/CSharp/Atn/ATNState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNType.cs b/runtime/CSharp/Atn/ATNType.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ATNType.cs rename to runtime/CSharp/Atn/ATNType.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/AbstractPredicateTransition.cs b/runtime/CSharp/Atn/AbstractPredicateTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/AbstractPredicateTransition.cs rename to runtime/CSharp/Atn/AbstractPredicateTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ActionTransition.cs b/runtime/CSharp/Atn/ActionTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ActionTransition.cs rename to runtime/CSharp/Atn/ActionTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/AmbiguityInfo.cs b/runtime/CSharp/Atn/AmbiguityInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/AmbiguityInfo.cs rename to runtime/CSharp/Atn/AmbiguityInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ArrayPredictionContext.cs b/runtime/CSharp/Atn/ArrayPredictionContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ArrayPredictionContext.cs rename to runtime/CSharp/Atn/ArrayPredictionContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/AtomTransition.cs b/runtime/CSharp/Atn/AtomTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/AtomTransition.cs rename to runtime/CSharp/Atn/AtomTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BasicBlockStartState.cs b/runtime/CSharp/Atn/BasicBlockStartState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BasicBlockStartState.cs rename to runtime/CSharp/Atn/BasicBlockStartState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BasicState.cs b/runtime/CSharp/Atn/BasicState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BasicState.cs rename to runtime/CSharp/Atn/BasicState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BlockEndState.cs b/runtime/CSharp/Atn/BlockEndState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BlockEndState.cs rename to runtime/CSharp/Atn/BlockEndState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BlockStartState.cs b/runtime/CSharp/Atn/BlockStartState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/BlockStartState.cs rename to runtime/CSharp/Atn/BlockStartState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ConflictInfo.cs b/runtime/CSharp/Atn/ConflictInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ConflictInfo.cs rename to runtime/CSharp/Atn/ConflictInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ContextSensitivityInfo.cs b/runtime/CSharp/Atn/ContextSensitivityInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ContextSensitivityInfo.cs rename to runtime/CSharp/Atn/ContextSensitivityInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/DecisionEventInfo.cs b/runtime/CSharp/Atn/DecisionEventInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/DecisionEventInfo.cs rename to runtime/CSharp/Atn/DecisionEventInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/DecisionInfo.cs b/runtime/CSharp/Atn/DecisionInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/DecisionInfo.cs rename to runtime/CSharp/Atn/DecisionInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/DecisionState.cs b/runtime/CSharp/Atn/DecisionState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/DecisionState.cs rename to runtime/CSharp/Atn/DecisionState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/EmptyPredictionContext.cs b/runtime/CSharp/Atn/EmptyPredictionContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/EmptyPredictionContext.cs rename to runtime/CSharp/Atn/EmptyPredictionContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/EpsilonTransition.cs b/runtime/CSharp/Atn/EpsilonTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/EpsilonTransition.cs rename to runtime/CSharp/Atn/EpsilonTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ErrorInfo.cs b/runtime/CSharp/Atn/ErrorInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ErrorInfo.cs rename to runtime/CSharp/Atn/ErrorInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ILexerAction.cs b/runtime/CSharp/Atn/ILexerAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ILexerAction.cs rename to runtime/CSharp/Atn/ILexerAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LL1Analyzer.cs b/runtime/CSharp/Atn/LL1Analyzer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LL1Analyzer.cs rename to runtime/CSharp/Atn/LL1Analyzer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerATNConfig.cs b/runtime/CSharp/Atn/LexerATNConfig.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerATNConfig.cs rename to runtime/CSharp/Atn/LexerATNConfig.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerATNSimulator.cs b/runtime/CSharp/Atn/LexerATNSimulator.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerATNSimulator.cs rename to runtime/CSharp/Atn/LexerATNSimulator.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerActionExecutor.cs b/runtime/CSharp/Atn/LexerActionExecutor.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerActionExecutor.cs rename to runtime/CSharp/Atn/LexerActionExecutor.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerActionType.cs b/runtime/CSharp/Atn/LexerActionType.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerActionType.cs rename to runtime/CSharp/Atn/LexerActionType.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerChannelAction.cs b/runtime/CSharp/Atn/LexerChannelAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerChannelAction.cs rename to runtime/CSharp/Atn/LexerChannelAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerCustomAction.cs b/runtime/CSharp/Atn/LexerCustomAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerCustomAction.cs rename to runtime/CSharp/Atn/LexerCustomAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerIndexedCustomAction.cs b/runtime/CSharp/Atn/LexerIndexedCustomAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerIndexedCustomAction.cs rename to runtime/CSharp/Atn/LexerIndexedCustomAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerModeAction.cs b/runtime/CSharp/Atn/LexerModeAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerModeAction.cs rename to runtime/CSharp/Atn/LexerModeAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerMoreAction.cs b/runtime/CSharp/Atn/LexerMoreAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerMoreAction.cs rename to runtime/CSharp/Atn/LexerMoreAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerPopModeAction.cs b/runtime/CSharp/Atn/LexerPopModeAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerPopModeAction.cs rename to runtime/CSharp/Atn/LexerPopModeAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerPushModeAction.cs b/runtime/CSharp/Atn/LexerPushModeAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerPushModeAction.cs rename to runtime/CSharp/Atn/LexerPushModeAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerSkipAction.cs b/runtime/CSharp/Atn/LexerSkipAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerSkipAction.cs rename to runtime/CSharp/Atn/LexerSkipAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerTypeAction.cs b/runtime/CSharp/Atn/LexerTypeAction.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LexerTypeAction.cs rename to runtime/CSharp/Atn/LexerTypeAction.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LookaheadEventInfo.cs b/runtime/CSharp/Atn/LookaheadEventInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LookaheadEventInfo.cs rename to runtime/CSharp/Atn/LookaheadEventInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LoopEndState.cs b/runtime/CSharp/Atn/LoopEndState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/LoopEndState.cs rename to runtime/CSharp/Atn/LoopEndState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/MergeCache.cs b/runtime/CSharp/Atn/MergeCache.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/MergeCache.cs rename to runtime/CSharp/Atn/MergeCache.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/NotSetTransition.cs b/runtime/CSharp/Atn/NotSetTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/NotSetTransition.cs rename to runtime/CSharp/Atn/NotSetTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ParseInfo.cs b/runtime/CSharp/Atn/ParseInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ParseInfo.cs rename to runtime/CSharp/Atn/ParseInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ParserATNSimulator.cs b/runtime/CSharp/Atn/ParserATNSimulator.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ParserATNSimulator.cs rename to runtime/CSharp/Atn/ParserATNSimulator.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PlusBlockStartState.cs b/runtime/CSharp/Atn/PlusBlockStartState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PlusBlockStartState.cs rename to runtime/CSharp/Atn/PlusBlockStartState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PlusLoopbackState.cs b/runtime/CSharp/Atn/PlusLoopbackState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PlusLoopbackState.cs rename to runtime/CSharp/Atn/PlusLoopbackState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PrecedencePredicateTransition.cs b/runtime/CSharp/Atn/PrecedencePredicateTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PrecedencePredicateTransition.cs rename to runtime/CSharp/Atn/PrecedencePredicateTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredicateEvalInfo.cs b/runtime/CSharp/Atn/PredicateEvalInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredicateEvalInfo.cs rename to runtime/CSharp/Atn/PredicateEvalInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredicateTransition.cs b/runtime/CSharp/Atn/PredicateTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredicateTransition.cs rename to runtime/CSharp/Atn/PredicateTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredictionContext.cs b/runtime/CSharp/Atn/PredictionContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredictionContext.cs rename to runtime/CSharp/Atn/PredictionContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredictionContextCache.cs b/runtime/CSharp/Atn/PredictionContextCache.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredictionContextCache.cs rename to runtime/CSharp/Atn/PredictionContextCache.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredictionMode.cs b/runtime/CSharp/Atn/PredictionMode.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/PredictionMode.cs rename to runtime/CSharp/Atn/PredictionMode.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ProfilingATNSimulator.cs b/runtime/CSharp/Atn/ProfilingATNSimulator.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/ProfilingATNSimulator.cs rename to runtime/CSharp/Atn/ProfilingATNSimulator.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RangeTransition.cs b/runtime/CSharp/Atn/RangeTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RangeTransition.cs rename to runtime/CSharp/Atn/RangeTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RuleStartState.cs b/runtime/CSharp/Atn/RuleStartState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RuleStartState.cs rename to runtime/CSharp/Atn/RuleStartState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RuleStopState.cs b/runtime/CSharp/Atn/RuleStopState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RuleStopState.cs rename to runtime/CSharp/Atn/RuleStopState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RuleTransition.cs b/runtime/CSharp/Atn/RuleTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/RuleTransition.cs rename to runtime/CSharp/Atn/RuleTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs b/runtime/CSharp/Atn/SemanticContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs rename to runtime/CSharp/Atn/SemanticContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SetTransition.cs b/runtime/CSharp/Atn/SetTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SetTransition.cs rename to runtime/CSharp/Atn/SetTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SimulatorState.cs b/runtime/CSharp/Atn/SimulatorState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SimulatorState.cs rename to runtime/CSharp/Atn/SimulatorState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SingletonPredictionContext.cs b/runtime/CSharp/Atn/SingletonPredictionContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/SingletonPredictionContext.cs rename to runtime/CSharp/Atn/SingletonPredictionContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StarBlockStartState.cs b/runtime/CSharp/Atn/StarBlockStartState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StarBlockStartState.cs rename to runtime/CSharp/Atn/StarBlockStartState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StarLoopEntryState.cs b/runtime/CSharp/Atn/StarLoopEntryState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StarLoopEntryState.cs rename to runtime/CSharp/Atn/StarLoopEntryState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StarLoopbackState.cs b/runtime/CSharp/Atn/StarLoopbackState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StarLoopbackState.cs rename to runtime/CSharp/Atn/StarLoopbackState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StateType.cs b/runtime/CSharp/Atn/StateType.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/StateType.cs rename to runtime/CSharp/Atn/StateType.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/TokensStartState.cs b/runtime/CSharp/Atn/TokensStartState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/TokensStartState.cs rename to runtime/CSharp/Atn/TokensStartState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/Transition.cs b/runtime/CSharp/Atn/Transition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/Transition.cs rename to runtime/CSharp/Atn/Transition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/TransitionType.cs b/runtime/CSharp/Atn/TransitionType.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/TransitionType.cs rename to runtime/CSharp/Atn/TransitionType.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/WildcardTransition.cs b/runtime/CSharp/Atn/WildcardTransition.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Atn/WildcardTransition.cs rename to runtime/CSharp/Atn/WildcardTransition.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/BailErrorStrategy.cs b/runtime/CSharp/BailErrorStrategy.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/BailErrorStrategy.cs rename to runtime/CSharp/BailErrorStrategy.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/BaseErrorListener.cs b/runtime/CSharp/BaseErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/BaseErrorListener.cs rename to runtime/CSharp/BaseErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/BufferedTokenStream.cs b/runtime/CSharp/BufferedTokenStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/BufferedTokenStream.cs rename to runtime/CSharp/BufferedTokenStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CharStreams.cs b/runtime/CSharp/CharStreams.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CharStreams.cs rename to runtime/CSharp/CharStreams.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CommonToken.cs b/runtime/CSharp/CommonToken.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CommonToken.cs rename to runtime/CSharp/CommonToken.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CommonTokenFactory.cs b/runtime/CSharp/CommonTokenFactory.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CommonTokenFactory.cs rename to runtime/CSharp/CommonTokenFactory.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CommonTokenStream.cs b/runtime/CSharp/CommonTokenStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/CommonTokenStream.cs rename to runtime/CSharp/CommonTokenStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ConsoleErrorListener.cs b/runtime/CSharp/ConsoleErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ConsoleErrorListener.cs rename to runtime/CSharp/ConsoleErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/DefaultErrorStrategy.cs b/runtime/CSharp/DefaultErrorStrategy.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/DefaultErrorStrategy.cs rename to runtime/CSharp/DefaultErrorStrategy.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dependents.cs b/runtime/CSharp/Dependents.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dependents.cs rename to runtime/CSharp/Dependents.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap.cs b/runtime/CSharp/Dfa/AbstractEdgeMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap.cs rename to runtime/CSharp/Dfa/AbstractEdgeMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/AcceptStateInfo.cs b/runtime/CSharp/Dfa/AcceptStateInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/AcceptStateInfo.cs rename to runtime/CSharp/Dfa/AcceptStateInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap.cs b/runtime/CSharp/Dfa/ArrayEdgeMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap.cs rename to runtime/CSharp/Dfa/ArrayEdgeMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/DFA.cs b/runtime/CSharp/Dfa/DFA.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/DFA.cs rename to runtime/CSharp/Dfa/DFA.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/DFASerializer.cs b/runtime/CSharp/Dfa/DFASerializer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/DFASerializer.cs rename to runtime/CSharp/Dfa/DFASerializer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs b/runtime/CSharp/Dfa/DFAState.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs rename to runtime/CSharp/Dfa/DFAState.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/EmptyEdgeMap.cs b/runtime/CSharp/Dfa/EmptyEdgeMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/EmptyEdgeMap.cs rename to runtime/CSharp/Dfa/EmptyEdgeMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap.cs b/runtime/CSharp/Dfa/IEdgeMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap.cs rename to runtime/CSharp/Dfa/IEdgeMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/LexerDFASerializer.cs b/runtime/CSharp/Dfa/LexerDFASerializer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/LexerDFASerializer.cs rename to runtime/CSharp/Dfa/LexerDFASerializer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap.cs b/runtime/CSharp/Dfa/SingletonEdgeMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap.cs rename to runtime/CSharp/Dfa/SingletonEdgeMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap.cs b/runtime/CSharp/Dfa/SparseEdgeMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap.cs rename to runtime/CSharp/Dfa/SparseEdgeMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/DiagnosticErrorListener.cs b/runtime/CSharp/DiagnosticErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/DiagnosticErrorListener.cs rename to runtime/CSharp/DiagnosticErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/FailedPredicateException.cs b/runtime/CSharp/FailedPredicateException.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/FailedPredicateException.cs rename to runtime/CSharp/FailedPredicateException.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener.cs b/runtime/CSharp/IAntlrErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener.cs rename to runtime/CSharp/IAntlrErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IAntlrErrorStrategy.cs b/runtime/CSharp/IAntlrErrorStrategy.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IAntlrErrorStrategy.cs rename to runtime/CSharp/IAntlrErrorStrategy.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ICharStream.cs b/runtime/CSharp/ICharStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ICharStream.cs rename to runtime/CSharp/ICharStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IIntStream.cs b/runtime/CSharp/IIntStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IIntStream.cs rename to runtime/CSharp/IIntStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IParserErrorListener.cs b/runtime/CSharp/IParserErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IParserErrorListener.cs rename to runtime/CSharp/IParserErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IRecognizer.cs b/runtime/CSharp/IRecognizer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IRecognizer.cs rename to runtime/CSharp/IRecognizer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IToken.cs b/runtime/CSharp/IToken.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IToken.cs rename to runtime/CSharp/IToken.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ITokenFactory.cs b/runtime/CSharp/ITokenFactory.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ITokenFactory.cs rename to runtime/CSharp/ITokenFactory.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ITokenSource.cs b/runtime/CSharp/ITokenSource.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ITokenSource.cs rename to runtime/CSharp/ITokenSource.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ITokenStream.cs b/runtime/CSharp/ITokenStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ITokenStream.cs rename to runtime/CSharp/ITokenStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IVocabulary.cs b/runtime/CSharp/IVocabulary.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IVocabulary.cs rename to runtime/CSharp/IVocabulary.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IWritableToken.cs b/runtime/CSharp/IWritableToken.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/IWritableToken.cs rename to runtime/CSharp/IWritableToken.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/InputMismatchException.cs b/runtime/CSharp/InputMismatchException.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/InputMismatchException.cs rename to runtime/CSharp/InputMismatchException.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/InterpreterRuleContext.cs b/runtime/CSharp/InterpreterRuleContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/InterpreterRuleContext.cs rename to runtime/CSharp/InterpreterRuleContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Lexer.cs b/runtime/CSharp/Lexer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Lexer.cs rename to runtime/CSharp/Lexer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/LexerInterpreter.cs b/runtime/CSharp/LexerInterpreter.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/LexerInterpreter.cs rename to runtime/CSharp/LexerInterpreter.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/LexerNoViableAltException.cs b/runtime/CSharp/LexerNoViableAltException.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/LexerNoViableAltException.cs rename to runtime/CSharp/LexerNoViableAltException.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ListTokenSource.cs b/runtime/CSharp/ListTokenSource.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ListTokenSource.cs rename to runtime/CSharp/ListTokenSource.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Args.cs b/runtime/CSharp/Misc/Args.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Args.cs rename to runtime/CSharp/Misc/Args.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/ArrayList.cs b/runtime/CSharp/Misc/ArrayList.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/ArrayList.cs rename to runtime/CSharp/Misc/ArrayList.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/IIntSet.cs b/runtime/CSharp/Misc/IIntSet.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/IIntSet.cs rename to runtime/CSharp/Misc/IIntSet.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Interval.cs b/runtime/CSharp/Misc/Interval.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Interval.cs rename to runtime/CSharp/Misc/Interval.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/IntervalSet.cs b/runtime/CSharp/Misc/IntervalSet.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/IntervalSet.cs rename to runtime/CSharp/Misc/IntervalSet.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/MultiMap.cs b/runtime/CSharp/Misc/MultiMap.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/MultiMap.cs rename to runtime/CSharp/Misc/MultiMap.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/MurmurHash.cs b/runtime/CSharp/Misc/MurmurHash.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/MurmurHash.cs rename to runtime/CSharp/Misc/MurmurHash.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/NotNullAttribute.cs b/runtime/CSharp/Misc/NotNullAttribute.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/NotNullAttribute.cs rename to runtime/CSharp/Misc/NotNullAttribute.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/NullableAttribute.cs b/runtime/CSharp/Misc/NullableAttribute.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/NullableAttribute.cs rename to runtime/CSharp/Misc/NullableAttribute.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Pair.cs b/runtime/CSharp/Misc/Pair.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Pair.cs rename to runtime/CSharp/Misc/Pair.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs b/runtime/CSharp/Misc/ParseCanceledException.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs rename to runtime/CSharp/Misc/ParseCanceledException.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs b/runtime/CSharp/Misc/RuleDependencyChecker.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs rename to runtime/CSharp/Misc/RuleDependencyChecker.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs b/runtime/CSharp/Misc/Utils.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs rename to runtime/CSharp/Misc/Utils.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/NoViableAltException.cs b/runtime/CSharp/NoViableAltException.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/NoViableAltException.cs rename to runtime/CSharp/NoViableAltException.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Parser.cs b/runtime/CSharp/Parser.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Parser.cs rename to runtime/CSharp/Parser.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ParserInterpreter.cs b/runtime/CSharp/ParserInterpreter.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ParserInterpreter.cs rename to runtime/CSharp/ParserInterpreter.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs b/runtime/CSharp/ParserRuleContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs rename to runtime/CSharp/ParserRuleContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs b/runtime/CSharp/Properties/AssemblyInfo.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs rename to runtime/CSharp/Properties/AssemblyInfo.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ProxyErrorListener.cs b/runtime/CSharp/ProxyErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ProxyErrorListener.cs rename to runtime/CSharp/ProxyErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ProxyParserErrorListener.cs b/runtime/CSharp/ProxyParserErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/ProxyParserErrorListener.cs rename to runtime/CSharp/ProxyParserErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RecognitionException.cs b/runtime/CSharp/RecognitionException.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RecognitionException.cs rename to runtime/CSharp/RecognitionException.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Recognizer.cs b/runtime/CSharp/Recognizer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Recognizer.cs rename to runtime/CSharp/Recognizer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RuleContext.cs b/runtime/CSharp/RuleContext.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RuleContext.cs rename to runtime/CSharp/RuleContext.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RuleDependencyAttribute.cs b/runtime/CSharp/RuleDependencyAttribute.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RuleDependencyAttribute.cs rename to runtime/CSharp/RuleDependencyAttribute.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RuleVersionAttribute.cs b/runtime/CSharp/RuleVersionAttribute.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/RuleVersionAttribute.cs rename to runtime/CSharp/RuleVersionAttribute.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/Arrays.cs b/runtime/CSharp/Sharpen/Arrays.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/Arrays.cs rename to runtime/CSharp/Sharpen/Arrays.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/AtomicReference.cs b/runtime/CSharp/Sharpen/AtomicReference.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/AtomicReference.cs rename to runtime/CSharp/Sharpen/AtomicReference.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/BitSet.cs b/runtime/CSharp/Sharpen/BitSet.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/BitSet.cs rename to runtime/CSharp/Sharpen/BitSet.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs b/runtime/CSharp/Sharpen/Collections.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs rename to runtime/CSharp/Sharpen/Collections.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/DictionaryExtensions.cs b/runtime/CSharp/Sharpen/DictionaryExtensions.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/DictionaryExtensions.cs rename to runtime/CSharp/Sharpen/DictionaryExtensions.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/ListExtensions.cs b/runtime/CSharp/Sharpen/ListExtensions.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/ListExtensions.cs rename to runtime/CSharp/Sharpen/ListExtensions.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/Runtime.cs b/runtime/CSharp/Sharpen/Runtime.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/Runtime.cs rename to runtime/CSharp/Sharpen/Runtime.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/SequenceEqualityComparer.cs b/runtime/CSharp/Sharpen/SequenceEqualityComparer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Sharpen/SequenceEqualityComparer.cs rename to runtime/CSharp/Sharpen/SequenceEqualityComparer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/TokenStreamRewriter.cs b/runtime/CSharp/TokenStreamRewriter.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/TokenStreamRewriter.cs rename to runtime/CSharp/TokenStreamRewriter.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/TokenTypes.cs b/runtime/CSharp/TokenTypes.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/TokenTypes.cs rename to runtime/CSharp/TokenTypes.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/AbstractParseTreeVisitor.cs b/runtime/CSharp/Tree/AbstractParseTreeVisitor.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/AbstractParseTreeVisitor.cs rename to runtime/CSharp/Tree/AbstractParseTreeVisitor.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ErrorNodeImpl.cs b/runtime/CSharp/Tree/ErrorNodeImpl.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ErrorNodeImpl.cs rename to runtime/CSharp/Tree/ErrorNodeImpl.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IErrorNode.cs b/runtime/CSharp/Tree/IErrorNode.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IErrorNode.cs rename to runtime/CSharp/Tree/IErrorNode.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IParseTree.cs b/runtime/CSharp/Tree/IParseTree.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IParseTree.cs rename to runtime/CSharp/Tree/IParseTree.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeListener.cs b/runtime/CSharp/Tree/IParseTreeListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeListener.cs rename to runtime/CSharp/Tree/IParseTreeListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor.cs b/runtime/CSharp/Tree/IParseTreeVisitor.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor.cs rename to runtime/CSharp/Tree/IParseTreeVisitor.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IRuleNode.cs b/runtime/CSharp/Tree/IRuleNode.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/IRuleNode.cs rename to runtime/CSharp/Tree/IRuleNode.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ISyntaxTree.cs b/runtime/CSharp/Tree/ISyntaxTree.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ISyntaxTree.cs rename to runtime/CSharp/Tree/ISyntaxTree.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ITerminalNode.cs b/runtime/CSharp/Tree/ITerminalNode.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ITerminalNode.cs rename to runtime/CSharp/Tree/ITerminalNode.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ITree.cs b/runtime/CSharp/Tree/ITree.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ITree.cs rename to runtime/CSharp/Tree/ITree.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ParseTreeProperty.cs b/runtime/CSharp/Tree/ParseTreeProperty.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ParseTreeProperty.cs rename to runtime/CSharp/Tree/ParseTreeProperty.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ParseTreeWalker.cs b/runtime/CSharp/Tree/ParseTreeWalker.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/ParseTreeWalker.cs rename to runtime/CSharp/Tree/ParseTreeWalker.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/Chunk.cs b/runtime/CSharp/Tree/Pattern/Chunk.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/Chunk.cs rename to runtime/CSharp/Tree/Pattern/Chunk.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/ParseTreeMatch.cs b/runtime/CSharp/Tree/Pattern/ParseTreeMatch.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/ParseTreeMatch.cs rename to runtime/CSharp/Tree/Pattern/ParseTreeMatch.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/ParseTreePattern.cs b/runtime/CSharp/Tree/Pattern/ParseTreePattern.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/ParseTreePattern.cs rename to runtime/CSharp/Tree/Pattern/ParseTreePattern.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/ParseTreePatternMatcher.cs b/runtime/CSharp/Tree/Pattern/ParseTreePatternMatcher.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/ParseTreePatternMatcher.cs rename to runtime/CSharp/Tree/Pattern/ParseTreePatternMatcher.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/RuleTagToken.cs b/runtime/CSharp/Tree/Pattern/RuleTagToken.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/RuleTagToken.cs rename to runtime/CSharp/Tree/Pattern/RuleTagToken.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/TagChunk.cs b/runtime/CSharp/Tree/Pattern/TagChunk.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/TagChunk.cs rename to runtime/CSharp/Tree/Pattern/TagChunk.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/TextChunk.cs b/runtime/CSharp/Tree/Pattern/TextChunk.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/TextChunk.cs rename to runtime/CSharp/Tree/Pattern/TextChunk.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/TokenTagToken.cs b/runtime/CSharp/Tree/Pattern/TokenTagToken.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Pattern/TokenTagToken.cs rename to runtime/CSharp/Tree/Pattern/TokenTagToken.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/TerminalNodeImpl.cs b/runtime/CSharp/Tree/TerminalNodeImpl.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/TerminalNodeImpl.cs rename to runtime/CSharp/Tree/TerminalNodeImpl.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Trees.cs b/runtime/CSharp/Tree/Trees.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Trees.cs rename to runtime/CSharp/Tree/Trees.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPath.cs b/runtime/CSharp/Tree/Xpath/XPath.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPath.cs rename to runtime/CSharp/Tree/Xpath/XPath.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathElement.cs b/runtime/CSharp/Tree/Xpath/XPathElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathElement.cs rename to runtime/CSharp/Tree/Xpath/XPathElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.cs b/runtime/CSharp/Tree/Xpath/XPathLexer.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.cs rename to runtime/CSharp/Tree/Xpath/XPathLexer.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.g4 b/runtime/CSharp/Tree/Xpath/XPathLexer.g4 similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.g4 rename to runtime/CSharp/Tree/Xpath/XPathLexer.g4 diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.tokens b/runtime/CSharp/Tree/Xpath/XPathLexer.tokens similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexer.tokens rename to runtime/CSharp/Tree/Xpath/XPathLexer.tokens diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexerErrorListener.cs b/runtime/CSharp/Tree/Xpath/XPathLexerErrorListener.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathLexerErrorListener.cs rename to runtime/CSharp/Tree/Xpath/XPathLexerErrorListener.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathRuleAnywhereElement.cs b/runtime/CSharp/Tree/Xpath/XPathRuleAnywhereElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathRuleAnywhereElement.cs rename to runtime/CSharp/Tree/Xpath/XPathRuleAnywhereElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathRuleElement.cs b/runtime/CSharp/Tree/Xpath/XPathRuleElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathRuleElement.cs rename to runtime/CSharp/Tree/Xpath/XPathRuleElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathTokenAnywhereElement.cs b/runtime/CSharp/Tree/Xpath/XPathTokenAnywhereElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathTokenAnywhereElement.cs rename to runtime/CSharp/Tree/Xpath/XPathTokenAnywhereElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathTokenElement.cs b/runtime/CSharp/Tree/Xpath/XPathTokenElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathTokenElement.cs rename to runtime/CSharp/Tree/Xpath/XPathTokenElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathWildcardAnywhereElement.cs b/runtime/CSharp/Tree/Xpath/XPathWildcardAnywhereElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathWildcardAnywhereElement.cs rename to runtime/CSharp/Tree/Xpath/XPathWildcardAnywhereElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathWildcardElement.cs b/runtime/CSharp/Tree/Xpath/XPathWildcardElement.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Tree/Xpath/XPathWildcardElement.cs rename to runtime/CSharp/Tree/Xpath/XPathWildcardElement.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/UnbufferedCharStream.cs b/runtime/CSharp/UnbufferedCharStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/UnbufferedCharStream.cs rename to runtime/CSharp/UnbufferedCharStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/UnbufferedTokenStream.cs b/runtime/CSharp/UnbufferedTokenStream.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/UnbufferedTokenStream.cs rename to runtime/CSharp/UnbufferedTokenStream.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Vocabulary.cs b/runtime/CSharp/Vocabulary.cs similarity index 100% rename from runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Vocabulary.cs rename to runtime/CSharp/Vocabulary.cs diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.sln b/runtime/CSharp/runtime/CSharp/Antlr4.sln deleted file mode 100644 index 1f63a3fa4..000000000 --- a/runtime/CSharp/runtime/CSharp/Antlr4.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26114.2 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime", "Antlr4.Runtime\Antlr4.Runtime.csproj", "{A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Release|Any CPU.Build.0 = Release|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Debug|x64.ActiveCfg = Debug|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Debug|x64.Build.0 = Debug|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Debug|x86.ActiveCfg = Debug|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Debug|x86.Build.0 = Debug|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Release|x64.ActiveCfg = Release|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Release|x64.Build.0 = Release|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Release|x86.ActiveCfg = Release|Any CPU - {A90A2A23-E922-407F-BDB8-C88E6CA1AE4F}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tool-testsuite/pom.xml b/tool-testsuite/pom.xml index 6f1c40b6d..06e149fb6 100644 --- a/tool-testsuite/pom.xml +++ b/tool-testsuite/pom.xml @@ -67,7 +67,6 @@ ../../antlr4-python2/src ../../antlr4-python3/src - ../../antlr4-csharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.mono.csproj ../../antlr4-cpp/src ../../antlr4-javascript/src