From c8659309736da91daf70467ba25ffcdf9bb2145c Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Mon, 18 Feb 2013 19:34:29 -0600 Subject: [PATCH] Updated annotations in RecognitionException --- Antlr4.Runtime/DefaultErrorStrategy.cs | 8 +-- Antlr4.Runtime/FailedPredicateException.cs | 2 +- Antlr4.Runtime/InputMismatchException.cs | 2 +- Antlr4.Runtime/LexerNoViableAltException.cs | 12 ++-- Antlr4.Runtime/NoViableAltException.cs | 2 +- Antlr4.Runtime/RecognitionException.cs | 65 +++++++++++++-------- Antlr4.Runtime/Recognizer`2.cs | 4 +- reference/antlr4 | 2 +- 8 files changed, 57 insertions(+), 40 deletions(-) diff --git a/Antlr4.Runtime/DefaultErrorStrategy.cs b/Antlr4.Runtime/DefaultErrorStrategy.cs index b065afbf9..b5f88d6b3 100644 --- a/Antlr4.Runtime/DefaultErrorStrategy.cs +++ b/Antlr4.Runtime/DefaultErrorStrategy.cs @@ -129,7 +129,7 @@ namespace Antlr4.Runtime { if (recognizer != null) { - recognizer.NotifyErrorListeners(e.GetOffendingToken(), message, e); + recognizer.NotifyErrorListeners(e.OffendingToken, message, e); } } @@ -255,7 +255,7 @@ namespace Antlr4.Runtime } else { - input = tokens.GetText(e.GetStartToken(), e.GetOffendingToken()); + input = tokens.GetText(e.GetStartToken(), e.OffendingToken); } } else @@ -270,8 +270,8 @@ namespace Antlr4.Runtime public virtual void ReportInputMismatch(Parser recognizer, InputMismatchException e) { - string msg = "mismatched input " + GetTokenErrorDisplay(e.GetOffendingToken()) + - " expecting " + e.GetExpectedTokens().ToString(recognizer.TokenNames); + string msg = "mismatched input " + GetTokenErrorDisplay(e.OffendingToken) + " expecting " + + e.GetExpectedTokens().ToString(recognizer.TokenNames); NotifyErrorListeners(recognizer, msg, e); } diff --git a/Antlr4.Runtime/FailedPredicateException.cs b/Antlr4.Runtime/FailedPredicateException.cs index 7403f2e53..56635b41e 100644 --- a/Antlr4.Runtime/FailedPredicateException.cs +++ b/Antlr4.Runtime/FailedPredicateException.cs @@ -78,7 +78,7 @@ namespace Antlr4.Runtime this.predicateIndex = 0; } this.predicate = predicate; - this.SetOffendingToken(recognizer.CurrentToken); + this.OffendingToken = recognizer.CurrentToken; } public virtual int GetRuleIndex() diff --git a/Antlr4.Runtime/InputMismatchException.cs b/Antlr4.Runtime/InputMismatchException.cs index a64b3ebad..6fdfb93b7 100644 --- a/Antlr4.Runtime/InputMismatchException.cs +++ b/Antlr4.Runtime/InputMismatchException.cs @@ -48,7 +48,7 @@ namespace Antlr4.Runtime public InputMismatchException(Parser recognizer) : base(recognizer, ((ITokenStream )recognizer.InputStream), recognizer._ctx) { - this.SetOffendingToken(recognizer.CurrentToken); + this.OffendingToken = recognizer.CurrentToken; } } } diff --git a/Antlr4.Runtime/LexerNoViableAltException.cs b/Antlr4.Runtime/LexerNoViableAltException.cs index baa8bb786..63c21b45b 100644 --- a/Antlr4.Runtime/LexerNoViableAltException.cs +++ b/Antlr4.Runtime/LexerNoViableAltException.cs @@ -65,18 +65,20 @@ namespace Antlr4.Runtime return deadEndConfigs; } - public override IIntStream GetInputStream() + public override IIntStream InputStream { - return (ICharStream)base.GetInputStream(); + get + { + return (ICharStream)base.InputStream; + } } public override string ToString() { string symbol = string.Empty; - if (startIndex >= 0 && startIndex < ((ICharStream)GetInputStream()).Size) + if (startIndex >= 0 && startIndex < ((ICharStream)InputStream).Size) { - symbol = ((ICharStream)GetInputStream()).GetText(Interval.Of(startIndex, startIndex - )); + symbol = ((ICharStream)InputStream).GetText(Interval.Of(startIndex, startIndex)); symbol = Utils.EscapeWhitespace(symbol, false); } return string.Format("%s('%s')", typeof(Antlr4.Runtime.LexerNoViableAltException) diff --git a/Antlr4.Runtime/NoViableAltException.cs b/Antlr4.Runtime/NoViableAltException.cs index 40a1953dd..0263df3bf 100644 --- a/Antlr4.Runtime/NoViableAltException.cs +++ b/Antlr4.Runtime/NoViableAltException.cs @@ -80,7 +80,7 @@ namespace Antlr4.Runtime // LL(1) error this.deadEndConfigs = deadEndConfigs; this.startToken = startToken; - this.SetOffendingToken(offendingToken); + this.OffendingToken = offendingToken; } public virtual IToken GetStartToken() diff --git a/Antlr4.Runtime/RecognitionException.cs b/Antlr4.Runtime/RecognitionException.cs index 5ab432d1e..dc5143555 100644 --- a/Antlr4.Runtime/RecognitionException.cs +++ b/Antlr4.Runtime/RecognitionException.cs @@ -47,7 +47,7 @@ namespace Antlr4.Runtime private const long serialVersionUID = -3861826954750022374L; /// Who threw the exception? - private Recognizer recognizer; + private Antlr4.Runtime.Recognizer recognizer; private RuleContext ctx; @@ -72,8 +72,8 @@ namespace Antlr4.Runtime this.input = input; } - public RecognitionException(Recognizer recognizer, IIntStream input - , ParserRuleContext ctx) + public RecognitionException(Antlr4.Runtime.Recognizer recognizer, + IIntStream input, ParserRuleContext ctx) { this.recognizer = recognizer; this.input = input; @@ -84,8 +84,8 @@ namespace Antlr4.Runtime } } - public RecognitionException(string message, Recognizer recognizer - , IIntStream input, ParserRuleContext ctx) : base(message) + public RecognitionException(string message, Antlr4.Runtime.Recognizer recognizer, IIntStream input, ParserRuleContext ctx) : base(message) { this.recognizer = recognizer; this.input = input; @@ -107,14 +107,17 @@ namespace Antlr4.Runtime /// This will help us tie into the grammar and syntax diagrams in /// ANTLRWorks v2. /// - public virtual int GetOffendingState() + protected internal int OffendingState { - return offendingState; - } - - protected internal void SetOffendingState(int offendingState) - { - this.offendingState = offendingState; + get + { + return offendingState; + } + set + { + int offendingState = value; + this.offendingState = offendingState; + } } public virtual IntervalSet GetExpectedTokens() @@ -127,29 +130,41 @@ namespace Antlr4.Runtime return null; } - public virtual RuleContext GetCtx() + public virtual RuleContext Context { - return ctx; + get + { + return ctx; + } } - public virtual IIntStream GetInputStream() + public virtual IIntStream InputStream { - return input; + get + { + return input; + } } - public virtual IToken GetOffendingToken() + protected internal IToken OffendingToken { - return offendingToken; + get + { + return offendingToken; + } + set + { + IToken offendingToken = value; + this.offendingToken = offendingToken; + } } - protected internal void SetOffendingToken(IToken offendingToken) + public virtual Antlr4.Runtime.Recognizer Recognizer { - this.offendingToken = offendingToken; - } - - public virtual Recognizer GetRecognizer() - { - return recognizer; + get + { + return recognizer; + } } } } diff --git a/Antlr4.Runtime/Recognizer`2.cs b/Antlr4.Runtime/Recognizer`2.cs index 795a2ac51..f53dd3e61 100644 --- a/Antlr4.Runtime/Recognizer`2.cs +++ b/Antlr4.Runtime/Recognizer`2.cs @@ -111,8 +111,8 @@ namespace Antlr4.Runtime /// What is the error header, normally line/character position information? public virtual string GetErrorHeader(RecognitionException e) { - int line = e.GetOffendingToken().Line; - int charPositionInLine = e.GetOffendingToken().Column; + int line = e.OffendingToken.Line; + int charPositionInLine = e.OffendingToken.Column; return "line " + line + ":" + charPositionInLine; } diff --git a/reference/antlr4 b/reference/antlr4 index 65817b672..e4d1c14c8 160000 --- a/reference/antlr4 +++ b/reference/antlr4 @@ -1 +1 @@ -Subproject commit 65817b672a2f47c8c51530eb699295c41fb572ec +Subproject commit e4d1c14c8df3f27105e3bbf935d49f500bc3552e