Skip to content

Retain escape sequences in lexer, fixes #5 #21

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
adamdickmeiss merged 2 commits into from
Oct 24, 2025
Merged

Retain escape sequences in lexer, fixes #5 #21

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
7bc4883
Retain escape sequences in lexer, fixes #5
adamdickmeiss Oct 10, 2025
f09d98e
Consider the unlikely bare double quote
adamdickmeiss Oct 21, 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
2 changes: 1 addition & 1 deletion src/main/java/org/z3950/zing/cql/CQLGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private String generate_base_relation() throws MissingParameterException {
private String generate_term() {
switch (rnd.nextInt(10)) {
case 0: return "cat";
case 1: return "\"cat\"";
case 1: return "\"cat\\\""; // A term with both bare quotes and escaped quotes
case 2: return "comp.os.linux";
case 3: return "xml:element";
case 4: return "<xml.element>";
Expand Down
16 changes: 6 additions & 10 deletions src/main/java/org/z3950/zing/cql/CQLLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,15 @@ else if (comp.equals("<>")) {
//remember quote char
char mark = c;
qi++;
boolean escaped = false;
buf.setLength(0); //reset buffer
while (qi < ql) {
if (!escaped && qs.charAt(qi) == mark) //terminator
break;
if (escaped && strchr("*?^\\", qs.charAt(qi))) //no escaping for d-quote
buf.append("\\");
if (!escaped && qs.charAt(qi) == '\\') { //escape-char
escaped = true;
while (qi < ql && qs.charAt(qi) != mark) {
if (qs.charAt(qi) == '\\') { //escape-char
if (qi == ql - 1) {
break; //unterminated
}
buf.append(qs.charAt(qi));
Copy link
Contributor

@MikeTaylor MikeTaylor Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the intent of this section at all. It looks like it can't lex "a\"b" at all, but will return the string a. Am I wrong?

Copy link
Contributor Author

@adamdickmeiss adamdickmeiss Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

bin/CQLParser 
"a\"b"
<searchClause>
  <index>cql.serverChoice</index>
  <relation>
    <value>=</value>
  </relation>
  <term>a\"b</term>
</searchClause>

Copy link
Contributor

@MikeTaylor MikeTaylor Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, good to see. My code-reading foo is depressed.

qi++;
continue;
}
escaped = false; //reset escape
buf.append(qs.charAt(qi));
qi++;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/z3950/zing/cql/CQLTermNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static String maybeQuote(String str) {
str.indexOf('/') != -1 ||
str.indexOf('(') != -1 ||
str.indexOf(')') != -1) {
str = '"' + str.replace("\"", "\\\"") + '"';
str = '"' + str.replaceAll("(?<!\\\\)\"", "\\\\\"") + '"';
}

return str;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/regression/06/03.xcql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<relation>
<value>=</value>
</relation>
<term>^cat says "fish"</term>
<term>^cat says \"fish\"</term>
</searchClause>
2 changes: 1 addition & 1 deletion src/test/resources/regression/06/06.xcql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<relation>
<value>=</value>
</relation>
<term>^cat*fishdog"horse?</term>
<term>^cat*fishdog\"horse?</term>
</searchClause>
2 changes: 1 addition & 1 deletion src/test/resources/regression/12/01.xcql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<relation>
<value>=</value>
</relation>
<term>term\*\?\^</term>
<term>te\rm\*\?\^</term>
</searchClause>