jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Fix "misMatched"

This commit is contained in:
Will Faught 2016-05-26 11:35:49 -07:00
parent 08c17b850e
commit 103dc662c4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/Go/src/antlr/ErrorStrategy.go
View File

@ -298,7 +298,7 @@ func (d *DefaultErrorStrategy) ReportNoViableAlternative(recognizer Parser, e *N
// @param e the recognition exception
//
func (d *DefaultErrorStrategy) ReportInputMisMatch(recognizer Parser, e *InputMisMatchException) {
var msg = "misMatched input " + d.GetTokenErrorDisplay(e.offendingToken) +
var msg = "mismatched input " + d.GetTokenErrorDisplay(e.offendingToken) +
" expecting " + e.getExpectedTokens().StringVerbose(recognizer.GetLiteralNames(), recognizer.GetSymbolicNames(), false)
recognizer.NotifyErrorListeners(msg, e.offendingToken, e)
}
@ -325,7 +325,7 @@ func (d *DefaultErrorStrategy) ReportFailedPredicate(recognizer Parser, e *Faile
// {@code recognizer} is in error recovery mode.
//
// <p>This method is called when {@link //singleTokenDeletion} identifies
// single-token deletion as a viable recovery strategy for a misMatched
// single-token deletion as a viable recovery strategy for a mismatched
// input error.</p>
//
// <p>The default implementation simply returns if the handler is already in
@ -354,7 +354,7 @@ func (d *DefaultErrorStrategy) ReportUnwantedToken(recognizer Parser) {
// method returns, {@code recognizer} is in error recovery mode.
//
// <p>This method is called when {@link //singleTokenInsertion} identifies
// single-token insertion as a viable recovery strategy for a misMatched
// single-token insertion as a viable recovery strategy for a mismatched
// input error.</p>
//
// <p>The default implementation simply returns if the handler is already in
@ -376,7 +376,7 @@ func (d *DefaultErrorStrategy) ReportMissingToken(recognizer Parser) {
recognizer.NotifyErrorListeners(msg, t, nil)
}
// <p>The default implementation attempts to recover from the misMatched input
// <p>The default implementation attempts to recover from the mismatched input
// by using single token insertion and deletion as described below. If the
// recovery attempt fails, d method panics an
// {@link InputMisMatchException}.</p>
@ -445,7 +445,7 @@ func (d *DefaultErrorStrategy) RecoverInline(recognizer Parser) Token {
//
// This method implements the single-token insertion inline error recovery
// strategy. It is called by {@link //recoverInline} if the single-token
// deletion strategy fails to recover from the misMatched input. If d
// deletion strategy fails to recover from the mismatched input. If d
// method returns {@code true}, {@code recognizer} will be in error recovery
// mode.
//
@ -457,7 +457,7 @@ func (d *DefaultErrorStrategy) RecoverInline(recognizer Parser) Token {
//
// @param recognizer the parser instance
// @return {@code true} if single-token insertion is a viable recovery
// strategy for the current misMatched input, otherwise {@code false}
// strategy for the current mismatched input, otherwise {@code false}
//
func (d *DefaultErrorStrategy) singleTokenInsertion(recognizer Parser) bool {
var currentSymbolType = recognizer.GetTokenStream().LA(1)
@ -478,7 +478,7 @@ func (d *DefaultErrorStrategy) singleTokenInsertion(recognizer Parser) bool {
// This method implements the single-token deletion inline error recovery
// strategy. It is called by {@link //recoverInline} to attempt to recover
// from misMatched input. If d method returns nil, the parser and error
// from mismatched input. If d method returns nil, the parser and error
// handler state will not have changed. If d method returns non-nil,
// {@code recognizer} will <em>not</em> be in error recovery mode since the
// returned token was a successful Match.
@ -491,7 +491,7 @@ func (d *DefaultErrorStrategy) singleTokenInsertion(recognizer Parser) bool {
//
// @param recognizer the parser instance
// @return the successfully Matched {@link Token} instance if single-token
// deletion successfully recovers from the misMatched input, otherwise
// deletion successfully recovers from the mismatched input, otherwise
// {@code nil}
//
func (d *DefaultErrorStrategy) singleTokenDeletion(recognizer Parser) Token {
@ -658,7 +658,7 @@ func (d *DefaultErrorStrategy) escapeWSAndQuote(s string) string {
// In d case, for input "[]", LA(1) is ']' and in the set, so we would
// not consume anything. After printing an error, rule c would
// return normally. Rule b would not find the required '^' though.
// At d point, it gets a misMatched token error and panics an
// At d point, it gets a mismatched token error and panics an
// exception (since LA(1) is not in the viable following token
// set). The rule exception handler tries to recover, but finds
// the same recovery set and doesn't consume anything. Rule b

4
runtime/Go/src/antlr/Errors.go
View File

@ -2,7 +2,7 @@ package antlr
// The root of the ANTLR exception hierarchy. In general, ANTLR tracks just
// 3 kinds of errors: prediction errors, failed predicate errors, and
// misMatched input errors. In each case, the parser knows where it is
// mismatched input errors. In each case, the parser knows where it is
// in the input, where it is in the ATN, the rule invocation stack,
// and what kind of problem occurred.
@ -171,7 +171,7 @@ type InputMisMatchException struct {
*BaseRecognitionException
}
// This signifies any kind of misMatched input exceptions such as
// This signifies any kind of mismatched input exceptions such as
// when the current input does not Match the expected token.
//
func NewInputMisMatchException(recognizer Parser) *InputMisMatchException {

4
runtime/Go/src/antlr/Parser.go
View File

@ -129,7 +129,7 @@ func (p *BaseParser) SetErrorHandler(e ErrorStrategy) {
// @return the Matched symbol
// @panics RecognitionException if the current input symbol did not Match
// {@code ttype} and the error strategy could not recover from the
// misMatched symbol
// mismatched symbol
func (p *BaseParser) Match(ttype int) Token {
@ -175,7 +175,7 @@ func (p *BaseParser) Match(ttype int) Token {
//
// @return the Matched symbol
// @panics RecognitionException if the current input symbol did not Match
// a wildcard and the error strategy could not recover from the misMatched
// a wildcard and the error strategy could not recover from the mismatched
// symbol
func (p *BaseParser) MatchWildcard() Token {