(in-package #:topic-maps.ctm)
-(defstruct token kind value (position 0))
+(defstruct token kind value (position 0) end)
(defstruct (lexer (:constructor make-lexer (text))) text (cursor 0))
(defun peek-character (lexer &optional (delta 0))
(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.
(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 the implemented subset." c)))
+ ((char= c #\$)
+ (unless (name-start-p (peek-character lexer))
+ (problem 'ctm-rejection :invalid-variable start "A variable requires an identifier."))
+ (take-character lexer) (scan-name lexer)
+ (make-token :kind :variable :value (subseq text (1+ start) (lexer-cursor lexer)) :position start))
(t (problem 'ctm-rejection :unexpected-character start (format nil "Unexpected character ~S." c))))))