resolve contrib conflict
This commit is contained in:
commit
f662966ab8
|
@ -77,5 +77,6 @@ YYYY/MM/DD, github id, Full name, email
|
|||
2015/06/29, jvanzyl, Jason van Zyl, jason@takari.io
|
||||
2015/08/18, krzkaczor, Krzysztof Kaczor, krzysztof@kaczor.io
|
||||
2015/09/18, worsht, Rajiv Subrahmanyam, rajiv.public@gmail.com
|
||||
2015/10/06, brwml, Bryan Wilhelm, bryan.wilhelm@microsoft.com
|
||||
2015/10/08, fedotovalex, Alex Fedotov, me@alexfedotov.com
|
||||
2015/10/21, martin-probst, Martin Probst, martin-probst@web.de
|
||||
|
|
|
@ -119,13 +119,23 @@ using ParserRuleContext = Antlr4.Runtime.ParserRuleContext;
|
|||
public partial class <file.grammarName>BaseListener : I<file.grammarName>Listener {
|
||||
<file.listenerNames:{lname |
|
||||
/// \<summary>
|
||||
/// Enter a parse tree produced by \<see cref="<csIdentifier.(file.parserName)>.<csIdentifier.(lname)>"/>.
|
||||
<if(file.listenerLabelRuleNames.(lname))>
|
||||
/// Enter a parse tree produced by the \<c><lname>\</c>
|
||||
/// labeled alternative in \<see cref="<file.parserName>.<file.listenerLabelRuleNames.(lname)>"/>.
|
||||
<else>
|
||||
/// Enter a parse tree produced by \<see cref="<file.parserName>.<lname>"/>.
|
||||
<endif>
|
||||
/// \<para>The default implementation does nothing.\</para>
|
||||
/// \</summary>
|
||||
/// \<param name="context">The parse tree.\</param>
|
||||
public virtual void Enter<lname; format="cap">([NotNull] <csIdentifier.(file.parserName)>.<lname; format="cap">Context context) { \}
|
||||
/// \<summary>
|
||||
/// Exit a parse tree produced by \<see cref="<csIdentifier.(file.parserName)>.<csIdentifier.(lname)>"/>.
|
||||
<if(file.listenerLabelRuleNames.(lname))>
|
||||
/// Exit a parse tree produced by the \<c><lname>\</c>
|
||||
/// labeled alternative in \<see cref="<file.parserName>.<file.listenerLabelRuleNames.(lname)>"/>.
|
||||
<else>
|
||||
/// Exit a parse tree produced by \<see cref="<file.parserName>.<lname>"/>.
|
||||
<endif>
|
||||
/// \<para>The default implementation does nothing.\</para>
|
||||
/// \</summary>
|
||||
/// \<param name="context">The parse tree.\</param>
|
||||
|
@ -207,7 +217,12 @@ using ParserRuleContext = Antlr4.Runtime.ParserRuleContext;
|
|||
public partial class <file.grammarName>BaseVisitor\<Result> : AbstractParseTreeVisitor\<Result>, I<file.grammarName>Visitor\<Result> {
|
||||
<file.visitorNames:{lname |
|
||||
/// \<summary>
|
||||
/// Visit a parse tree produced by \<see cref="<csIdentifier.(file.parserName)>.<csIdentifier.(lname)>"/>.
|
||||
<if(file.visitorLabelRuleNames.(lname))>
|
||||
/// Visit a parse tree produced by the \<c><lname>\</c>
|
||||
/// labeled alternative in \<see cref="<file.parserName>.<file.visitorLabelRuleNames.(lname)>"/>.
|
||||
<else>
|
||||
/// Visit a parse tree produced by \<see cref="<file.parserName>.<lname>"/>.
|
||||
<endif>
|
||||
/// \<para>
|
||||
/// The default implementation returns the result of calling \<see cref="AbstractParseTreeVisitor{Result\}.VisitChildren(IRuleNode)"/>
|
||||
/// on \<paramref name="context"/>.
|
||||
|
@ -241,6 +256,8 @@ fileHeader(grammarFileName, ANTLRVersion) ::= <<
|
|||
#pragma warning disable 0219
|
||||
// Missing XML comment for publicly visible type or member '...'
|
||||
#pragma warning disable 1591
|
||||
// Ambiguous reference in cref attribute
|
||||
#pragma warning disable 419
|
||||
|
||||
>>
|
||||
|
||||
|
|
Loading…
Reference in New Issue