Skip to content

Fix QNAME grammar to match Turtle/SPARQL PN_LOCAL #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaillPierre merged 2 commits into from
Apr 24, 2025
Merged

Fix QNAME grammar to match Turtle/SPARQL PN_LOCAL #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41e1bb4
FIX: QNAME grammar now accepts full PN_LOCAL (dots, escapes, %hh)
remiceres Apr 23, 2025
5dd2fd7
Fix #133
remiceres Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/main/java/fr/inria/corese/core/sparql/triple/javacc1/SparqlCoreseTokenManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3477,7 +3477,7 @@ else if (curChar == 39)
{ jjCheckNAddTwoStates(142, 143); }
break;
case 142:
if ((0x3ff200000000000L & l) == 0L)
if ((0x3ff600000000000L & l) == 0L)
break;
if (kind > 10)
kind = 10;
Expand Down Expand Up @@ -4103,6 +4103,13 @@ else if (curChar == 95)
if ((0x7fffffe87fffffeL & l) != 0L)
{ jjCheckNAdd(141); }
break;
case 142:
if (curChar != 95)
break;
if (kind > 10)
kind = 10;
{ jjAddStates(90, 91); }
break;
case 143:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
Expand All @@ -4120,7 +4127,7 @@ else if (curChar == 95)
break;
case 146:
if (curChar == 92)
{ jjAddStates(90, 91); }
{ jjAddStates(92, 93); }
break;
case 147:
if ((0x4000000080000001L & l) != 0L)
Expand Down Expand Up @@ -4148,15 +4155,15 @@ else if (curChar == 95)
break;
case 162:
if ((0x2000000020L & l) != 0L)
{ jjAddStates(92, 93); }
{ jjAddStates(94, 95); }
break;
case 169:
if ((0x2000000020L & l) != 0L)
{ jjAddStates(94, 95); }
{ jjAddStates(96, 97); }
break;
case 173:
if ((0x2000000020L & l) != 0L)
{ jjAddStates(96, 97); }
{ jjAddStates(98, 99); }
break;
default : break;
}
Expand Down Expand Up @@ -4417,8 +4424,8 @@ protected Token jjFillToken()
86, 87, 89, 106, 107, 108, 110, 111, 113, 131, 132, 136, 137, 139, 140, 144,
145, 146, 148, 149, 151, 166, 167, 172, 173, 31, 32, 41, 136, 137, 138, 139,
140, 141, 6, 7, 12, 13, 10, 14, 15, 11, 17, 18, 10, 11, 48, 50,
59, 66, 68, 77, 85, 90, 99, 109, 114, 123, 147, 153, 163, 164, 170, 171,
174, 175,
59, 66, 68, 77, 85, 90, 99, 109, 114, 123, 142, 143, 147, 153, 163, 164,
170, 171, 174, 175,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/inria/corese/core/sparql/triple/javacc1/sparql_corese.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,7 +2971,7 @@ TOKEN:

| <QNAME_NS: (<NCNAME_PREFIX>)? ":" >

| <QNAME: (<NCNAME_PREFIX>)? ":" (["0"-"9"] | "-")* (<NCNAME>)? >
| <QNAME: (<NCNAME_PREFIX>)? ":" (["0"-"9"] | "-" | "_" | ".")* (<NCNAME>)? >

| <BLANK_NODE_LABEL: "_:" ( ["0"-"9"] | <BLANKNAME> ) ( (<BLANKNAME> | ".")* <BLANKNAME> ) ? >

Expand Down Expand Up @@ -3351,7 +3351,7 @@ TOKEN:
|
// With a leading "_", no dot at end of local name.

<#NCNAME: <NCCHAR1> ((<NCCHAR> | "." | ":" | "_" | <LOCAL_ESC> | <PERCENT> )* (<NCCHAR> | ":" | <LOCAL_ESC> | <PERCENT> ))? >
<#NCNAME: <NCCHAR1> ((<NCCHAR> | "." | ":" | "_" | <LOCAL_ESC> | <PERCENT> )* (<NCCHAR> | ":" | <LOCAL_ESC> | <PERCENT> ))? >
|


Expand Down