From c20684579782d2ebbdf08b85618b4c01cdb93adb Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 26 May 2025 13:05:25 +0200 Subject: simplify syntax for SemWord --- syntax/SemWord.py | 19 +++++++++---------- syntax/def.peg | 3 +-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/syntax/SemWord.py b/syntax/SemWord.py index 243c707..b501e03 100755 --- a/syntax/SemWord.py +++ b/syntax/SemWord.py @@ -6,16 +6,15 @@ from railroad import * Diagram( - Group(Choice(0, - Sequence( - NonTerminal("SEMPREFIX"), - "<", - NonTerminal("![<>] PRINTABLES"), - ">", - ), - Sequence( - NonTerminal("SEMPREFIX"), - NonTerminal("CURIE"), + Group(Sequence( + NonTerminal("SEMPREFIX"), + Choice(0, + Sequence( + "<", + NonTerminal("![<>] PRINTABLES"), + ">", + ), + NonTerminal("CURIE") ) )), type="complex" diff --git a/syntax/def.peg b/syntax/def.peg index 0c99c80..9f260d7 100644 --- a/syntax/def.peg +++ b/syntax/def.peg @@ -62,8 +62,7 @@ BlockX <- LinkDefinition / Paragraph PrefixDefinition <- '{' CuriePrefix '}' ':' _? SemWord NEWLINE KeyWordX <- SemWord / Identifier / Class / Attribute / '-' -SemWord <- SEMPREFIX '<' ![<>] PRINTABLES '>' - / SEMPREFIX Curie +SemWord <- SEMPREFIX ('<' ![<>] PRINTABLES '>' / Curie) SEMPREFIX <- [.=] # RDF CURIE -- cgit v1.2.3