X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/6a2f8446afca0915882f0d4a06cb891ccfcdc96d..aeb017e4f4846f2e6a701e581d20eef84a8b83d9:/src/ctm/reader.lisp?ds=inline diff --git a/src/ctm/reader.lisp b/src/ctm/reader.lisp index 692065d..e7b22e2 100644 --- a/src/ctm/reader.lisp +++ b/src/ctm/reader.lisp @@ -67,6 +67,29 @@ (multiple-value-bind (kind iri) (identity-value parser) (topic-maps.tmdm:intern-topic map kind iri))) +(defun read-scope (parser map) + "CTM 3.3.9: optional @ followed by a nonempty comma-separated Topic set. +Use the existing identity resolver; embedded/wildcard Topics remain unsupported. +The owning information item is not constructed until this function finishes." + (when (punctuation-p parser #\@) + (consume parser) + (let ((themes nil)) + (loop + ;; A reifier marker where a Theme is required is malformed Scope, + ;; even though reification after a complete Scope remains unsupported. + (unless (parser-lookahead parser) + (skip-layout (parser-lexer parser)) + (when (eql #\~ (peek-character (parser-lexer parser))) + (problem 'ctm-rejection :expected-scope-theme (lexer-cursor (parser-lexer parser)) + "Expected a Theme, not a reifier marker."))) + (let ((token (look parser))) + (unless (or (member (token-kind token) '(:identifier :iri :qname)) + (and (eq :punctuation (token-kind token)) (find (token-value token) "=^"))) + (problem 'ctm-rejection :expected-scope-theme (token-position token) + "Expected a Topic reference after '@' or the scope comma.")) + (push (identity-reference parser map) themes)) + (if (punctuation-p parser #\,) (consume parser) (return (nreverse themes))))))) + (defun literal-iri-reference (parser) "An IRI locator, not a Topic identity. Used for values/datatype syntax." (let ((token (consume parser))) @@ -149,8 +172,9 @@ (progn (consume parser) (multiple-value-bind (value datatype) (read-occurrence-literal parser) - (let ((type (topic-maps.tmdm:intern-topic map kind iri))) - (topic-maps.tmdm:add-occurrence topic type value :datatype datatype) + (let* ((type (topic-maps.tmdm:intern-topic map kind iri)) + (scope (read-scope parser map))) + (topic-maps.tmdm:add-occurrence topic type value :datatype datatype :scope scope) (topic-maps.tmdm:canonical-topic topic)))) (if (eq :identifier (token-kind start)) (if (punctuation-p parser #\() @@ -159,6 +183,29 @@ "Expected ':' after the Occurrence Type.")) (topic-maps.tmdm:add-topic-identifier topic kind iri)))))) +(defun read-name (parser map topic) + "CTM 3.11: optional Topic reference plus ':' followed by a string. +Use the existing identity resolver; embedded Topics remain unsupported." + (let* ((token (look parser)) + (typed (or (member (token-kind token) '(:identifier :iri :qname)) + (and (eq :punctuation (token-kind token)) + (find (token-value token) "=^")))) + (type (when typed (identity-reference parser map)))) + (when typed + (unless (punctuation-p parser #\:) + (problem 'ctm-rejection :expected-name-type-separator + (token-position (look parser)) "Expected ':' after the name type.")) + (consume parser)) + (let ((value (consume parser))) + (unless (eq :string (token-kind value)) + (problem 'ctm-rejection :expected-name-value (token-position value) + "Expected a quoted name value after '-' or the name type separator.")) + (let ((scope (read-scope parser map))) + (if typed + (topic-maps.tmdm:add-name topic (token-value value) :type type :scope scope) + (topic-maps.tmdm:add-name topic (token-value value) :scope scope)))) + (topic-maps.tmdm:canonical-topic topic))) + (defun read-topic (parser map &optional (topic (identity-reference parser map))) (let ((has-tail nil)) (loop @@ -168,24 +215,7 @@ (when has-tail (problem 'ctm-rejection :expected-separator (token-position (look parser)) "Topic-tail statements need a semicolon separator.")) (consume parser) - (let ((value (consume parser))) - (when (member (token-kind value) '(:identifier :iri :qname)) - ;; Recognize the typed-name syntax, without resolving its type - ;; or creating information items for unsupported name semantics. - (unless (punctuation-p parser #\:) - (problem 'ctm-rejection :expected-name-type-separator - (token-position (look parser)) "Expected ':' after the name type.")) - (consume parser) - (let ((literal (consume parser))) - (unless (eq :string (token-kind literal)) - (problem 'ctm-rejection :expected-name-value (token-position literal) - "Expected a quoted name value after the name type separator."))) - (problem 'ctm-unsupported :typed-name (token-position value) - "Typed names are outside the implemented subset (CTM 3.11).")) - (unless (eq :string (token-kind value)) - (problem 'ctm-rejection :expected-name-value (token-position value) - "Expected a quoted name value after '-'.")) - (topic-maps.tmdm:add-default-name topic (token-value value))) + (setf topic (read-name parser map topic)) (setf has-tail t)) ((and has-tail (punctuation-p parser #\;)) (consume parser) @@ -204,7 +234,7 @@ (t (problem 'ctm-rejection :unexpected-token (token-position (look parser)) "Unexpected token after topic or name.")))))) (defun read-association (parser map type) - "CTM 3.13, restricted to one or two role declarations; no scope/reifier." + "CTM 3.13, restricted to one or two role declarations; optional scope, no reifier." (consume parser) ; opening parenthesis already recognized by the caller (let ((roles nil) (third-position nil)) (loop @@ -235,7 +265,8 @@ (t (problem 'ctm-rejection :expected-role-separator (token-position (look parser)) "Expected ',' or ')' after a Role.")))) (when (> (length roles) 2) (problem 'ctm-unsupported :association-arity third-position "Associations with more than two Role declarations are outside Slice 3.")) - (topic-maps.tmdm:make-association map type (nreverse roles)))) + (let ((scope (read-scope parser map))) + (topic-maps.tmdm:make-association map type (nreverse roles) :scope scope)))) (defun deserialize-string (text &key document-iri source-name) "Read the documented CTM subset, with per-document prefixes and qualified strings.