Skip to content

Commit 18cdd94

Browse files
committed
Fix previously incorrect rule expansion
Reading worked but validating parsed query did not work, as suggested by @ValenberghsSven. Terminal expansion should have gone through ANON instead as suggested by @sergiofenoll. The raw rule expansion for ANON now scans correctly and previous expansion of the BNF has been removed.
1 parent d72aff6 commit 18cdd94

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

external/sparql.bnfsxp

+1-14
Original file line numberDiff line numberDiff line change
@@ -1435,24 +1435,11 @@
14351435
(follow "." "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES" "{" "}")
14361436
(cleanup opt)
14371437
(alt _empty PropertyListPathNotEmpty))
1438-
;; (rule PropertyListPathNotEmpty "83"
1439-
;; (first "!" "(" IRIREF PNAME_LN PNAME_NS VAR1 VAR2 "^" "a")
1440-
;; (follow "." "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES" "]"
1441-
;; "{" "}" )
1442-
;; (seq _PropertyListPathNotEmpty_1 ObjectListPath _PropertyListPathNotEmpty_2))
1443-
14441438
(rule PropertyListPathNotEmpty "83"
1445-
(first "!" "(" IRIREF PNAME_LN PNAME_NS VAR1 VAR2 "^" "a" _eps)
1446-
(follow "." "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES" "]"
1447-
"{" "}" )
1448-
(alt _empty _PropertyListPathNotEmpty_B))
1449-
1450-
(rule _PropertyListPathNotEmpty_B "83B"
14511439
(first "!" "(" IRIREF PNAME_LN PNAME_NS VAR1 VAR2 "^" "a")
14521440
(follow "." "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES" "]"
14531441
"{" "}" )
14541442
(seq _PropertyListPathNotEmpty_1 ObjectListPath _PropertyListPathNotEmpty_2))
1455-
14561443
(rule _PropertyListPathNotEmpty_1 "83.1"
14571444
(first "!" "(" IRIREF PNAME_LN PNAME_NS VAR1 VAR2 "^" "a")
14581445
(follow "(" ANON BLANK_NODE_LABEL DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE
@@ -7309,4 +7296,4 @@
73097296
VAR2 "YEAR" "[" _eof "false" "isBLANK" "isIRI" "isLITERAL" "isNUMERIC"
73107297
"isURI" "sameTerm" "true" "{" "||" "}" )
73117298
(seq _StrReplaceExpression_1 ")")) )
7312-
7299+

sparql-ast/terminals.lisp

-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,6 @@ failure."
707707
(char= char #.(support:hex-char "A"))
708708
(char= char #.(support:hex-char "9")))))
709709
do (incf position))
710-
(incf position)
711710
(when (char= (elt string position) right-char)
712711
(1+ position))))))
713712
(defun scan-nil (string start)

0 commit comments

Comments
 (0)