X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/fb60afd548d679d83fd8ec76bc5ff384c1e23e5f..35648c4dcc71e8dc6448b64abcacb438e53d64a2:/src/ctm/lexer.lisp diff --git a/src/ctm/lexer.lisp b/src/ctm/lexer.lisp index 6331cde..116b55c 100644 --- a/src/ctm/lexer.lisp +++ b/src/ctm/lexer.lisp @@ -103,7 +103,7 @@ (eql #\/ (peek-character lexer 1)) (eql #\/ (peek-character lexer 2))) (incf (lexer-cursor lexer) 3) (loop while (and (peek-character lexer) (not (whitespace-p (peek-character lexer))) - (not (find (peek-character lexer) "<>\"{}|^`\\[]("))) + (not (find (peek-character lexer) "<>\"{}|^`\\[]()"))) do (take-character lexer)) (loop while (and (> (lexer-cursor lexer) start) (find (char text (1- (lexer-cursor lexer))) ";.)")) @@ -120,8 +120,8 @@ (scan-name 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 "%?[$@~()") + ((find c ".;-=^:(),") (make-token :kind :punctuation :value c :position start)) + ((find c "%?[$@~") (problem 'ctm-unsupported :unsupported-construct start - (format nil "Construct starting with ~S is outside Slice 1." c))) + (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))))))