(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))
((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 the implemented subset." c)))
+ (let ((name (find-if (lambda (name) (starts-with (concatenate 'string "%" name) (subseq text start)))
+ '("prefix" "mergemap" "include"))))
+ (if name
+ (progn (setf (lexer-cursor lexer) (+ start 1 (length name)))
+ (make-token :kind :directive :value name :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))))))))
+ ((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))))))