diff --git a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs index 278b45af..134be6f8 100644 --- a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs +++ b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs @@ -21,10 +21,8 @@ using System; using System.Collections; using System.Runtime.Serialization; - -using antlr.collections; -using Spring.Core.TypeResolution; -using Spring.Util; +using Spring.Core.TypeResolution; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/AssignNode.cs b/src/Spring/Spring.Core/Expressions/AssignNode.cs index 859f5bee..fb451b2c 100644 --- a/src/Spring/Spring.Core/Expressions/AssignNode.cs +++ b/src/Spring/Spring.Core/Expressions/AssignNode.cs @@ -20,7 +20,7 @@ using System; using System.Runtime.Serialization; -using antlr.collections; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs b/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs index 84820472..e33bcaed 100644 --- a/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs @@ -20,8 +20,8 @@ using System; using System.Globalization; -using System.Runtime.Serialization; -using antlr.collections; +using System.Runtime.Serialization; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/Expression.cs b/src/Spring/Spring.Core/Expressions/Expression.cs index 3307a568..22aebae1 100644 --- a/src/Spring/Spring.Core/Expressions/Expression.cs +++ b/src/Spring/Spring.Core/Expressions/Expression.cs @@ -23,8 +23,9 @@ using System.Collections; using System.IO; using System.Reflection; using System.Runtime.Serialization; -using antlr; -using antlr.collections; +using Spring.Expressions.Parser; +using Spring.Expressions.Parser.antlr; +using Spring.Expressions.Parser.antlr.collections; using Spring.Core; using Spring.Util; using StringUtils = Spring.Util.StringUtils; @@ -86,7 +87,7 @@ namespace Spring.Expressions static Expression() { // Ensure antlr is loaded (fixes GAC issues)! - Assembly antlrAss = typeof( antlr.LLkParser ).Assembly; + Assembly antlrAss = typeof( Parser.antlr.LLkParser ).Assembly; } /// diff --git a/src/Spring/Spring.Core/Expressions/Expression.g b/src/Spring/Spring.Core/Expressions/Expression.g index dd7f5e50..cfc0a2c6 100644 --- a/src/Spring/Spring.Core/Expressions/Expression.g +++ b/src/Spring/Spring.Core/Expressions/Expression.g @@ -1,7 +1,7 @@ options { language = "CSharp"; - namespace = "Spring.Expressions"; + namespace = "Spring.Expressions.Parser"; } class ExpressionParser extends Parser; diff --git a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs index f7c4177f..b11c2fc1 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs @@ -20,7 +20,7 @@ using System; using System.Runtime.Serialization; -using antlr.collections; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs index 220efb8b..9142f9c1 100644 --- a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs +++ b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs @@ -20,8 +20,8 @@ using System; using System.Collections; -using System.Runtime.Serialization; -using antlr.collections; +using System.Runtime.Serialization; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs index 88690777..0a4ab4e7 100644 --- a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs +++ b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs @@ -20,8 +20,8 @@ using System; using System.Collections; -using System.Runtime.Serialization; -using antlr.collections; +using System.Runtime.Serialization; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs index 79277f72..ce5dc247 100644 --- a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs +++ b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs @@ -20,8 +20,8 @@ using System; using System.Collections; -using System.Runtime.Serialization; -using antlr.collections; +using System.Runtime.Serialization; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs index 9a361070..bb39482d 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs @@ -1,6 +1,6 @@ // $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$ -namespace Spring.Expressions +namespace Spring.Expressions.Parser { // Generate header specific to lexer CSharp file using System; diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs index 50d38a33..a5677a09 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs @@ -1,6 +1,6 @@ // $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionParser.cs"$ -namespace Spring.Expressions +namespace Spring.Expressions.Parser { // Generate the header common to all output files. using System; diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs index b4f2328a..8a4384db 100644 --- a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs @@ -1,6 +1,6 @@ // $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$ -namespace Spring.Expressions +namespace Spring.Expressions.Parser { public class ExpressionParserTokenTypes { diff --git a/src/Spring/Spring.Core/antlr/ANTLRException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRException.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/ANTLRException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRException.cs index 65f4b235..36bfc0b8 100644 --- a/src/Spring/Spring.Core/antlr/ANTLRException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRException.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ANTLRPanicException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRPanicException.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/ANTLRPanicException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRPanicException.cs index e4b75a94..e88c020a 100644 --- a/src/Spring/Spring.Core/antlr/ANTLRPanicException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRPanicException.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ASTFactory.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTFactory.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/ASTFactory.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ASTFactory.cs index 94577ec6..7c13d045 100644 --- a/src/Spring/Spring.Core/antlr/ASTFactory.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTFactory.cs @@ -1,13 +1,15 @@ using System; using System.Collections; +using Spring.Expressions.Parser.antlr.collections; +using Spring.Expressions.Parser.antlr.collections.impl; using Assembly = System.Reflection.Assembly; using ArrayList = System.Collections.ArrayList; using Debug = System.Diagnostics.Debug; -using AST = antlr.collections.AST; -using ASTArray = antlr.collections.impl.ASTArray; -using ANTLRException = antlr.ANTLRException; +using AST = Spring.Expressions.Parser.antlr.collections.AST; +using ASTArray = Spring.Expressions.Parser.antlr.collections.impl.ASTArray; +using ANTLRException = Spring.Expressions.Parser.antlr.ANTLRException; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -57,7 +59,7 @@ namespace antlr /// Constructs an ASTFactory with the default AST node type of /// . /// - public ASTFactory() : this("antlr.CommonAST") + public ASTFactory() : this(typeof(CommonAST).FullName) { } diff --git a/src/Spring/Spring.Core/antlr/ASTNULLType.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs similarity index 91% rename from src/Spring/Spring.Core/antlr/ASTNULLType.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs index 41131de7..69d459e6 100644 --- a/src/Spring/Spring.Core/antlr/ASTNULLType.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs @@ -1,10 +1,11 @@ using System; +using Spring.Expressions.Parser.antlr.collections; using IEnumerator = System.Collections.IEnumerator; -using AST = antlr.collections.AST; -using Token = antlr.Token; +using AST = Spring.Expressions.Parser.antlr.collections.AST; +using Token = Spring.Expressions.Parser.antlr.Token; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ASTNodeCreator.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNodeCreator.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/ASTNodeCreator.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNodeCreator.cs index 485ba14c..ba5b9913 100644 --- a/src/Spring/Spring.Core/antlr/ASTNodeCreator.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNodeCreator.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { using System; using AST = antlr.collections.AST; diff --git a/src/Spring/Spring.Core/antlr/ASTPair.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTPair.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/ASTPair.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ASTPair.cs index 2aa67c92..6387509c 100644 --- a/src/Spring/Spring.Core/antlr/ASTPair.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTPair.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { using System; using Queue = System.Collections.Queue; diff --git a/src/Spring/Spring.Core/antlr/ASTVisitor.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTVisitor.cs similarity index 78% rename from src/Spring/Spring.Core/antlr/ASTVisitor.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ASTVisitor.cs index bbc07974..3f9b7f52 100644 --- a/src/Spring/Spring.Core/antlr/ASTVisitor.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ASTVisitor.cs @@ -1,8 +1,8 @@ -using System; +using System; +using Spring.Expressions.Parser.antlr.collections; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -using AST = antlr.collections.AST; - -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/BaseAST.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/BaseAST.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs index 02a1de3b..698649bd 100644 --- a/src/Spring/Spring.Core/antlr/BaseAST.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs @@ -1,13 +1,14 @@ using System; +using Spring.Expressions.Parser.antlr.collections; using StringBuilder = System.Text.StringBuilder; using ISerializable = System.Runtime.Serialization.ISerializable; using TextWriter = System.IO.TextWriter; using ArrayList = System.Collections.ArrayList; using IEnumerator = System.Collections.IEnumerator; -using AST = antlr.collections.AST; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ByteBuffer.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ByteBuffer.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/ByteBuffer.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ByteBuffer.cs index 3fda9bb9..8292de12 100644 --- a/src/Spring/Spring.Core/antlr/ByteBuffer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ByteBuffer.cs @@ -4,7 +4,7 @@ using Stream = System.IO.Stream; using BinaryReader = System.IO.BinaryReader; using IOException = System.IO.IOException; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CharBuffer.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharBuffer.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/CharBuffer.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CharBuffer.cs index ebf9ee93..8466da18 100644 --- a/src/Spring/Spring.Core/antlr/CharBuffer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharBuffer.cs @@ -4,7 +4,7 @@ using TextReader = System.IO.TextReader; using IOException = System.IO.IOException; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CharQueue.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharQueue.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/CharQueue.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CharQueue.cs index 60ee0abb..6c5e6d3f 100644 --- a/src/Spring/Spring.Core/antlr/CharQueue.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharQueue.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CharScanner.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharScanner.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/CharScanner.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CharScanner.cs index 99823986..7e014707 100644 --- a/src/Spring/Spring.Core/antlr/CharScanner.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharScanner.cs @@ -1,4 +1,6 @@ using System; +using Spring.Expressions.Parser.antlr.collections.impl; +using Spring.Expressions.Parser.antlr.debug; using Stream = System.IO.Stream; using TextReader = System.IO.TextReader; using StringBuilder = System.Text.StringBuilder; @@ -6,10 +8,9 @@ using Hashtable = System.Collections.Hashtable; using Assembly = System.Reflection.Assembly; using EventHandlerList = System.ComponentModel.EventHandlerList; -using BitSet = antlr.collections.impl.BitSet; -using antlr.debug; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CharStreamException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamException.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/CharStreamException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamException.cs index c4b4fd1b..2ca4e43c 100644 --- a/src/Spring/Spring.Core/antlr/CharStreamException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamException.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CharStreamIOException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamIOException.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/CharStreamIOException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamIOException.cs index 4c00d039..e142b728 100644 --- a/src/Spring/Spring.Core/antlr/CharStreamIOException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamIOException.cs @@ -1,7 +1,7 @@ using System; using IOException = System.IO.IOException; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CommonAST.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs similarity index 92% rename from src/Spring/Spring.Core/antlr/CommonAST.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs index 60d39dc0..aa2b5fbb 100644 --- a/src/Spring/Spring.Core/antlr/CommonAST.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs @@ -1,7 +1,8 @@ using System; -using AST = antlr.collections.AST; +using Spring.Expressions.Parser.antlr.collections; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -56,7 +57,7 @@ namespace antlr setText(txt); } - override public void initialize(AST t) + override public void initialize(collections.AST t) { setText(t.getText()); Type = t.Type; diff --git a/src/Spring/Spring.Core/antlr/CommonASTWithHiddenTokens.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs similarity index 92% rename from src/Spring/Spring.Core/antlr/CommonASTWithHiddenTokens.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs index a9284140..27233bc9 100644 --- a/src/Spring/Spring.Core/antlr/CommonASTWithHiddenTokens.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs @@ -1,7 +1,8 @@ using System; -using AST = antlr.collections.AST; +using Spring.Expressions.Parser.antlr.collections; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -53,7 +54,7 @@ namespace antlr return hiddenBefore; } - override public void initialize(AST t) + override public void initialize(collections.AST t) { hiddenBefore = ((CommonASTWithHiddenTokens) t).getHiddenBefore(); hiddenAfter = ((CommonASTWithHiddenTokens) t).getHiddenAfter(); diff --git a/src/Spring/Spring.Core/antlr/CommonHiddenStreamToken.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonHiddenStreamToken.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/CommonHiddenStreamToken.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CommonHiddenStreamToken.cs index 4be65948..a84ed65e 100644 --- a/src/Spring/Spring.Core/antlr/CommonHiddenStreamToken.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonHiddenStreamToken.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/CommonToken.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonToken.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/CommonToken.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/CommonToken.cs index 3b61e301..0e93d205 100644 --- a/src/Spring/Spring.Core/antlr/CommonToken.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/CommonToken.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/DefaultFileLineFormatter.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/DefaultFileLineFormatter.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/DefaultFileLineFormatter.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/DefaultFileLineFormatter.cs index 4e43216a..88bc3e0d 100644 --- a/src/Spring/Spring.Core/antlr/DefaultFileLineFormatter.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/DefaultFileLineFormatter.cs @@ -1,7 +1,7 @@ using System; using StringBuilder = System.Text.StringBuilder; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/DumpASTVisitor.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/DumpASTVisitor.cs similarity index 91% rename from src/Spring/Spring.Core/antlr/DumpASTVisitor.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/DumpASTVisitor.cs index 83adf02f..64c71b84 100644 --- a/src/Spring/Spring.Core/antlr/DumpASTVisitor.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/DumpASTVisitor.cs @@ -1,8 +1,8 @@ -using System; +using System; +using Spring.Expressions.Parser.antlr.collections; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -using AST = antlr.collections.AST; - -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/FileLineFormatter.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/FileLineFormatter.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/FileLineFormatter.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/FileLineFormatter.cs index d8cd3700..e3441055 100644 --- a/src/Spring/Spring.Core/antlr/FileLineFormatter.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/FileLineFormatter.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/IHiddenStreamToken.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/IHiddenStreamToken.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/IHiddenStreamToken.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/IHiddenStreamToken.cs index 7d98add1..8a340760 100644 --- a/src/Spring/Spring.Core/antlr/IHiddenStreamToken.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/IHiddenStreamToken.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/IToken.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/IToken.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/IToken.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/IToken.cs index 3071c4cb..a11ce895 100644 --- a/src/Spring/Spring.Core/antlr/IToken.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/IToken.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/InputBuffer.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/InputBuffer.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/InputBuffer.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/InputBuffer.cs index 6ad0ad3e..3a0ec7a4 100644 --- a/src/Spring/Spring.Core/antlr/InputBuffer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/InputBuffer.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { using System; using ArrayList = System.Collections.ArrayList; diff --git a/src/Spring/Spring.Core/antlr/LLkParser.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/LLkParser.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/LLkParser.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/LLkParser.cs index 4e60ca65..8f164ac6 100644 --- a/src/Spring/Spring.Core/antlr/LLkParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/LLkParser.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/LexerSharedInputState.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/LexerSharedInputState.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/LexerSharedInputState.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/LexerSharedInputState.cs index e1213034..9ce05ed9 100644 --- a/src/Spring/Spring.Core/antlr/LexerSharedInputState.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/LexerSharedInputState.cs @@ -2,7 +2,7 @@ using System; using Stream = System.IO.Stream; using TextReader = System.IO.TextReader; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/MismatchedCharException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedCharException.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/MismatchedCharException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedCharException.cs index 1f5b2f12..705992d8 100644 --- a/src/Spring/Spring.Core/antlr/MismatchedCharException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedCharException.cs @@ -1,9 +1,10 @@ using System; +using Spring.Expressions.Parser.antlr.collections.impl; using StringBuilder = System.Text.StringBuilder; -using BitSet = antlr.collections.impl.BitSet; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/MismatchedTokenException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedTokenException.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/MismatchedTokenException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedTokenException.cs index 3acb5539..edec9047 100644 --- a/src/Spring/Spring.Core/antlr/MismatchedTokenException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedTokenException.cs @@ -1,10 +1,12 @@ using System; +using Spring.Expressions.Parser.antlr.collections; +using Spring.Expressions.Parser.antlr.collections.impl; using StringBuilder = System.Text.StringBuilder; -using BitSet = antlr.collections.impl.BitSet; -using AST = antlr.collections.AST; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/NoViableAltException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltException.cs similarity index 89% rename from src/Spring/Spring.Core/antlr/NoViableAltException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltException.cs index 80202b90..5e5e32fc 100644 --- a/src/Spring/Spring.Core/antlr/NoViableAltException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltException.cs @@ -1,8 +1,8 @@ -using System; +using System; +using Spring.Expressions.Parser.antlr.collections; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -using AST = antlr.collections.AST; - -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/NoViableAltForCharException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltForCharException.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/NoViableAltForCharException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltForCharException.cs index b15150d0..d7c06f4d 100644 --- a/src/Spring/Spring.Core/antlr/NoViableAltForCharException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltForCharException.cs @@ -1,7 +1,7 @@ using System; using StringBuilder = System.Text.StringBuilder; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ParseTree.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTree.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/ParseTree.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTree.cs index 594b3696..0cf0fbcf 100644 --- a/src/Spring/Spring.Core/antlr/ParseTree.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTree.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ParseTreeRule.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeRule.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/ParseTreeRule.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeRule.cs index 74fec02c..22ef96c2 100644 --- a/src/Spring/Spring.Core/antlr/ParseTreeRule.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeRule.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator diff --git a/src/Spring/Spring.Core/antlr/ParseTreeToken.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeToken.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/ParseTreeToken.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeToken.cs index 54f3e8c4..8a0a5ce4 100644 --- a/src/Spring/Spring.Core/antlr/ParseTreeToken.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeToken.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator diff --git a/src/Spring/Spring.Core/antlr/Parser.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/Parser.cs similarity index 93% rename from src/Spring/Spring.Core/antlr/Parser.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/Parser.cs index 86b97ab8..32df75f6 100644 --- a/src/Spring/Spring.Core/antlr/Parser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/Parser.cs @@ -1,18 +1,19 @@ using System; +using Spring.Expressions.Parser.antlr.collections; +using Spring.Expressions.Parser.antlr.collections.impl; +using Spring.Expressions.Parser.antlr.debug; using EventHandlerList = System.ComponentModel.EventHandlerList; -using BitSet = antlr.collections.impl.BitSet; -using AST = antlr.collections.AST; -using ASTArray = antlr.collections.impl.ASTArray; -using antlr.debug; - -using MessageListener = antlr.debug.MessageListener; -using ParserListener = antlr.debug.ParserListener; -using ParserMatchListener = antlr.debug.ParserMatchListener; -using ParserTokenListener = antlr.debug.ParserTokenListener; -using SemanticPredicateListener = antlr.debug.SemanticPredicateListener; -using SyntacticPredicateListener = antlr.debug.SyntacticPredicateListener; -using TraceListener = antlr.debug.TraceListener; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; +using AST = Spring.Expressions.Parser.antlr.collections.AST; +using ASTArray = Spring.Expressions.Parser.antlr.collections.impl.ASTArray; +using MessageListener = Spring.Expressions.Parser.antlr.debug.MessageListener; +using ParserListener = Spring.Expressions.Parser.antlr.debug.ParserListener; +using ParserMatchListener = Spring.Expressions.Parser.antlr.debug.ParserMatchListener; +using ParserTokenListener = Spring.Expressions.Parser.antlr.debug.ParserTokenListener; +using SemanticPredicateListener = Spring.Expressions.Parser.antlr.debug.SemanticPredicateListener; +using SyntacticPredicateListener = Spring.Expressions.Parser.antlr.debug.SyntacticPredicateListener; +using TraceListener = Spring.Expressions.Parser.antlr.debug.TraceListener; /* private Vector messageListeners; @@ -24,7 +25,7 @@ using TraceListener = antlr.debug.TraceListener; private Vector traceListeners; */ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/ParserSharedInputState.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParserSharedInputState.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/ParserSharedInputState.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/ParserSharedInputState.cs index 1b664db2..0072889b 100644 --- a/src/Spring/Spring.Core/antlr/ParserSharedInputState.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/ParserSharedInputState.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/RecognitionException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/RecognitionException.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/RecognitionException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/RecognitionException.cs index 4726e136..85c667da 100644 --- a/src/Spring/Spring.Core/antlr/RecognitionException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/RecognitionException.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/SemanticException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/SemanticException.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/SemanticException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/SemanticException.cs index 9e9893bf..235e3013 100644 --- a/src/Spring/Spring.Core/antlr/SemanticException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/SemanticException.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/StringUtils.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/StringUtils.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/StringUtils.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/StringUtils.cs index 19050b7c..4474214d 100644 --- a/src/Spring/Spring.Core/antlr/StringUtils.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/StringUtils.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/SupportClass.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/SupportClass.cs similarity index 91% rename from src/Spring/Spring.Core/antlr/SupportClass.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/SupportClass.cs index 2c0b9d7f..ee8f543b 100644 --- a/src/Spring/Spring.Core/antlr/SupportClass.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/SupportClass.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { internal class SupportClass { diff --git a/src/Spring/Spring.Core/antlr/Token.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/Token.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/Token.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/Token.cs index e71509d7..a5ede79b 100644 --- a/src/Spring/Spring.Core/antlr/Token.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/Token.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenBuffer.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenBuffer.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/TokenBuffer.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenBuffer.cs index 108a9d7c..eb6130d2 100644 --- a/src/Spring/Spring.Core/antlr/TokenBuffer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenBuffer.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenCreator.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenCreator.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/TokenCreator.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenCreator.cs index c5b71dde..005b5d1e 100644 --- a/src/Spring/Spring.Core/antlr/TokenCreator.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenCreator.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { using System; diff --git a/src/Spring/Spring.Core/antlr/TokenQueue.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenQueue.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/TokenQueue.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenQueue.cs index cd045fc8..442fb828 100644 --- a/src/Spring/Spring.Core/antlr/TokenQueue.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenQueue.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStream.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStream.cs similarity index 92% rename from src/Spring/Spring.Core/antlr/TokenStream.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStream.cs index 631b335e..bd164fd3 100644 --- a/src/Spring/Spring.Core/antlr/TokenStream.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStream.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamBasicFilter.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamBasicFilter.cs similarity index 88% rename from src/Spring/Spring.Core/antlr/TokenStreamBasicFilter.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamBasicFilter.cs index 42c179a1..10ecfb1b 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamBasicFilter.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamBasicFilter.cs @@ -1,7 +1,8 @@ using System; -using BitSet = antlr.collections.impl.BitSet; +using Spring.Expressions.Parser.antlr.collections.impl; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamException.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/TokenStreamException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamException.cs index d13a19fd..3ad0183c 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamException.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamHiddenTokenFilter.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamHiddenTokenFilter.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/TokenStreamHiddenTokenFilter.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamHiddenTokenFilter.cs index 10dbbf29..8e6403c6 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamHiddenTokenFilter.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamHiddenTokenFilter.cs @@ -1,7 +1,8 @@ using System; -using BitSet = antlr.collections.impl.BitSet; +using Spring.Expressions.Parser.antlr.collections.impl; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamIOException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamIOException.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/TokenStreamIOException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamIOException.cs index 8dc6862c..34c5fee6 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamIOException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamIOException.cs @@ -1,7 +1,7 @@ using System; using IOException = System.IO.IOException; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamRecognitionException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRecognitionException.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/TokenStreamRecognitionException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRecognitionException.cs index 06f568d6..6515b380 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamRecognitionException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRecognitionException.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamRetryException.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRetryException.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/TokenStreamRetryException.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRetryException.cs index b6ad2cd1..49e31473 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamRetryException.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRetryException.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamRewriteEngine.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRewriteEngine.cs similarity index 99% rename from src/Spring/Spring.Core/antlr/TokenStreamRewriteEngine.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRewriteEngine.cs index ec0de86c..e460ef85 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamRewriteEngine.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRewriteEngine.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenStreamSelector.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamSelector.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/TokenStreamSelector.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamSelector.cs index 4533ec59..89f75700 100644 --- a/src/Spring/Spring.Core/antlr/TokenStreamSelector.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamSelector.cs @@ -2,7 +2,7 @@ using System; using Hashtable = System.Collections.Hashtable; using Stack = System.Collections.Stack; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TokenWithIndex.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenWithIndex.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/TokenWithIndex.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TokenWithIndex.cs index 7aa4c1a0..c93808a5 100644 --- a/src/Spring/Spring.Core/antlr/TokenWithIndex.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TokenWithIndex.cs @@ -1,4 +1,4 @@ -namespace antlr +namespace Spring.Expressions.Parser.antlr { /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TreeParser.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParser.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/TreeParser.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParser.cs index 791625d3..45b1a39e 100644 --- a/src/Spring/Spring.Core/antlr/TreeParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParser.cs @@ -1,8 +1,10 @@ using System; -using AST = antlr.collections.AST; -using BitSet = antlr.collections.impl.BitSet; +using Spring.Expressions.Parser.antlr.collections; +using Spring.Expressions.Parser.antlr.collections.impl; +using AST = Spring.Expressions.Parser.antlr.collections.AST; +using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/TreeParserSharedInputState.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParserSharedInputState.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/TreeParserSharedInputState.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParserSharedInputState.cs index 6bec46c3..cc77798c 100644 --- a/src/Spring/Spring.Core/antlr/TreeParserSharedInputState.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParserSharedInputState.cs @@ -1,6 +1,6 @@ using System; -namespace antlr +namespace Spring.Expressions.Parser.antlr { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/collections/AST.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/collections/AST.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/collections/AST.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/collections/AST.cs index ca63774a..7ceae5ac 100644 --- a/src/Spring/Spring.Core/antlr/collections/AST.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/collections/AST.cs @@ -1,9 +1,9 @@ using System; using IEnumerator = System.Collections.IEnumerator; -using IToken = antlr.IToken; +using IToken = Spring.Expressions.Parser.antlr.IToken; -namespace antlr.collections +namespace Spring.Expressions.Parser.antlr.collections { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/collections/impl/ASTArray.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/ASTArray.cs similarity index 87% rename from src/Spring/Spring.Core/antlr/collections/impl/ASTArray.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/ASTArray.cs index cea241c3..0d501bc0 100644 --- a/src/Spring/Spring.Core/antlr/collections/impl/ASTArray.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/ASTArray.cs @@ -1,7 +1,7 @@ using System; -using AST = antlr.collections.AST; +using AST = Spring.Expressions.Parser.antlr.collections.AST; -namespace antlr.collections.impl +namespace Spring.Expressions.Parser.antlr.collections.impl { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/collections/impl/BitSet.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/BitSet.cs similarity index 99% rename from src/Spring/Spring.Core/antlr/collections/impl/BitSet.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/BitSet.cs index a104d764..d52ad043 100644 --- a/src/Spring/Spring.Core/antlr/collections/impl/BitSet.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/BitSet.cs @@ -3,7 +3,7 @@ using ArrayList = System.Collections.ArrayList; //using CharFormatter = antlr.CharFormatter; -namespace antlr.collections.impl +namespace Spring.Expressions.Parser.antlr.collections.impl { /*ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com diff --git a/src/Spring/Spring.Core/antlr/debug/ANTLREventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ANTLREventArgs.cs similarity index 89% rename from src/Spring/Spring.Core/antlr/debug/ANTLREventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ANTLREventArgs.cs index 36b8a76a..50128545 100644 --- a/src/Spring/Spring.Core/antlr/debug/ANTLREventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ANTLREventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/DebuggingCharScanner.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingCharScanner.cs similarity index 99% rename from src/Spring/Spring.Core/antlr/debug/DebuggingCharScanner.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingCharScanner.cs index 0a641f23..66666645 100644 --- a/src/Spring/Spring.Core/antlr/debug/DebuggingCharScanner.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingCharScanner.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; using System.Threading; diff --git a/src/Spring/Spring.Core/antlr/debug/DebuggingInputBuffer.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingInputBuffer.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/debug/DebuggingInputBuffer.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingInputBuffer.cs index 87a2d9e4..800f1c8d 100644 --- a/src/Spring/Spring.Core/antlr/debug/DebuggingInputBuffer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingInputBuffer.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; using ArrayList = System.Collections.ArrayList; diff --git a/src/Spring/Spring.Core/antlr/debug/DebuggingParser.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingParser.cs similarity index 79% rename from src/Spring/Spring.Core/antlr/debug/DebuggingParser.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingParser.cs index eee9452a..1147b6bb 100644 --- a/src/Spring/Spring.Core/antlr/debug/DebuggingParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingParser.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/GuessingEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/GuessingEventArgs.cs similarity index 91% rename from src/Spring/Spring.Core/antlr/debug/GuessingEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/GuessingEventArgs.cs index 6d843a4e..b1df09bd 100644 --- a/src/Spring/Spring.Core/antlr/debug/GuessingEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/GuessingEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ICharScannerDebugSubject.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ICharScannerDebugSubject.cs similarity index 89% rename from src/Spring/Spring.Core/antlr/debug/ICharScannerDebugSubject.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ICharScannerDebugSubject.cs index 43b539be..3a711cd3 100644 --- a/src/Spring/Spring.Core/antlr/debug/ICharScannerDebugSubject.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ICharScannerDebugSubject.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/IDebugSubject.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IDebugSubject.cs similarity index 92% rename from src/Spring/Spring.Core/antlr/debug/IDebugSubject.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IDebugSubject.cs index 4cadabdc..fc9d93b9 100644 --- a/src/Spring/Spring.Core/antlr/debug/IDebugSubject.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IDebugSubject.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; //using EventHandlerList = System.ComponentModel.EventHandlerList; diff --git a/src/Spring/Spring.Core/antlr/debug/IParserDebugSubject.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IParserDebugSubject.cs similarity index 88% rename from src/Spring/Spring.Core/antlr/debug/IParserDebugSubject.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IParserDebugSubject.cs index a7b3fb8f..2fa4555b 100644 --- a/src/Spring/Spring.Core/antlr/debug/IParserDebugSubject.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IParserDebugSubject.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/InputBufferEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventArgs.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/debug/InputBufferEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventArgs.cs index 5c601f16..c6aef6f9 100644 --- a/src/Spring/Spring.Core/antlr/debug/InputBufferEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/InputBufferEventSupport.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventSupport.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/debug/InputBufferEventSupport.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventSupport.cs index b58d4d62..6d33c685 100644 --- a/src/Spring/Spring.Core/antlr/debug/InputBufferEventSupport.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventSupport.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; using ArrayList = System.Collections.ArrayList; diff --git a/src/Spring/Spring.Core/antlr/debug/InputBufferListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListener.cs similarity index 87% rename from src/Spring/Spring.Core/antlr/debug/InputBufferListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListener.cs index 0b3f7dd3..baa7b2c9 100644 --- a/src/Spring/Spring.Core/antlr/debug/InputBufferListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/InputBufferListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListenerBase.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/debug/InputBufferListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListenerBase.cs index af4beed2..fcaa02b6 100644 --- a/src/Spring/Spring.Core/antlr/debug/InputBufferListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/InputBufferReporter.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferReporter.cs similarity index 94% rename from src/Spring/Spring.Core/antlr/debug/InputBufferReporter.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferReporter.cs index 0eb73e7b..7a7094a4 100644 --- a/src/Spring/Spring.Core/antlr/debug/InputBufferReporter.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferReporter.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/LLkDebuggingParser.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/LLkDebuggingParser.cs similarity index 99% rename from src/Spring/Spring.Core/antlr/debug/LLkDebuggingParser.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/LLkDebuggingParser.cs index e054c55a..0789e111 100644 --- a/src/Spring/Spring.Core/antlr/debug/LLkDebuggingParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/LLkDebuggingParser.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; using System.Threading; diff --git a/src/Spring/Spring.Core/antlr/debug/Listener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Listener.cs similarity index 73% rename from src/Spring/Spring.Core/antlr/debug/Listener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Listener.cs index e4469767..9b283af2 100644 --- a/src/Spring/Spring.Core/antlr/debug/Listener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Listener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/MessageEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageEventArgs.cs similarity index 93% rename from src/Spring/Spring.Core/antlr/debug/MessageEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageEventArgs.cs index 9d59f487..1ca1603f 100644 --- a/src/Spring/Spring.Core/antlr/debug/MessageEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/MessageListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListener.cs similarity index 79% rename from src/Spring/Spring.Core/antlr/debug/MessageListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListener.cs index a23c46b8..f53c8227 100644 --- a/src/Spring/Spring.Core/antlr/debug/MessageListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/MessageListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListenerBase.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/debug/MessageListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListenerBase.cs index 1746aae8..c8d5c7e8 100644 --- a/src/Spring/Spring.Core/antlr/debug/MessageListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/NewLineEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineEventArgs.cs similarity index 90% rename from src/Spring/Spring.Core/antlr/debug/NewLineEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineEventArgs.cs index 236c3ec4..953ea5d7 100644 --- a/src/Spring/Spring.Core/antlr/debug/NewLineEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/NewLineListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineListener.cs similarity index 72% rename from src/Spring/Spring.Core/antlr/debug/NewLineListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineListener.cs index 6c441a83..7b38b37b 100644 --- a/src/Spring/Spring.Core/antlr/debug/NewLineListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParseTreeDebugParser.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParseTreeDebugParser.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/debug/ParseTreeDebugParser.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParseTreeDebugParser.cs index eeb2f1dc..5a6d27b8 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParseTreeDebugParser.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParseTreeDebugParser.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { /* ANTLR Translator Generator diff --git a/src/Spring/Spring.Core/antlr/debug/ParserController.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserController.cs similarity index 77% rename from src/Spring/Spring.Core/antlr/debug/ParserController.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserController.cs index cef541e2..8519b8dc 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserController.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserController.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserEventSupport.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserEventSupport.cs similarity index 99% rename from src/Spring/Spring.Core/antlr/debug/ParserEventSupport.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserEventSupport.cs index ab30657b..ab136bd7 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserEventSupport.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserEventSupport.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; using System.Reflection; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListener.cs similarity index 79% rename from src/Spring/Spring.Core/antlr/debug/ParserListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListener.cs index f3e7ccd1..395cf345 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListenerBase.cs similarity index 98% rename from src/Spring/Spring.Core/antlr/debug/ParserListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListenerBase.cs index 296ad295..da934915 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserMatchEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchEventArgs.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/debug/ParserMatchEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchEventArgs.cs index aaaaf57c..f86fcccc 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserMatchEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserMatchListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListener.cs similarity index 86% rename from src/Spring/Spring.Core/antlr/debug/ParserMatchListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListener.cs index 00c518a3..830f29a4 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserMatchListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserMatchListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListenerBase.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/debug/ParserMatchListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListenerBase.cs index dc076869..48e7ccc6 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserMatchListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserReporter.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserReporter.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/debug/ParserReporter.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserReporter.cs index 1650c5bf..9b2be158 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserReporter.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserReporter.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserTokenEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenEventArgs.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/debug/ParserTokenEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenEventArgs.cs index db4a60d7..09c7d0dc 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserTokenEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserTokenListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenListener.cs similarity index 79% rename from src/Spring/Spring.Core/antlr/debug/ParserTokenListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenListener.cs index ac773717..fe28f714 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserTokenListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ParserTokenListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenListenerBase.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/debug/ParserTokenListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenListenerBase.cs index 39ba2f2b..e7abe48c 100644 --- a/src/Spring/Spring.Core/antlr/debug/ParserTokenListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/ScannerEventSupport.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ScannerEventSupport.cs similarity index 99% rename from src/Spring/Spring.Core/antlr/debug/ScannerEventSupport.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ScannerEventSupport.cs index 790ca4ea..c8e3b60d 100644 --- a/src/Spring/Spring.Core/antlr/debug/ScannerEventSupport.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ScannerEventSupport.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; using System.Reflection; diff --git a/src/Spring/Spring.Core/antlr/debug/SemanticPredicateEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateEventArgs.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/debug/SemanticPredicateEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateEventArgs.cs index 036c91e9..8b835f55 100644 --- a/src/Spring/Spring.Core/antlr/debug/SemanticPredicateEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/SemanticPredicateListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateListener.cs similarity index 77% rename from src/Spring/Spring.Core/antlr/debug/SemanticPredicateListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateListener.cs index e6fda109..dacbdf04 100644 --- a/src/Spring/Spring.Core/antlr/debug/SemanticPredicateListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/SemanticPredicateListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateListenerBase.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/debug/SemanticPredicateListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateListenerBase.cs index b9097bbb..dd13a0ad 100644 --- a/src/Spring/Spring.Core/antlr/debug/SemanticPredicateListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SemanticPredicateListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/SyntacticPredicateEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateEventArgs.cs similarity index 86% rename from src/Spring/Spring.Core/antlr/debug/SyntacticPredicateEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateEventArgs.cs index 7beceadf..cae3e0af 100644 --- a/src/Spring/Spring.Core/antlr/debug/SyntacticPredicateEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/SyntacticPredicateListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateListener.cs similarity index 87% rename from src/Spring/Spring.Core/antlr/debug/SyntacticPredicateListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateListener.cs index b0bccca3..8db60bac 100644 --- a/src/Spring/Spring.Core/antlr/debug/SyntacticPredicateListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/SyntacticPredicateListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateListenerBase.cs similarity index 97% rename from src/Spring/Spring.Core/antlr/debug/SyntacticPredicateListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateListenerBase.cs index f627e0e5..ae5659df 100644 --- a/src/Spring/Spring.Core/antlr/debug/SyntacticPredicateListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/SyntacticPredicateListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/TraceEventArgs.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceEventArgs.cs similarity index 95% rename from src/Spring/Spring.Core/antlr/debug/TraceEventArgs.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceEventArgs.cs index d5747177..10aaa098 100644 --- a/src/Spring/Spring.Core/antlr/debug/TraceEventArgs.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceEventArgs.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/TraceListener.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceListener.cs similarity index 78% rename from src/Spring/Spring.Core/antlr/debug/TraceListener.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceListener.cs index 3546e320..48237ca3 100644 --- a/src/Spring/Spring.Core/antlr/debug/TraceListener.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceListener.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/TraceListenerBase.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceListenerBase.cs similarity index 96% rename from src/Spring/Spring.Core/antlr/debug/TraceListenerBase.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceListenerBase.cs index 01325ea7..8a658db9 100644 --- a/src/Spring/Spring.Core/antlr/debug/TraceListenerBase.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/TraceListenerBase.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/antlr/debug/Tracer.cs b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Tracer.cs similarity index 93% rename from src/Spring/Spring.Core/antlr/debug/Tracer.cs rename to src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Tracer.cs index 1e474575..3f4edd5e 100644 --- a/src/Spring/Spring.Core/antlr/debug/Tracer.cs +++ b/src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Tracer.cs @@ -1,4 +1,4 @@ -namespace antlr.debug +namespace Spring.Expressions.Parser.antlr.debug { using System; diff --git a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs index 3e70aeed..c0a63acc 100644 --- a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs +++ b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs @@ -20,7 +20,7 @@ using System; using System.Runtime.Serialization; -using antlr.collections; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/SpringAST.cs b/src/Spring/Spring.Core/Expressions/SpringAST.cs index 0feaeff4..8ef1aa31 100644 --- a/src/Spring/Spring.Core/Expressions/SpringAST.cs +++ b/src/Spring/Spring.Core/Expressions/SpringAST.cs @@ -1,7 +1,7 @@ using System; -using System.Runtime.Serialization; -using antlr; -using antlr.collections; +using System.Runtime.Serialization; +using Spring.Expressions.Parser.antlr; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { @@ -17,13 +17,13 @@ namespace Spring.Expressions /// data during serialization. /// [Serializable] - public class SpringAST : antlr.BaseAST, ISerializable + public class SpringAST : Parser.antlr.BaseAST, ISerializable { #region Global SpringAST Factory - internal class SpringASTCreator : antlr.ASTNodeCreator + internal class SpringASTCreator : Parser.antlr.ASTNodeCreator { - public override antlr.collections.AST Create() + public override Parser.antlr.collections.AST Create() { return new SpringAST(); } diff --git a/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs b/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs index fc01ac42..5c08a6a6 100644 --- a/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs +++ b/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs @@ -18,14 +18,9 @@ #endregion -#region Imports - using System; -using System.Globalization; using System.Runtime.Serialization; -using antlr; - -#endregion +using Spring.Expressions.Parser.antlr; namespace Spring.Expressions { @@ -36,7 +31,7 @@ namespace Spring.Expressions [Serializable] internal class SyntaxErrorException : RecognitionException, ISerializable { - private string _expression; + private readonly string _expression; /// /// diff --git a/src/Spring/Spring.Core/Expressions/TernaryNode.cs b/src/Spring/Spring.Core/Expressions/TernaryNode.cs index a9850b90..3f3a58b9 100644 --- a/src/Spring/Spring.Core/Expressions/TernaryNode.cs +++ b/src/Spring/Spring.Core/Expressions/TernaryNode.cs @@ -20,7 +20,7 @@ using System; using System.Runtime.Serialization; -using antlr.collections; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Expressions/TypeNode.cs b/src/Spring/Spring.Core/Expressions/TypeNode.cs index d6d15f4f..fe931c0b 100644 --- a/src/Spring/Spring.Core/Expressions/TypeNode.cs +++ b/src/Spring/Spring.Core/Expressions/TypeNode.cs @@ -20,9 +20,8 @@ using System; using System.Runtime.Serialization; - -using antlr.collections; using Spring.Core.TypeResolution; +using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions { diff --git a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs index efac9e76..8b7c996d 100644 --- a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs +++ b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs @@ -18,23 +18,19 @@ #endregion -#region Imports - using System; using System.Collections; using System.ComponentModel; using System.Reflection; using System.Text; -using antlr; using Common.Logging; using Spring.Core; using Spring.Expressions; +using Spring.Expressions.Parser.antlr; using Spring.Util; using StringUtils=Spring.Util.StringUtils; -#endregion - namespace Spring.Objects { /// diff --git a/src/Spring/Spring.Core/Objects/PropertyValue.cs b/src/Spring/Spring.Core/Objects/PropertyValue.cs index 104bc60d..d7cda1b8 100644 --- a/src/Spring/Spring.Core/Objects/PropertyValue.cs +++ b/src/Spring/Spring.Core/Objects/PropertyValue.cs @@ -18,18 +18,13 @@ #endregion -#region Imports - using System; using System.Globalization; - -using antlr; using Spring.Core; using Spring.Expressions; +using Spring.Expressions.Parser.antlr; using Spring.Util; -#endregion - namespace Spring.Objects { /// @@ -54,9 +49,9 @@ namespace Spring.Objects [Serializable] public class PropertyValue { - private string propertyName; + private readonly string propertyName; + private readonly object propertyValue; private IExpression propertyExpression; - private object propertyValue; /// /// Creates a new instance of the diff --git a/src/Spring/Spring.Core/README_ANTLR.txt b/src/Spring/Spring.Core/README_ANTLR.txt index 60d85d01..aa42f390 100644 --- a/src/Spring/Spring.Core/README_ANTLR.txt +++ b/src/Spring/Spring.Core/README_ANTLR.txt @@ -5,4 +5,16 @@ ---------- *) Added codebase version 2.7.6 of antlr -*) had to move ::SupportClass to namespace "antlr" \ No newline at end of file +*) had to move ::SupportClass to namespace "antlr" +*) Replaced Method antlr.InputBuffer.LA(int i) with + + public virtual char LA(int i) + { + fill(i); + if ((this.markerOffset + i) <= this.queue.Count) + { + return (char)this.queue[(this.markerOffset + i) - 1]; + } + return CharScanner.EOF_CHAR; + } +*) renamed namespaces "antlr.*" to "Spring.Expressions.Parser.antrl.*" diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj index e92ec427..a70fb52a 100644 --- a/src/Spring/Spring.Core/Spring.Core.2008.csproj +++ b/src/Spring/Spring.Core/Spring.Core.2008.csproj @@ -1,7 +1,7 @@  Local - 9.0.21022 + 9.0.30729 2.0 {710961A3-0DF4-49E4-A26E-F5B9C044AC84} Debug @@ -102,107 +102,6 @@ CommonAssemblyInfo.cs Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code @@ -460,6 +359,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs index 9c1e9e62..b0a0c73d 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs @@ -34,16 +34,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Web.Services; -using antlr; -using antlr.collections; using NUnit.Framework; -//using NUnit.Framework.SyntaxHelpers; using Spring.Collections; using Spring.Context; using Spring.Context.Support; using Spring.Core; using Spring.Core.TypeResolution; using Spring.Expressions; +using Spring.Expressions.Parser.antlr; +using Spring.Expressions.Parser.antlr.collections; using Spring.Expressions.Processors; using Spring.Objects; using Spring.Objects.Factory; @@ -401,7 +400,6 @@ namespace Spring.Expressions Assert.AreEqual(Int64.MaxValue.ToString(), ExpressionEvaluator.GetValue(null, Int64.MaxValue.ToString() + ".ToString()")); Assert.AreEqual(Int64.MaxValue.ToString(), ExpressionEvaluator.GetValue(null, "long.MaxValue.ToString()")); - // TODO (EE): THIS ANTLR TEST FAILS SINCE SOURCECODE MERGE!!!!!! object int64 = ExpressionEvaluator.GetValue(null, Int64.MaxValue.ToString()); Assert.AreEqual(int64, Int64.MaxValue); Assert.IsTrue(int64 is Int64); diff --git a/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs b/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs index 469717af..030ff998 100644 --- a/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs +++ b/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs @@ -78,7 +78,7 @@ namespace Spring foreach (Type t in a.GetTypes ()) { // TODO: make antlr compliant - if (t.FullName.StartsWith("antlr")) continue; + if (t.FullName.IndexOf(".antlr.")>-1) continue; if ( (t.IsPublic||t.IsNestedPublic) && IsCheckedType (t)) {