(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))) ";.)"))
;; Otherwise ':' remains a separate token, including name types
;; followed by a string with or without intervening layout.
(take-character lexer)
- (scan-name lexer)
+ (if (name-start-p (peek-character lexer))
+ (scan-name lexer)
+ ;; CTM 3.3.4 production [11]: numeric-leading local parts
+ ;; contain name-part characters, which do not include dots.
+ (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 "%?[$@~()")
+ ((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.
+ (if (starts-with "%prefix" (subseq text start))
+ (progn (setf (lexer-cursor lexer) (+ start 7))
+ (make-token :kind :directive :value "prefix" :position start))
+ (progn
+ (scan-name lexer)
+ (problem 'ctm-unsupported :unsupported-directive start
+ (format nil "Directive %~A is outside the implemented subset."
+ (subseq text (1+ start) (lexer-cursor lexer)))))))
+ ((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))))))