+ npm run test

shexSpec · Aug 28, 2022 · 630f48b · 630f48b
1 parent f551487
commit 630f48b
Show file tree

Hide file tree

Showing 4 changed files with 298 additions and 3,085 deletions.
diff --git a/doc/ShExJ.jsg b/doc/ShExJ.jsg
@@ -17,16 +17,16 @@ Schema           {
   imports:[IRIREF+]?
   startActs:[SemAct+]? start:shapeExprOrRef? shapes:[ShapeDecl+]?
  }
-ShapeDecl        { id:shapeExprLabel abstract:BOOL? specializes:[IRIREF+]? shapeExpr:shapeExpr }
+ShapeDecl        { id:shapeDeclLabel abstract:BOOL? restricts:[shapeExprOrRef+]? shapeExpr:shapeExpr }
 
 // Shape Expressions
 shapeExpr        = ShapeOr | ShapeAnd | ShapeNot | NodeConstraint | Shape | ShapeExternal;
-shapeExprOrRef   = shapeExpr | shapeExprRef;
+shapeExprOrRef   = shapeExpr | shapeDeclRef;
 ShapeOr          { shapeExprs:[shapeExprOrRef{2,}] }
 ShapeAnd         { shapeExprs:[shapeExprOrRef{2,}] }
 ShapeNot         { shapeExpr:shapeExprOrRef }
-shapeExprRef     = shapeExprLabel ;
-shapeExprLabel   = IRIREF | BNODE ;
+shapeDeclRef     = shapeDeclLabel ;
+shapeDeclLabel   = IRIREF | BNODE ;
 NodeConstraint   { nodeKind:("iri"|"bnode"|"nonliteral"|"literal")? datatype:IRIREF? xsFacet* values:[valueSetValue+]? }
 ShapeExternal    { }
 

diff --git a/doc/ShExR.shex b/doc/ShExR.shex
@@ -43,7 +43,9 @@ start=@<#Schema>
   sx:nodeKind [sx:iri sx:bnode sx:literal sx:nonliteral] ? ;
   sx:datatype IRI ? ;
   &<#xsFacets>  ;
-  sx:values @<#valueSetValueList1Plus> ?
+  sx:values @<#valueSetValueList1Plus> ? ;
+  sx:semActs @<#SemActList1Plus> ? ;
+  sx:annotation @<#AnnotationList1Plus> ?
 }
 
 <#Shape> CLOSED {