Commit 082f04b5 authored by Grégory Mantelet's avatar Grégory Mantelet
Browse files

[ADQL] Fix the "try-fix" feature with regular identifiers. 

Fixes #121
parent 4ed8ef74

src/adql/parser/ADQLParser.java

+388 −581

File changed.

Preview size limit exceeded, changes collapsed.

src/adql/parser/ADQLParserTokenManager.java

+744 −732

File changed.

Preview size limit exceeded, changes collapsed.

src/adql/parser/adqlGrammar.jj

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
* printed else it will be the message "Correct syntax".

*

*  Author:  Grégory Mantelet (CDS;ARI)

*  Version: 1.5-1 (07/2019)

*  Version: 1.5-2 (10/2020)

*/



							/* ########### */
@@ -119,7 +119,7 @@ import adql.translator.TranslationException; 
* @see ADQLQueryFactory

*

* @author Grégory Mantelet (CDS;ARI)

* @version 1.5-1 (07/2019)

* @version 1.5-2 (10/2020)

*/

public class ADQLParser {
@@ -1221,7 +1221,7 @@ TOKEN : { 


TOKEN : {

	< REGULAR_IDENTIFIER_CANDIDATE: ((<Letter>)+ (<DIGIT> | <Letter>)* | (<DIGIT>)+ <Letter> (<DIGIT> | <Letter>)*) >

|	< #Letter: ["a"-"z","A"-"Z","_","?","!","$","@","^","#","`","~","[","]","{","}"] >

|	< #Letter: ["a"-"z","A"-"Z","_","?","$","@","^","#","`","~","[","]","{","}"] >

}



							/* ########## */

test/adql/parser/TestADQLParser.java

+73 −73
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ public class TestADQLParser { 
		}



		// CASE: Invalid UDF name => ParseException

		final String[] functionsToTest = new String[]{ "_foo", "2do", "do!" };

		final String[] functionsToTest = new String[]{ "_foo", "2do", "do?" };

		for(String fct : functionsToTest) {

			try {

				parser.parseQuery("SELECT " + fct + "(p1,p2) FROM aTable");