X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/8741d155d948c7317945eee423a977940cad995e..aeb017e4f4846f2e6a701e581d20eef84a8b83d9:/src/ctm/lexer.lisp diff --git a/src/ctm/lexer.lisp b/src/ctm/lexer.lisp index 04289a6..6f577ff 100644 --- a/src/ctm/lexer.lisp +++ b/src/ctm/lexer.lisp @@ -159,7 +159,7 @@ A dot followed by a digit can belong to a decimal; a terminal dot stays punctuat (loop while (name-part-p (peek-character lexer)) do (take-character lexer))) (make-token :kind :qname :value (subseq text start (lexer-cursor lexer)) :position start)) (t (make-token :kind :identifier :value head :position start))))) - ((find c ".;-=^:(),") (make-token :kind :punctuation :value c :position start)) + ((find c ".;-=^:(),@") (make-token :kind :punctuation :value c :position start)) ((char= c #\%) ;; Production [71] has a literal terminal followed by an identifier; ;; unlike Role separators it does not require intervening whitespace. @@ -171,7 +171,7 @@ A dot followed by a digit can belong to a decimal; a terminal dot stays punctuat (problem 'ctm-unsupported :unsupported-directive start (format nil "Directive %~A is outside the implemented subset." (subseq text (1+ start) (lexer-cursor lexer))))))) - ((find c "?[$@~") + ((find c "?[$~") (problem 'ctm-unsupported :unsupported-construct start (format nil "Construct starting with ~S is outside the implemented subset." c))) (t (problem 'ctm-rejection :unexpected-character start (format nil "Unexpected character ~S." c))))))