NOTE:

"Standard tab" (eg, extra-Institute) git.isis.v.e accounts currently require approval after registration. Please contact ISIS IT if needed.

Those with ISIS credentials should authenticate with via the "ISIS" tab.

Commit 3e73d877 authored Jul 20, 2018 by Fred Eisele

Merge branch 'antlr4parser' into recasting

parents aae06b63 4a95a29f

gen/catdata/aql/grammar/AqlLexerRules.java

+4 −0

Original line number	Diff line number	Diff line
		<<<<<<< HEAD
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/f90/-ru88jt/AqlLexerRules.g4 by ANTLR 4.7
		=======
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql1/gen_src/catdata/aql/grammar/gg1/-ru88jt/AqlLexerRules.g4 by ANTLR 4.7
		>>>>>>> antlr4parser
		package catdata.aql.grammar;
		import org.antlr.v4.runtime.Lexer;
		import org.antlr.v4.runtime.CharStream;

gen/catdata/aql/grammar/AqlParser.java

+4 −0

Original line number	Diff line number	Diff line
		<<<<<<< HEAD
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/f90/-ru88jt/AqlParser.g4 by ANTLR 4.7
		=======
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql1/gen_src/catdata/aql/grammar/gg1/-ru88jt/AqlParser.g4 by ANTLR 4.7
		>>>>>>> antlr4parser
		package catdata.aql.grammar;
		import org.antlr.v4.runtime.atn.*;
		import org.antlr.v4.runtime.dfa.DFA;

gen/catdata/aql/grammar/AqlParserBaseListener.java

+4 −0

Original line number	Diff line number	Diff line
		<<<<<<< HEAD
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/f90/-ru88jt/AqlParser.g4 by ANTLR 4.7
		=======
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql1/gen_src/catdata/aql/grammar/gg1/-ru88jt/AqlParser.g4 by ANTLR 4.7
		>>>>>>> antlr4parser
		package catdata.aql.grammar;

		import org.antlr.v4.runtime.ParserRuleContext;

gen/catdata/aql/grammar/AqlParserBaseVisitor.java

+4 −0

Original line number	Diff line number	Diff line
		<<<<<<< HEAD
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/f90/-ru88jt/AqlParser.g4 by ANTLR 4.7
		=======
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql1/gen_src/catdata/aql/grammar/gg1/-ru88jt/AqlParser.g4 by ANTLR 4.7
		>>>>>>> antlr4parser
		package catdata.aql.grammar;
		import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;

gen/catdata/aql/grammar/AqlParserListener.java

+4 −0

Original line number	Diff line number	Diff line
		<<<<<<< HEAD
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql2/gen_src/catdata/aql/grammar/f90/-ru88jt/AqlParser.g4 by ANTLR 4.7
		=======
		// Generated from /home/fred/.boot/cache/tmp/home/fred/github/fql1/gen_src/catdata/aql/grammar/gg1/-ru88jt/AqlParser.g4 by ANTLR 4.7
		>>>>>>> antlr4parser
		package catdata.aql.grammar;
		import org.antlr.v4.runtime.tree.ParseTreeListener;