Skip to content

Commit 850fb70

Browse files
fix(grammar): use TokenMgrException instead of old TokenMgrError
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent ca2b3d7 commit 850fb70

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
289289
}
290290

291291
return true;
292-
} catch (TokenMgrError e) {
292+
} catch (TokenMgrException e) {
293293
return false;
294294
}
295295
}
@@ -309,7 +309,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
309309
try {
310310
int kind = getToken(1).kind;
311311
return kind == K_SELECT || kind == K_WITH || kind == K_VALUES;
312-
} catch (TokenMgrError e) {
312+
} catch (TokenMgrException e) {
313313
return false;
314314
}
315315
}
@@ -423,7 +423,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
423423
// by LOOKAHEAD(2, Dialect.EXASOL...) SubImport() - must NOT go into ParenthesedFromItem
424424
if (k2 == K_IMPORT) return false;
425425
return true;
426-
} catch (TokenMgrError e) { return false; }
426+
} catch (TokenMgrException e) { return false; }
427427
}
428428

429429
// True when ( (SELECT ...) UNION/INTERSECT/EXCEPT (SELECT ...) ) — a set-operation
@@ -444,7 +444,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
444444
int depth = i - 2; // brackets from position 2 to i-1 inclusive
445445
i++;
446446
while (i <= 500) {
447-
Token t; try { t = getToken(i); } catch (TokenMgrError e) { return false; }
447+
Token t; try { t = getToken(i); } catch (TokenMgrException e) { return false; }
448448
if (t == null || t.kind == 0) return false;
449449
if (t.kind == OPENING_BRACKET) depth++;
450450
else if (t.kind == CLOSING_BRACKET) {
@@ -454,19 +454,19 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
454454
}
455455
if (i > 500) return false;
456456
// Token at position i+1 follows the innermost closing )
457-
Token next; try { next = getToken(i + 1); } catch (TokenMgrError e) { return false; }
457+
Token next; try { next = getToken(i + 1); } catch (TokenMgrException e) { return false; }
458458
if (next == null) return false;
459459
return next.kind == K_UNION || next.kind == K_INTERSECT ||
460460
next.kind == K_EXCEPT || next.kind == K_MINUS;
461-
} catch (TokenMgrError e) { return false; }
461+
} catch (TokenMgrException e) { return false; }
462462
}
463463

464464
protected boolean isParenthesedSelectAhead() {
465465
try {
466466
if (getToken(1).kind != OPENING_BRACKET) return false;
467467
int k = getToken(2).kind;
468468
return k == K_SELECT || k == K_WITH || k == K_VALUES;
469-
} catch (TokenMgrError e) {
469+
} catch (TokenMgrException e) {
470470
return false;
471471
}
472472
}
@@ -491,7 +491,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
491491
int k5 = getToken(5).kind;
492492
if (k5 != S_LONG) return false; // DATA_TYPE(N, expr) - function call
493493
return getToken(6).kind == CLOSING_BRACKET; // DATA_TYPE(N,M) - precision cast
494-
} catch (TokenMgrError e) {
494+
} catch (TokenMgrException e) {
495495
return false;
496496
}
497497
}
@@ -523,7 +523,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
523523
}
524524
// Otherwise assume it is a CASE expression with a switch value
525525
return true;
526-
} catch (TokenMgrError e) {
526+
} catch (TokenMgrException e) {
527527
return false;
528528
}
529529
}

0 commit comments

Comments
 (0)