Projects >> antlr4 >>201db8b6d0c1b4072fe1df0e71e72783f0c3b757

Chunk
Conflicting content
	public Symbol getStart() { return start; }
	public String toString(@NotNull Recognizer recog, RuleContext stop) {
	public Symbol getStop() { return stop; }

<<<<<<< HEAD
	@Override
		if ( recog==null ) return super.toString(recog, stop);
		StringBuilder buf = new StringBuilder();
		RuleContext p = this;
		buf.append("[");
		String[] ruleNames = recog.getRuleNames();
		while ( p != null && p != stop ) {
			int ruleIndex = p.getRuleIndex();
			String ruleName = ruleIndex >= 0 && ruleIndex < ruleNames.length ? ruleNames[ruleIndex] : Integer.toString(ruleIndex);
			buf.append(ruleName);
			if ( p.parent != null ) buf.append(" ");
			p = p.parent;
		}
		buf.append("]");
		return buf.toString();
	}

=======
>>>>>>> dd12508f5d289c08c3259943024b208b675d42c6
    /** Used for rule context info debugging during parse-time, not so much for ATN debugging */
    public String toInfoString(Parser recognizer) {
        List rules = recognizer.getRuleInvocationStack(this);
Solution content
	public Symbol getStart() { return start; }
	public Symbol getStop() { return stop; }

    /** Used for rule context info debugging during parse-time, not so much for ATN debugging */
    public String toInfoString(Parser recognizer) {
        List rules = recognizer.getRuleInvocationStack(this);
File
ParserRuleContext.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration