Unify the syntax of local and document metadata

lszeremeta · Jun 9, 2021 · 62183a0 · 62183a0
1 parent a6fa2a7
commit 62183a0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/other-notations/YARSpg.ebnf b/other-notations/YARSpg.ebnf
@@ -51,7 +51,7 @@ prefix_directive
 pname    ::= ':' ALNUM_PLUS ':'
 pn_local ::= ALNUM_PLUS
 doc_metadata
-         ::= '-' ((pn_local pname) | (IRI ":")) (STRING | IRI)
+         ::= '-' '[' ((pn_local pname) | (IRI ":")) (STRING | IRI) ']'
 var      ::= '$' var_name
 var_declaration
          ::= var '=' prop ( ',' prop )*

diff --git a/yarspg/YARSpg.g4 b/yarspg/YARSpg.g4
@@ -57,7 +57,7 @@ pn_local
     ;
 
 doc_metadata
-    : '-' ((pn_local pname) | (IRI ':')) (STRING | IRI)
+    : '-' '[' ((pn_local pname) | (IRI ':')) (STRING | IRI) ']'
     ;
 
 var

diff --git a/yarspg/examples/canonical-real-example.yarspg b/yarspg/examples/canonical-real-example.yarspg
@@ -1,5 +1,5 @@
 %METADATA
--<http://xmlns.com/foaf/0.1/maker>:"Łukasz Szeremeta and Dominik Tomaszuk"
+-[<http://xmlns.com/foaf/0.1/maker>:"Łukasz Szeremeta and Dominik Tomaszuk"]
 %NODE SCHEMAS
 S(NS1{"Author"}["fname":String,"lname":String])
 S(NS2{"Entry","InProceedings"}["title":String,"numpages":Integer,"keyword":String])

diff --git a/yarspg/examples/features-overview.yarspg b/yarspg/examples/features-overview.yarspg
@@ -21,7 +21,7 @@ S/graph2/["prop": Bool, $graph2_prop_schema]
 :foaf: <http://xmlns.com/foaf/0.1/>
 
 # Metadata
--foaf:maker: "Łukasz Szeremeta"
+- [foaf:maker: "Łukasz Szeremeta"]
 
 # Node schema with node id and optional: node labels, properties, graphs and local metadata
 # MIN, MAX, OPTIONAL

diff --git a/yarspg/examples/real-example.yarspg b/yarspg/examples/real-example.yarspg
@@ -2,7 +2,7 @@
 :foaf: <http://xmlns.com/foaf/0.1/>
 
 # Metadata
--foaf:maker: "Łukasz Szeremeta and Dominik Tomaszuk"
+-[foaf:maker: "Łukasz Szeremeta and Dominik Tomaszuk"]
 
 # Node schema
 S(NS1 {"Author"}["fname": String, "lname": String])

diff --git a/yarspg/examples/test-example.yarspg b/yarspg/examples/test-example.yarspg
@@ -26,12 +26,12 @@ S/graph4/
 
 # Metadata
 % METADATA
--foaf:maker: "Łukasz Szeremeta and Dominik Tomaszuk"
--foaf:maker: <http://example.com/me>
--dc:test: "Test metadata"
--<http://xmlns.com/foaf/0.1/maker>: "Łukasz Szeremeta and Dominik Tomaszuk"
--<http://xmlns.com/dc/0.5/zyz>: <http://xmlns.com/dc/0.5/abc>
--<http://xmlns.com/dc/0.5/zyz>: "Test"
+-[foaf:maker: "Łukasz Szeremeta and Dominik Tomaszuk"]
+-[foaf:maker: <http://example.com/me>]
+- [ dc:test: "Test metadata" ]
+- [<http://xmlns.com/foaf/0.1/maker>: "Łukasz Szeremeta and Dominik Tomaszuk"]
+-[<http://xmlns.com/dc/0.5/zyz>: <http://xmlns.com/dc/0.5/abc> ]
+-[ <http://xmlns.com/dc/0.5/zyz>: "Test"]
 
 # comment3#12
 % NODES
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,7 @@ pn_local @@
         ;
     doc_metadata
-        : '-' ((pn_local pname) | (IRI ':')) (STRING | IRI)
+        : '-' '[' ((pn_local pname) | (IRI ':')) (STRING | IRI) ']'
         ;
     var
@@ Expand Down @@