Merge branch 'master' of github.com:antlr/antlr4

This commit is contained in:
parrt 2018-11-10 14:54:56 -08:00
commit a02c2fa5a6
5 changed files with 5 additions and 4 deletions

View File

@ -178,6 +178,7 @@ YYYY/MM/DD, github id, Full name, email
2017/12/01, DavidMoraisFerreira, David Morais Ferreira, david.moraisferreira@gmail.com
2017/12/01, SebastianLng, Sebastian Lang, sebastian.lang@outlook.com
2017/12/03, oranoran, Oran Epelbaum, oran / epelbaum me
2017/12/12, janlinde, Jan Lindemann, jan@janware.com
2017/12/13, enessoylu, Enes Soylu, enessoylutr@gmail.com
2017/12/20, kbsletten, Kyle Sletten, kbsletten@gmail.com
2017/12/27, jkmar, Jakub Marciniszyn, marciniszyn.jk@gmail.com

View File

@ -272,7 +272,7 @@ namespace antlr4 {
/// <seealso cref="#_ctx"/> get the current context.
virtual void enterRule(ParserRuleContext *localctx, size_t state, size_t ruleIndex);
virtual void exitRule();
void exitRule();
virtual void enterOuterAlt(ParserRuleContext *localctx, size_t altNum);

View File

@ -14,7 +14,7 @@ namespace atn {
class ANTLR4CPP_PUBLIC TokensStartState final : public DecisionState {
public:
virtual size_t getStateType();
virtual size_t getStateType() override;
};
} // namespace atn

View File

@ -70,7 +70,7 @@ namespace pattern {
/// are returned in the form {@code label:tag}, and unlabeled tags are
/// returned as just the tag name.
/// </summary>
virtual std::string toString();
virtual std::string toString() override;
private:
/// This is the backing field for <seealso cref="#getTag"/>.

View File

@ -43,7 +43,7 @@ namespace pattern {
/// The implementation for <seealso cref="TextChunk"/> returns the result of
/// <seealso cref="#getText()"/> in single quotes.
/// </summary>
virtual std::string toString();
virtual std::string toString() override;
};
} // namespace pattern