From 3ea46c86e1c6898ba1e37f3342f4650c29d86ccc Mon Sep 17 00:00:00 2001 From: Eric Prud'hommeaux Date: Sat, 11 Jun 2022 16:27:33 +0200 Subject: [PATCH] ~ migrate ShExR to top-level ShapeDecls per shexSpec/shexTest#50 test with: for f in $(ls schemas/*.ttl | grep -vE '(manifest|meta)\.ttl'); do echo $f && ~/checkouts/shexSpec/shex.js/packages/shex-cli/bin/validate -m '{FOCUS a sx:Schema}@sx:Schema' -x doc/ShExR.shex -d $f > /dev/null || echo $f; done TODO: * schemas/1valExprRefbnode-IV1.ttl * schemas/1valExprRef-IV1.ttl * schemas/2RefS1-Icirc.ttl * schemas/2RefS1-IS2.ttl * schemas/3circRefS12.ttl * schemas/3circRefS1-Icirc.ttl * schemas/3circRefS1-IS23.ttl * schemas/3circRefS1-IS2-IS3-IS3.ttl * schemas/3circRefS1-IS2-IS3.ttl * schemas/3circRefS23.ttl * schemas/3circRefS2-Icirc.ttl * schemas/3circRefS2-IS3.ttl * schemas/3circRefS3-Icirc.ttl * schemas/3circRefS3-IS12.ttl * schemas/3circRefS3.ttl * schemas/start2RefS1-IstartS2.ttl * schemas/start2RefS2-IstartS1.ttl --- doc/ShExR.shex | 204 +++++++++--------- schemas/0.ttl | 2 +- schemas/0Extends1.ttl | 6 +- schemas/0focusBNODE.ttl | 4 +- schemas/0focusIRI.ttl | 4 +- schemas/1Adot.ttl | 4 +- schemas/1IRIInline0.ttl | 4 +- schemas/1IRI_with_UCHAR.1dot.ttl | 4 +- schemas/1IRI_with_all_punctuationdot.ttl | 4 +- schemas/1Include1-after.ttl | 8 +- schemas/1Include1.ttl | 8 +- schemas/1Length.ttl | 4 +- schemas/1NOTIRI.ttl | 4 +- schemas/1NOTNOTIRI.ttl | 4 +- schemas/1NOTNOTdot.ttl | 4 +- schemas/1NOTNOTvs.ttl | 4 +- schemas/1NOT_literalANDvs_.ttl | 4 +- schemas/1NOT_literalORvs_.ttl | 4 +- schemas/1NOT_vsANDvs_.ttl | 4 +- schemas/1NOT_vsORvs_.ttl | 4 +- schemas/1NOTdot.ttl | 4 +- schemas/1NOTliteralANDvs.ttl | 4 +- schemas/1NOTliteralORvs.ttl | 4 +- schemas/1NOTvs.ttl | 4 +- schemas/1NOTvsANDvs.ttl | 4 +- schemas/1NOTvsORvs.ttl | 4 +- schemas/1_NOTliteral_ANDvs.ttl | 4 +- schemas/1_NOTliteral_ORvs.ttl | 4 +- schemas/1_NOTvs_ANDvs.ttl | 4 +- schemas/1_NOTvs_ORvs.ttl | 4 +- schemas/1bnode.ttl | 4 +- schemas/1bnodeLength.ttl | 4 +- schemas/1bnodeMaxlength.ttl | 4 +- schemas/1bnodeMinlength.ttl | 4 +- schemas/1bnodePattern.ttl | 4 +- schemas/1bnodeRef1.ttl | 8 +- schemas/1bnodeRefORRefMinlength.ttl | 4 +- schemas/1card2.ttl | 4 +- schemas/1card25.ttl | 4 +- schemas/1card2Star.ttl | 4 +- schemas/1card2blank.ttl | 4 +- schemas/1cardOpt.ttl | 4 +- schemas/1cardPlus.ttl | 4 +- schemas/1cardStar.ttl | 4 +- schemas/1datatype.ttl | 4 +- schemas/1datatypeLength.ttl | 4 +- schemas/1datatypeRef1.ttl | 4 +- schemas/1datatypelangString.ttl | 4 +- schemas/1decimalMaxexclusiveDECIMAL.ttl | 4 +- schemas/1decimalMaxexclusiveDOUBLE.ttl | 4 +- schemas/1decimalMaxexclusiveINTEGER.ttl | 4 +- schemas/1decimalMaxexclusivexsd-byte.ttl | 4 +- schemas/1decimalMaxinclusiveDECIMAL.ttl | 4 +- schemas/1decimalMaxinclusiveDOUBLE.ttl | 4 +- schemas/1decimalMaxinclusiveINTEGER.ttl | 4 +- schemas/1decimalMinexclusiveDECIMAL.ttl | 4 +- schemas/1decimalMinexclusiveDOUBLE.ttl | 4 +- schemas/1decimalMinexclusiveINTEGER.ttl | 4 +- schemas/1decimalMininclusiveDECIMAL.ttl | 4 +- .../1decimalMininclusiveDECIMALLeadTrail.ttl | 4 +- ...decimalMininclusiveDECIMALintLeadTrail.ttl | 4 +- schemas/1decimalMininclusiveDOUBLE.ttl | 4 +- .../1decimalMininclusiveDOUBLELeadTrail.ttl | 4 +- ...1decimalMininclusiveDOUBLEintLeadTrail.ttl | 4 +- schemas/1decimalMininclusiveINTEGER.ttl | 4 +- schemas/1decimalMininclusiveINTEGERLead.ttl | 4 +- schemas/1dot-base.ttl | 4 +- schemas/1dot.ttl | 4 +- schemas/1dot3Extends.ttl | 16 +- schemas/1dotAND1dotAND1dot.ttl | 4 +- schemas/1dotANDopen1dotAND1dotclose.ttl | 4 +- schemas/1dotAnnot3.ttl | 4 +- schemas/1dotAnnotAIRIREF.ttl | 4 +- schemas/1dotAnnotIRIREF.ttl | 4 +- schemas/1dotAnnotSTRING_LITERAL1.ttl | 4 +- schemas/1dotClosed.ttl | 4 +- schemas/1dotCode1.ttl | 4 +- schemas/1dotCode3.ttl | 4 +- schemas/1dotCode3fail.ttl | 4 +- schemas/1dotCodeWithEscapes1.ttl | 4 +- schemas/1dotExtends1.ttl | 8 +- schemas/1dotExtra1.ttl | 4 +- schemas/1dotIMPORT1dot.ttl | 4 +- schemas/1dotInline1.ttl | 4 +- schemas/1dotLNdefault.ttl | 4 +- schemas/1dotLNex-HYPHEN_MINUS.ttl | 4 +- schemas/1dotLNex.ttl | 4 +- schemas/1dotLNexMultiComment.ttl | 4 +- schemas/1dotLNexSingleComment.ttl | 4 +- schemas/1dotNS2.ttl | 4 +- schemas/1dotNS2MultiComment.ttl | 4 +- schemas/1dotNS2SingleComment.ttl | 4 +- schemas/1dotNSdefault.ttl | 4 +- schemas/1dotNoCode1.ttl | 4 +- schemas/1dotNoCode3.ttl | 4 +- schemas/1dotOne1dot.ttl | 4 +- schemas/1dotOne2dot.ttl | 4 +- schemas/1dotPlusAnnotIRIREF.ttl | 4 +- schemas/1dotRef1.ttl | 8 +- schemas/1dotRefAND3.ttl | 16 +- schemas/1dotRefLNex1.ttl | 8 +- schemas/1dotRefNS1.ttl | 8 +- schemas/1dotRefOR3.ttl | 16 +- schemas/1dotRefSpaceLNex1.ttl | 8 +- schemas/1dotRefSpaceNS1.ttl | 8 +- schemas/1dotSemi.ttl | 4 +- schemas/1dotSemiOne1dotSemi.ttl | 4 +- schemas/1dotSemiOne2dotSemis.ttl | 4 +- schemas/1dotShapeAND1dot3X.ttl | 4 +- schemas/1dotShapeAnnotAIRIREF.ttl | 4 +- schemas/1dotShapeAnnotIRIREF.ttl | 4 +- schemas/1dotShapeAnnotSTRING_LITERAL1.ttl | 4 +- schemas/1dotShapeCode1.ttl | 4 +- schemas/1dotShapeNoCode1.ttl | 4 +- schemas/1dotShapePlusAnnotIRIREF.ttl | 4 +- schemas/1doubleMaxexclusiveDECIMAL.ttl | 4 +- .../1doubleMaxexclusiveDECIMALLeadTrail.ttl | 4 +- schemas/1doubleMaxexclusiveDECIMALint.ttl | 4 +- ...1doubleMaxexclusiveDECIMALintLeadTrail.ttl | 4 +- schemas/1doubleMaxexclusiveDOUBLE.ttl | 4 +- .../1doubleMaxexclusiveDOUBLELeadTrail.ttl | 4 +- schemas/1doubleMaxexclusiveDOUBLEint.ttl | 4 +- .../1doubleMaxexclusiveDOUBLEintLeadTrail.ttl | 4 +- schemas/1doubleMaxexclusiveINTEGER.ttl | 4 +- schemas/1doubleMaxexclusiveINTEGERLead.ttl | 4 +- schemas/1doubleMaxinclusiveDECIMAL.ttl | 4 +- schemas/1doubleMaxinclusiveDOUBLE.ttl | 4 +- schemas/1doubleMaxinclusiveINTEGER.ttl | 4 +- schemas/1doubleMinexclusiveDECIMAL.ttl | 4 +- schemas/1doubleMinexclusiveDOUBLE.ttl | 4 +- schemas/1doubleMinexclusiveINTEGER.ttl | 4 +- schemas/1doubleMininclusiveDECIMAL.ttl | 4 +- .../1doubleMininclusiveDECIMALLeadTrail.ttl | 4 +- ...1doubleMininclusiveDECIMALintLeadTrail.ttl | 4 +- schemas/1doubleMininclusiveDOUBLE.ttl | 4 +- .../1doubleMininclusiveDOUBLELeadTrail.ttl | 4 +- .../1doubleMininclusiveDOUBLEintLeadTrail.ttl | 4 +- schemas/1doubleMininclusiveINTEGERLead.ttl | 4 +- schemas/1floatMaxexclusiveDECIMAL.ttl | 4 +- schemas/1floatMaxexclusiveDOUBLE.ttl | 4 +- schemas/1floatMaxexclusiveINTEGER.ttl | 4 +- schemas/1floatMaxinclusiveDECIMAL.ttl | 4 +- schemas/1floatMaxinclusiveDOUBLE.ttl | 4 +- schemas/1floatMaxinclusiveINTEGER.ttl | 4 +- schemas/1floatMinexclusiveDECIMAL.ttl | 4 +- schemas/1floatMinexclusiveDOUBLE.ttl | 4 +- schemas/1floatMinexclusiveINTEGER.ttl | 4 +- schemas/1floatMininclusiveDECIMAL.ttl | 4 +- .../1floatMininclusiveDECIMALLeadTrail.ttl | 4 +- .../1floatMininclusiveDECIMALintLeadTrail.ttl | 4 +- schemas/1floatMininclusiveDOUBLE.ttl | 4 +- schemas/1floatMininclusiveDOUBLELeadTrail.ttl | 4 +- .../1floatMininclusiveDOUBLEintLeadTrail.ttl | 4 +- schemas/1floatMininclusiveINTEGER.ttl | 4 +- schemas/1floatMininclusiveINTEGERLead.ttl | 4 +- schemas/1focusBNODELength_dot.ttl | 4 +- schemas/1focusBNODE_dot.ttl | 4 +- schemas/1focusIRILength_dot.ttl | 4 +- schemas/1focusIRI_dot.ttl | 4 +- schemas/1focusLength-dot.ttl | 4 +- schemas/1focusMaxLength-dot.ttl | 4 +- schemas/1focusMinLength-dot.ttl | 4 +- schemas/1focusPattern-dot.ttl | 4 +- schemas/1focusPatternB-dot.ttl | 4 +- schemas/1focusnonLiteral-dot.ttl | 4 +- schemas/1focusnonLiteralLength-dot.ttl | 4 +- ...focusnonLiteralLength-nonLiteralLength.ttl | 4 +- schemas/1integerMaxexclusiveDECIMALint.ttl | 4 +- schemas/1integerMaxexclusiveDOUBLEint.ttl | 4 +- schemas/1integerMaxexclusiveINTEGER.ttl | 4 +- schemas/1integerMaxinclusiveDECIMALint.ttl | 4 +- schemas/1integerMaxinclusiveDOUBLEint.ttl | 4 +- schemas/1integerMaxinclusiveINTEGER.ttl | 4 +- schemas/1integerMinexclusiveDECIMALint.ttl | 4 +- schemas/1integerMinexclusiveDOUBLEint.ttl | 4 +- schemas/1integerMinexclusiveINTEGER.ttl | 4 +- schemas/1integerMininclusiveDECIMAL.ttl | 4 +- .../1integerMininclusiveDECIMALLeadTrail.ttl | 4 +- schemas/1integerMininclusiveDECIMALint.ttl | 4 +- ...integerMininclusiveDECIMALintLeadTrail.ttl | 4 +- schemas/1integerMininclusiveDOUBLE.ttl | 4 +- .../1integerMininclusiveDOUBLELeadTrail.ttl | 4 +- schemas/1integerMininclusiveDOUBLEint.ttl | 4 +- ...1integerMininclusiveDOUBLEintLeadTrail.ttl | 4 +- schemas/1integerMininclusiveINTEGER.ttl | 4 +- schemas/1integerMininclusiveINTEGERLead.ttl | 4 +- schemas/1inversedot.ttl | 4 +- schemas/1inversedotAnnot3.ttl | 4 +- schemas/1inversedotCode1.ttl | 4 +- schemas/1iri.ttl | 4 +- schemas/1iriLength.ttl | 4 +- schemas/1iriMaxlength.ttl | 4 +- schemas/1iriMinlength.ttl | 4 +- schemas/1iriPattern.ttl | 4 +- schemas/1iriPatternbc.ttl | 4 +- schemas/1iriRef1.ttl | 8 +- schemas/1iriRefLength1.ttl | 8 +- schemas/1list0PlusDot.ttl | 8 +- schemas/1list0PlusIri.ttl | 8 +- schemas/1list1PlusIri.ttl | 8 +- schemas/1literal.ttl | 4 +- schemas/1literalCarrotPatternDollar.ttl | 4 +- schemas/1literalFractiondigits4.ttl | 4 +- schemas/1literalFractiondigits5.ttl | 4 +- schemas/1literalLength.ttl | 4 +- schemas/1literalLength19.ttl | 4 +- schemas/1literalMaxexclusiveINTEGER.ttl | 4 +- schemas/1literalMaxinclusiveINTEGER.ttl | 4 +- schemas/1literalMaxlength.ttl | 4 +- schemas/1literalMinexclusiveINTEGER.ttl | 4 +- schemas/1literalMininclusiveINTEGER.ttl | 4 +- schemas/1literalMinlength.ttl | 4 +- schemas/1literalPattern.ttl | 4 +- schemas/1literalPattern19.ttl | 4 +- schemas/1literalPatternDollar.ttl | 4 +- schemas/1literalPatternEnd.ttl | 4 +- .../1literalPattern_with_REGEXP_escapes.ttl | 4 +- ...iteralPattern_with_REGEXP_escapes_bare.ttl | 4 +- ...ralPattern_with_REGEXP_escapes_escaped.ttl | 4 +- .../1literalPattern_with_UTF8_boundaries.ttl | 4 +- schemas/1literalPattern_with_all_controls.ttl | Bin 472 -> 506 bytes schemas/1literalPattern_with_all_meta.ttl | 4 +- .../1literalPattern_with_all_punctuation.ttl | 4 +- .../1literalPattern_with_ascii_boundaries.ttl | Bin 458 -> 492 bytes schemas/1literalPatternabEnd.ttl | 4 +- schemas/1literalPatterni.ttl | 4 +- schemas/1literalPlus.ttl | 4 +- schemas/1literalStartPattern.ttl | 4 +- schemas/1literalStartPatternEnd.ttl | 4 +- schemas/1literalTotaldigits2.ttl | 4 +- schemas/1literalTotaldigits5.ttl | 4 +- schemas/1literalTotaldigits6.ttl | 4 +- schemas/1nonliteral.ttl | 4 +- schemas/1nonliteralLength.ttl | 4 +- schemas/1nonliteralMaxlength.ttl | 4 +- schemas/1nonliteralMinlength.ttl | 4 +- schemas/1nonliteralPattern.ttl | 4 +- schemas/1refbnode1.ttl | 8 +- schemas/1refbnode_with_leading_digit1.ttl | 8 +- .../1refbnode_with_leading_underscore1.ttl | 8 +- schemas/1refbnode_with_spanning_PN_CHARS1.ttl | 8 +- ...1refbnode_with_spanning_PN_CHARS_BASE1.ttl | 8 +- schemas/1val1DECIMAL.ttl | 4 +- schemas/1val1DOUBLE.ttl | 4 +- schemas/1val1DOUBLElowercase.ttl | 4 +- schemas/1val1INTEGER.ttl | 4 +- schemas/1val1IRIREF.ttl | 4 +- schemas/1val1IRIREFClosedExtra1.ttl | 4 +- schemas/1val1IRIREFDatatype.ttl | 4 +- schemas/1val1IRIREFExtra1.ttl | 4 +- schemas/1val1IRIREFExtra1Closed.ttl | 4 +- schemas/1val1IRIREFExtra1One.ttl | 4 +- schemas/1val1IRIREFExtra1p2.ttl | 4 +- schemas/1val1LANGTAG.ttl | 4 +- schemas/1val1LNDatatype.ttl | 4 +- schemas/1val1STRING_LITERAL1.ttl | 4 +- ...val1STRING_LITERAL1_with_ECHAR_escapes.ttl | 4 +- ...l1STRING_LITERAL1_with_UTF8_boundaries.ttl | 4 +- ...1val1STRING_LITERAL1_with_all_controls.ttl | Bin 428 -> 462 bytes ...l1STRING_LITERAL1_with_all_punctuation.ttl | 4 +- ...1STRING_LITERAL1_with_ascii_boundaries.ttl | Bin 408 -> 442 bytes schemas/1val1STRING_LITERAL2.ttl | 4 +- schemas/1val1STRING_LITERAL2_with_LANGTAG.ttl | 4 +- schemas/1val1STRING_LITERAL2_with_subtag.ttl | 4 +- schemas/1val1STRING_LITERAL_LONG1.ttl | 4 +- schemas/1val1STRING_LITERAL_LONG2.ttl | 4 +- ...1val1STRING_LITERAL_LONG2_with_LANGTAG.ttl | 4 +- .../1val1STRING_LITERAL_LONG2_with_subtag.ttl | 4 +- schemas/1val1dotMinusiri3.ttl | 4 +- schemas/1val1dotMinusiriStem3.ttl | 4 +- schemas/1val1dotMinuslanguage3.ttl | 4 +- schemas/1val1dotMinuslanguageStem3.ttl | 4 +- schemas/1val1dotMinusliteral3.ttl | 4 +- schemas/1val1dotMinusliteralStem3.ttl | 4 +- schemas/1val1emptylanguageStem.ttl | 4 +- .../1val1emptylanguageStemMinuslanguage3.ttl | 4 +- ...al1emptylanguageStemMinuslanguageStem3.ttl | 4 +- schemas/1val1false.ttl | 4 +- schemas/1val1iri.ttl | 4 +- schemas/1val1iriStem.ttl | 4 +- schemas/1val1iriStemMinusiri3.ttl | 4 +- schemas/1val1iriStemMinusiriStem3.ttl | 4 +- schemas/1val1language.ttl | 4 +- schemas/1val1languageStem.ttl | 4 +- schemas/1val1languageStemMinuslanguage3.ttl | 4 +- .../1val1languageStemMinuslanguageStem3.ttl | 4 +- schemas/1val1literal.ttl | 4 +- schemas/1val1literalAtlanguageStem.ttl | 4 +- ...lAtlanguageStemMinusliteralAtlanguage3.ttl | 4 +- schemas/1val1literalStem.ttl | 4 +- schemas/1val1literalStemMinusliteral3.ttl | 4 +- schemas/1val1literalStemMinusliteralStem3.ttl | 4 +- schemas/1val1literaliriStem.ttl | 4 +- .../1val1literaliriStemMinusliteraliri3.ttl | 4 +- schemas/1val1literallanguageStem.ttl | 4 +- ...terallanguageStemMinusliterallanguage3.ttl | 4 +- schemas/1val1refvsMinusiri3.ttl | 8 +- schemas/1val1true.ttl | 4 +- schemas/1val1vExpr1AND1AND1Ref3.ttl | 16 +- schemas/1val1vExpr1AND1OR1Ref3.ttl | 16 +- schemas/1val1vExpr1OR1AND1Ref3.ttl | 16 +- schemas/1val1vExpr1OR1OR1Ref3.ttl | 16 +- schemas/1val1vExprAND3.ttl | 4 +- schemas/1val1vExprOR3.ttl | 4 +- schemas/1val1vExprRefAND3.ttl | 20 +- schemas/1val1vExprRefIRIREF1.ttl | 8 +- schemas/1val1vExprRefOR3.ttl | 20 +- schemas/1val1vExprRefbnode1.ttl | 8 +- schemas/1val1vShapeANDRef3.ttl | 4 +- schemas/1val2IRIREFExtra1.ttl | 4 +- schemas/1val2IRIREFPlusExtra1.ttl | 4 +- schemas/1val2STRING_LITERAL1.ttl | 4 +- schemas/1valExprRef-IV1.ttl | 4 +- schemas/1valExprRef-vc1.ttl | 4 +- schemas/1valExprRefbnode-IV1.ttl | 4 +- schemas/1valExprRefbnode-vc1.ttl | 4 +- schemas/2EachInclude1-IS2.ttl | 4 +- schemas/2EachInclude1-S2.ttl | 4 +- schemas/2EachInclude1-after.ttl | 8 +- schemas/2EachInclude1.ttl | 8 +- schemas/2Eachdot.ttl | 4 +- schemas/2OneInclude1-after.ttl | 8 +- schemas/2OneInclude1.ttl | 8 +- schemas/2RefS1-IS2.ttl | 5 +- schemas/2RefS1-Icirc.ttl | 5 +- schemas/2RefS1.ttl | 5 +- schemas/2dot.ttl | 4 +- schemas/2dotOne1dot.ttl | 4 +- schemas/2dotSemiOne1dotSemi.ttl | 4 +- schemas/2dotSemis.ttl | 4 +- schemas/3Eachdot.ttl | 4 +- schemas/3Eachdot3Extra.ttl | 4 +- schemas/3EachdotExtra3.ttl | 4 +- schemas/3EachdotExtra3NLex.ttl | 4 +- schemas/3circRefPlus1.ttl | 16 +- schemas/3circRefS1-IS2-IS3-IS3.ttl | 5 +- schemas/3circRefS1-IS2-IS3.ttl | 5 +- schemas/3circRefS1-IS23.ttl | 5 +- schemas/3circRefS1-Icirc.ttl | 5 +- schemas/3circRefS12.ttl | 9 +- schemas/3circRefS23.ttl | 10 +- schemas/3circRefS3-IS12.ttl | 5 +- schemas/3circRefS3-Icirc.ttl | 5 +- schemas/3circRefS3.ttl | 5 +- schemas/AND3G.ttl | 8 +- schemas/ANDAbstract.ttl | 4 +- schemas/Cycle2Extra.ttl | 26 +-- schemas/Cycle2NoNegation.ttl | 16 +- schemas/CycleNoNegation.ttl | 28 +-- schemas/Extend3G.ttl | 12 +- schemas/ExtendAND3G.ttl | 8 +- schemas/ExtendANDExtend3GAND3G.ttl | 16 +- schemas/Extends-sAB.ttl | 4 +- schemas/ExtendsRepeatedP.ttl | 13 +- .../FocusIRI2EachBnodeNested2EachIRIRef.ttl | 4 +- schemas/NOT1NOTvs.ttl | 4 +- schemas/NOT1dotOR2dot.ttl | 4 +- schemas/NOT1dotOR2dotX3.ttl | 4 +- schemas/NOT1dotOR2dotX3AND1.ttl | 4 +- schemas/NoNegation.ttl | 40 ++-- schemas/NoNegation2.ttl | 42 ++-- schemas/OneNegation.ttl | 34 +-- schemas/TwoNegation.ttl | 34 +-- schemas/_all.ttl | 30 +-- schemas/bnode1dot.ttl | 4 +- schemas/datatypes.ttl | 76 +++---- schemas/dependent_shape.ttl | 34 +-- schemas/focusNOTRefOR1dot.ttl | 8 +- schemas/focusbnode0ORfocusPattern0.ttl | 4 +- schemas/focusdatatype.ttl | 4 +- schemas/focusvs.ttl | 4 +- schemas/focusvsANDIRI.ttl | 4 +- schemas/focusvsANDdatatype.ttl | 4 +- schemas/focusvsORdatatype.ttl | 4 +- schemas/kitchenSink.ttl | 20 +- schemas/meta.ttl | 4 +- schemas/node_kind_example.ttl | 4 +- schemas/open1dotAND1dotcloseAND1dot.ttl | 4 +- schemas/open1dotOne1dotclose.ttl | 4 +- schemas/open1dotOne2dotclose.ttl | 4 +- schemas/open1dotOneopen2dotcloseclose.ttl | 4 +- schemas/open1dotSemiOne1dotSemicloseSemi.ttl | 4 +- schemas/open1dotSemiOne2dotsemisclose.ttl | 4 +- ...open1dotSemiOneopen2dotSemiscloseclose.ttl | 4 +- schemas/open1dotopen1dotOne1dotcloseclose.ttl | 4 +- ...n1dotSemiOne1dotSemicloseSemicloseSemi.ttl | 4 +- schemas/open2Eachdotclosecard25c1dot.ttl | 4 +- schemas/open2dotOne1dotclose.ttl | 4 +- schemas/open2dotSemisOne1dotSemiclose.ttl | 4 +- schemas/open2dotclose.ttl | 4 +- schemas/open2dotsemisclose.ttl | 4 +- schemas/open3Eachdotclose.ttl | 4 +- schemas/open3EachdotcloseAnnot3.ttl | 4 +- schemas/open3EachdotcloseCode1.ttl | 4 +- schemas/open3Eachdotclosecard23.ttl | 4 +- .../open3Eachdotclosecard23Annot3Code2.ttl | 4 +- schemas/open3Onedotclosecard2.ttl | 4 +- schemas/open3Onedotclosecard23.ttl | 4 +- schemas/open4Onedotclosecard23.ttl | 4 +- schemas/openopen1dotOne1dotclose1dotclose.ttl | 4 +- ...tSemiOne1dotSemiclose1dotSemicloseSemi.ttl | 4 +- ...openopen2dotSemiscloseOne1dotSemiclose.ttl | 4 +- schemas/openopen2dotcloseOne1dotclose.ttl | 4 +- schemas/recursion_example.ttl | 23 +- schemas/shapeExtern.ttl | 2 +- schemas/shapeExternRef.ttl | 6 +- schemas/start2RefS1-IstartS2.ttl | 5 +- schemas/start2RefS1.ttl | 7 +- schemas/start2RefS2-IstartS1.ttl | 5 +- schemas/startCode1.ttl | 4 +- schemas/startCode1fail.ttl | 4 +- schemas/startCode1startRef.ttl | 4 +- schemas/startCode1startReffail.ttl | 4 +- schemas/startCode3.ttl | 4 +- schemas/startCode3fail.ttl | 4 +- schemas/startNoCode1.ttl | 4 +- schemas/startRefIRIREF.ttl | 4 +- schemas/startRefbnode.ttl | 4 +- schemas/startSelfRefIRIREF.ttl | 4 +- schemas/startSelfRefbnode.ttl | 4 +- schemas/vitals-RESTRICTS.ttl | 37 ++-- 421 files changed, 1283 insertions(+), 1272 deletions(-) diff --git a/doc/ShExR.shex b/doc/ShExR.shex index 42697fa1..ecf7d6ef 100644 --- a/doc/ShExR.shex +++ b/doc/ShExR.shex @@ -1,205 +1,205 @@ PREFIX sx: PREFIX xsd: PREFIX rdf: -BASE +BASE start=@ - CLOSED { +<#Schema> CLOSED { a [sx:Schema] ; - sx:imports @ ? ; - sx:startActs @ ? ; - sx:start @ ? ; - sx:shapes @ ? + sx:imports @<#IriList1Plus> ? ; + sx:startActs @<#SemActList1Plus> ? ; + sx:start @<#shapeDeclOrExpr> ? ; + sx:shapes @<#shapeDeclOrExprList1Plus> ? } -# is a shortcut for always requriing a ShapeDecl - @ OR @ +# <#shapeDeclOrExpr> is a shortcut for always requriing a ShapeDecl +<#shapeDeclOrExpr> @<#ShapeDecl> OR @<#shapeExpr> - CLOSED { +<#ShapeDecl> CLOSED { a [sx:ShapeDecl] ; sx:abstract [true false]? ; - sx:shapeExpr @ + sx:shapeExpr @<#shapeExpr> } - @ OR @ OR @ OR @ OR @ OR @ +<#shapeExpr> @<#ShapeOr> OR @<#ShapeAnd> OR @<#ShapeNot> OR @<#NodeConstraint> OR @<#Shape> OR @<#ShapeExternal> - CLOSED { +<#ShapeOr> CLOSED { a [sx:ShapeOr] ; - sx:shapeExprs @ + sx:shapeExprs @<#shapeDeclOrExprList2Plus> } - CLOSED { +<#ShapeAnd> CLOSED { a [sx:ShapeAnd] ; - sx:shapeExprs @ + sx:shapeExprs @<#shapeDeclOrExprList2Plus> } - CLOSED { +<#ShapeNot> CLOSED { a [sx:ShapeNot] ; - sx:shapeExpr @ + sx:shapeExpr @<#shapeDeclOrExpr> } - CLOSED { +<#NodeConstraint> CLOSED { a [sx:NodeConstraint] ; sx:nodeKind [sx:iri sx:bnode sx:literal sx:nonliteral] ? ; sx:datatype IRI ? ; - & ; - sx:values @ ? + &<#xsFacets> ; + sx:values @<#valueSetValueList1Plus> ? } - CLOSED { +<#Shape> CLOSED { a [sx:Shape] ; - sx:extends @? ; + sx:extends @<#shapeDeclOrExprList1Plus>? ; sx:closed [true false] ? ; sx:extra IRI * ; - sx:expression @ ? ; - sx:semActs @ ? ; - sx:annotation @ ? + sx:expression @<#tripleExpression> ? ; + sx:semActs @<#SemActList1Plus> ? ; + sx:annotation @<#AnnotationList1Plus> ? } - CLOSED { +<#ShapeExternal> CLOSED { a [sx:ShapeExternal] } - CLOSED { +<#SemAct> CLOSED { a [sx:SemAct] ; sx:name IRI ; sx:code xsd:string ? } - CLOSED { +<#Annotation> CLOSED { a [sx:Annotation] ; sx:predicate IRI ; - sx:object @ + sx:object @<#objectValue> } -# @ OR @ - { # hold labeled productions - $ ( & | & ) * ; - $ ( +# <#xsFacet> @<#stringFacet> OR @<#numericFacet> +<#facet_holder> { # hold labeled productions + $<#xsFacets> ( &<#stringFacet> | &<#numericFacet> ) * ; + $<#stringFacet> ( sx:length xsd:integer | sx:minlength xsd:integer | sx:maxlength xsd:integer | sx:pattern xsd:string ; sx:flags xsd:string ? ) ; - $ ( - sx:mininclusive @ - | sx:minexclusive @ - | sx:maxinclusive @ - | sx:maxexclusive @ + $<#numericFacet> ( + sx:mininclusive @<#numericLiteral> + | sx:minexclusive @<#numericLiteral> + | sx:maxinclusive @<#numericLiteral> + | sx:maxexclusive @<#numericLiteral> | sx:totaldigits xsd:integer | sx:fractiondigits xsd:integer ) } - xsd:integer OR xsd:decimal OR xsd:double +<#numericLiteral> xsd:integer OR xsd:decimal OR xsd:double - @ OR @ OR @ - OR @ OR @ - OR @ OR @ OR @ - IRI OR LITERAL # rdf:langString breaks on Annotation.object - CLOSED { a [sx:Language] ; sx:languageTag xsd:string } - CLOSED { a [sx:IriStem] ; sx:stem xsd:string } - CLOSED { +<#valueSetValue> @<#objectValue> OR @<#IriStem> OR @<#IriStemRange> + OR @<#LiteralStem> OR @<#LiteralStemRange> + OR @<#Language> OR @<#LanguageStem> OR @<#LanguageStemRange> +<#objectValue> IRI OR LITERAL # rdf:langString breaks on Annotation.object +<#Language> CLOSED { a [sx:Language] ; sx:languageTag xsd:string } +<#IriStem> CLOSED { a [sx:IriStem] ; sx:stem xsd:string } +<#IriStemRange> CLOSED { a [sx:IriStemRange] ; - sx:stem xsd:string OR @ ; - sx:exclusion @ + sx:stem xsd:string OR @<#Wildcard> ; + sx:exclusion @<#IriStemExclusionList1Plus> } - CLOSED { a [sx:LiteralStem] ; sx:stem xsd:string } - CLOSED { +<#LiteralStem> CLOSED { a [sx:LiteralStem] ; sx:stem xsd:string } +<#LiteralStemRange> CLOSED { a [sx:LiteralStemRange] ; - sx:stem xsd:string OR @ ; - sx:exclusion @ + sx:stem xsd:string OR @<#Wildcard> ; + sx:exclusion @<#LiteralStemExclusionList1Plus> } - CLOSED { a [sx:LanguageStem] ; sx:stem xsd:string } - CLOSED { +<#LanguageStem> CLOSED { a [sx:LanguageStem] ; sx:stem xsd:string } +<#LanguageStemRange> CLOSED { a [sx:LanguageStemRange] ; - sx:stem xsd:string OR @ ; - sx:exclusion @ + sx:stem xsd:string OR @<#Wildcard> ; + sx:exclusion @<#LanguageStemExclusionList1Plus> } - BNODE CLOSED { +<#Wildcard> BNODE CLOSED { a [sx:Wildcard] } - @ OR @ OR @ OR CLOSED { } +<#tripleExpression> @<#TripleConstraint> OR @<#OneOf> OR @<#EachOf> OR CLOSED { } - CLOSED { +<#OneOf> CLOSED { a [sx:OneOf] ; sx:min xsd:integer ? ; sx:max xsd:integer ? ; - sx:expressions @ ; - sx:semActs @ ? ; - sx:annotation @ ? + sx:expressions @<#tripleExpressionList2Plus> ; + sx:semActs @<#SemActList1Plus> ? ; + sx:annotation @<#AnnotationList1Plus> ? } - CLOSED { +<#EachOf> CLOSED { a [sx:EachOf] ; sx:min xsd:integer ? ; sx:max xsd:integer ? ; - sx:expressions @ ; - sx:semActs @ ? ; - sx:annotation @ ? + sx:expressions @<#tripleExpressionList2Plus> ; + sx:semActs @<#SemActList1Plus> ? ; + sx:annotation @<#AnnotationList1Plus> ? } - CLOSED { - rdf:first @ ; - rdf:rest @ +<#tripleExpressionList2Plus> CLOSED { + rdf:first @<#tripleExpression> ; + rdf:rest @<#tripleExpressionList1Plus> } - CLOSED { - rdf:first @ ; - rdf:rest [rdf:nil] OR @ +<#tripleExpressionList1Plus> CLOSED { + rdf:first @<#tripleExpression> ; + rdf:rest [rdf:nil] OR @<#tripleExpressionList1Plus> } - CLOSED { +<#TripleConstraint> CLOSED { a [sx:TripleConstraint] ; sx:inverse [true false] ? ; sx:negated [true false] ? ; sx:min xsd:integer ? ; sx:max xsd:integer ? ; sx:predicate IRI ; - sx:valueExpr @ ? ; - sx:semActs @ ? ; - sx:annotation @ ? + sx:valueExpr @<#shapeDeclOrExpr> ? ; + sx:semActs @<#SemActList1Plus> ? ; + sx:annotation @<#AnnotationList1Plus> ? } - CLOSED { +<#IriList1Plus> CLOSED { rdf:first IRI ; - rdf:rest [rdf:nil] OR @ + rdf:rest [rdf:nil] OR @<#IriList1Plus> } - CLOSED { - rdf:first @ ; - rdf:rest [rdf:nil] OR @ +<#SemActList1Plus> CLOSED { + rdf:first @<#SemAct> ; + rdf:rest [rdf:nil] OR @<#SemActList1Plus> } - CLOSED { - rdf:first @ ; - rdf:rest @ +<#shapeDeclOrExprList2Plus> CLOSED { + rdf:first @<#shapeDeclOrExpr> ; + rdf:rest @<#shapeDeclOrExprList1Plus> } - CLOSED { - rdf:first @ ; - rdf:rest [rdf:nil] OR @ +<#shapeDeclOrExprList1Plus> CLOSED { + rdf:first @<#shapeDeclOrExpr> ; + rdf:rest [rdf:nil] OR @<#shapeDeclOrExprList1Plus> } - CLOSED { - rdf:first @ ; - rdf:rest [rdf:nil] OR @ +<#valueSetValueList1Plus> CLOSED { + rdf:first @<#valueSetValue> ; + rdf:rest [rdf:nil] OR @<#valueSetValueList1Plus> } - CLOSED { - rdf:first @ ; - rdf:rest [rdf:nil] OR @ +<#AnnotationList1Plus> CLOSED { + rdf:first @<#Annotation> ; + rdf:rest [rdf:nil] OR @<#AnnotationList1Plus> } - CLOSED { - rdf:first IRI OR @ ; - rdf:rest [rdf:nil] OR @ +<#IriStemExclusionList1Plus> CLOSED { + rdf:first IRI OR @<#IriStem> ; + rdf:rest [rdf:nil] OR @<#IriStemExclusionList1Plus> } - CLOSED { - rdf:first xsd:string OR @ ; - rdf:rest [rdf:nil] OR @ +<#LiteralStemExclusionList1Plus> CLOSED { + rdf:first xsd:string OR @<#LiteralStem> ; + rdf:rest [rdf:nil] OR @<#LiteralStemExclusionList1Plus> } - CLOSED { - rdf:first xsd:string OR @ ; - rdf:rest [rdf:nil] OR @ +<#LanguageStemExclusionList1Plus> CLOSED { + rdf:first xsd:string OR @<#LanguageStem> ; + rdf:rest [rdf:nil] OR @<#LanguageStemExclusionList1Plus> } diff --git a/schemas/0.ttl b/schemas/0.ttl index a2f6447e..1488abdf 100644 --- a/schemas/0.ttl +++ b/schemas/0.ttl @@ -5,5 +5,5 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ] . diff --git a/schemas/0Extends1.ttl b/schemas/0Extends1.ttl index 6f31c6b1..36ce7912 100644 --- a/schemas/0Extends1.ttl +++ b/schemas/0Extends1.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . - a sx:Shape ; sx:extends () . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extends () ] . diff --git a/schemas/0focusBNODE.ttl b/schemas/0focusBNODE.ttl index fa104288..d92a9ac2 100644 --- a/schemas/0focusBNODE.ttl +++ b/schemas/0focusBNODE.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:nodeKind sx:bnode ] [ a sx:Shape ] - ). + )] . diff --git a/schemas/0focusIRI.ttl b/schemas/0focusIRI.ttl index dc976557..ca0c1946 100644 --- a/schemas/0focusIRI.ttl +++ b/schemas/0focusIRI.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:nodeKind sx:iri ] [ a sx:Shape ] - ). + )] . diff --git a/schemas/1Adot.ttl b/schemas/1Adot.ttl index 791b0f48..d25aee83 100644 --- a/schemas/1Adot.ttl +++ b/schemas/1Adot.ttl @@ -6,7 +6,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate rdf:type ] . + sx:predicate rdf:type ] ] . diff --git a/schemas/1IRIInline0.ttl b/schemas/1IRIInline0.ttl index ce99b88a..b8c4126a 100644 --- a/schemas/1IRIInline0.ttl +++ b/schemas/1IRIInline0.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -17,5 +17,5 @@ PREFIX xsd: [ a sx:Shape ] ) ] - ] . + ] ] . diff --git a/schemas/1IRI_with_UCHAR.1dot.ttl b/schemas/1IRI_with_UCHAR.1dot.ttl index d83aa495..af58a7de 100644 --- a/schemas/1IRI_with_UCHAR.1dot.ttl +++ b/schemas/1IRI_with_UCHAR.1dot.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1IRI_with_all_punctuationdot.ttl b/schemas/1IRI_with_all_punctuationdot.ttl index 0b0ee224..47a05d47 100644 --- a/schemas/1IRI_with_all_punctuationdot.ttl +++ b/schemas/1IRI_with_all_punctuationdot.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1Include1-after.ttl b/schemas/1Include1-after.ttl index 03fa9152..2911f2ad 100644 --- a/schemas/1Include1-after.ttl +++ b/schemas/1Include1-after.ttl @@ -4,11 +4,11 @@ PREFIX sx: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr . diff --git a/schemas/1Include1.ttl b/schemas/1Include1.ttl index 03fa9152..2911f2ad 100644 --- a/schemas/1Include1.ttl +++ b/schemas/1Include1.ttl @@ -4,11 +4,11 @@ PREFIX sx: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr . diff --git a/schemas/1Length.ttl b/schemas/1Length.ttl index 85ccaf08..e208f59f 100644 --- a/schemas/1Length.ttl +++ b/schemas/1Length.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:length 5 ] ] . + sx:length 5 ] ] ] . diff --git a/schemas/1NOTIRI.ttl b/schemas/1NOTIRI.ttl index 4356a854..b94d19c2 100644 --- a/schemas/1NOTIRI.ttl +++ b/schemas/1NOTIRI.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -13,5 +13,5 @@ PREFIX xsd: a sx:ShapeNot ; sx:shapeExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:iri ] ] ] . + sx:nodeKind sx:iri ] ] ] ] . diff --git a/schemas/1NOTNOTIRI.ttl b/schemas/1NOTNOTIRI.ttl index 1421e17b..2b3f6e8f 100644 --- a/schemas/1NOTNOTIRI.ttl +++ b/schemas/1NOTNOTIRI.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -15,5 +15,5 @@ PREFIX xsd: a sx:ShapeNot ; sx:shapeExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:iri ] ] ] ] . + sx:nodeKind sx:iri ] ] ] ] ] . diff --git a/schemas/1NOTNOTdot.ttl b/schemas/1NOTNOTdot.ttl index ded923b1..8167580f 100644 --- a/schemas/1NOTNOTdot.ttl +++ b/schemas/1NOTNOTdot.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -14,5 +14,5 @@ PREFIX xsd: sx:shapeExpr [ a sx:ShapeNot ; sx:shapeExpr [ - a sx:Shape ] ] ] ]. + a sx:Shape ] ] ] ]] . diff --git a/schemas/1NOTNOTvs.ttl b/schemas/1NOTNOTvs.ttl index b14929bf..8e7d59dc 100644 --- a/schemas/1NOTNOTvs.ttl +++ b/schemas/1NOTNOTvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -15,5 +15,5 @@ PREFIX xsd: a sx:ShapeNot ; sx:shapeExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] ] ]. + sx:values ( ) ] ] ] ]] . diff --git a/schemas/1NOT_literalANDvs_.ttl b/schemas/1NOT_literalANDvs_.ttl index c158a89a..fc9aacd7 100644 --- a/schemas/1NOT_literalANDvs_.ttl +++ b/schemas/1NOT_literalANDvs_.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:nodeKind sx:literal ] [ a sx:NodeConstraint ; sx:values ( ) ] - ) ] ] ] . + ) ] ] ] ] . diff --git a/schemas/1NOT_literalORvs_.ttl b/schemas/1NOT_literalORvs_.ttl index 32fc1e01..93513921 100644 --- a/schemas/1NOT_literalORvs_.ttl +++ b/schemas/1NOT_literalORvs_.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:nodeKind sx:literal ] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] ] . + ) ] ] ] ] . diff --git a/schemas/1NOT_vsANDvs_.ttl b/schemas/1NOT_vsANDvs_.ttl index 89213760..b49c458a 100644 --- a/schemas/1NOT_vsANDvs_.ttl +++ b/schemas/1NOT_vsANDvs_.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:values ( )] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] ] . + ) ] ] ] ] . diff --git a/schemas/1NOT_vsORvs_.ttl b/schemas/1NOT_vsORvs_.ttl index ccda182f..29b349d8 100644 --- a/schemas/1NOT_vsORvs_.ttl +++ b/schemas/1NOT_vsORvs_.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:values ( )] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] ] . + ) ] ] ] ] . diff --git a/schemas/1NOTdot.ttl b/schemas/1NOTdot.ttl index 405bce8a..d36ae6a1 100644 --- a/schemas/1NOTdot.ttl +++ b/schemas/1NOTdot.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeNot ; sx:shapeExpr [ - a sx:Shape ] ] ]. + a sx:Shape ] ] ]] . diff --git a/schemas/1NOTliteralANDvs.ttl b/schemas/1NOTliteralANDvs.ttl index 0ecb398a..654c6d91 100644 --- a/schemas/1NOTliteralANDvs.ttl +++ b/schemas/1NOTliteralANDvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:nodeKind sx:literal ] ] [ a sx:NodeConstraint ; sx:values ( ) ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1NOTliteralORvs.ttl b/schemas/1NOTliteralORvs.ttl index 223c68a5..729d2e87 100644 --- a/schemas/1NOTliteralORvs.ttl +++ b/schemas/1NOTliteralORvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:nodeKind sx:literal ] ] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1NOTvs.ttl b/schemas/1NOTvs.ttl index 2fc8b3eb..b2466b2c 100644 --- a/schemas/1NOTvs.ttl +++ b/schemas/1NOTvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -13,5 +13,5 @@ PREFIX xsd: a sx:ShapeNot ; sx:shapeExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] ] . + sx:values ( ) ] ] ] ] . diff --git a/schemas/1NOTvsANDvs.ttl b/schemas/1NOTvsANDvs.ttl index 1d8142ad..c9dbb470 100644 --- a/schemas/1NOTvsANDvs.ttl +++ b/schemas/1NOTvsANDvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:values ( )]] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1NOTvsORvs.ttl b/schemas/1NOTvsORvs.ttl index 6d21bd18..c14853d7 100644 --- a/schemas/1NOTvsORvs.ttl +++ b/schemas/1NOTvsORvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:values ( )]] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1_NOTliteral_ANDvs.ttl b/schemas/1_NOTliteral_ANDvs.ttl index 0ecb398a..654c6d91 100644 --- a/schemas/1_NOTliteral_ANDvs.ttl +++ b/schemas/1_NOTliteral_ANDvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:nodeKind sx:literal ] ] [ a sx:NodeConstraint ; sx:values ( ) ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1_NOTliteral_ORvs.ttl b/schemas/1_NOTliteral_ORvs.ttl index 5b7cd585..ff0627ac 100644 --- a/schemas/1_NOTliteral_ORvs.ttl +++ b/schemas/1_NOTliteral_ORvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:nodeKind sx:literal ]] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1_NOTvs_ANDvs.ttl b/schemas/1_NOTvs_ANDvs.ttl index 11862cd7..1729bd85 100644 --- a/schemas/1_NOTvs_ANDvs.ttl +++ b/schemas/1_NOTvs_ANDvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:values ( ) ]] [ a sx:NodeConstraint ; sx:values ( ) ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1_NOTvs_ORvs.ttl b/schemas/1_NOTvs_ORvs.ttl index 50cee4d9..615044b2 100644 --- a/schemas/1_NOTvs_ORvs.ttl +++ b/schemas/1_NOTvs_ORvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -18,4 +18,4 @@ PREFIX xsd: sx:values ( )] ] [ a sx:NodeConstraint ; sx:values ( )] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1bnode.ttl b/schemas/1bnode.ttl index e75ec51d..9d938a53 100644 --- a/schemas/1bnode.ttl +++ b/schemas/1bnode.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:bnode ] ] . + sx:nodeKind sx:bnode ] ] ] . diff --git a/schemas/1bnodeLength.ttl b/schemas/1bnodeLength.ttl index 84befdbf..422f17d0 100644 --- a/schemas/1bnodeLength.ttl +++ b/schemas/1bnodeLength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:length 5 ; - sx:nodeKind sx:bnode ] ] . + sx:nodeKind sx:bnode ] ] ] . diff --git a/schemas/1bnodeMaxlength.ttl b/schemas/1bnodeMaxlength.ttl index 94241ba5..cf772db1 100644 --- a/schemas/1bnodeMaxlength.ttl +++ b/schemas/1bnodeMaxlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:maxlength 5 ; - sx:nodeKind sx:bnode ] ] . + sx:nodeKind sx:bnode ] ] ] . diff --git a/schemas/1bnodeMinlength.ttl b/schemas/1bnodeMinlength.ttl index b016fa3c..8eef2f4a 100644 --- a/schemas/1bnodeMinlength.ttl +++ b/schemas/1bnodeMinlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:bnode ] ] . + sx:nodeKind sx:bnode ] ] ] . diff --git a/schemas/1bnodePattern.ttl b/schemas/1bnodePattern.ttl index c07d5f8d..6b491f80 100644 --- a/schemas/1bnodePattern.ttl +++ b/schemas/1bnodePattern.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:bnode ; - sx:pattern "bc" ] ] . + sx:pattern "bc" ] ] ] . diff --git a/schemas/1bnodeRef1.ttl b/schemas/1bnodeRef1.ttl index 5f371e71..21292c9a 100644 --- a/schemas/1bnodeRef1.ttl +++ b/schemas/1bnodeRef1.ttl @@ -6,14 +6,14 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; - sx:nodeKind sx:bnode ] ) ] ] . + sx:nodeKind sx:bnode ] ) ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1bnodeRefORRefMinlength.ttl b/schemas/1bnodeRefORRefMinlength.ttl index 0e4900ad..a96f1f3a 100644 --- a/schemas/1bnodeRefORRefMinlength.ttl +++ b/schemas/1bnodeRefORRefMinlength.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeAnd ; sx:shapeExprs ( @@ -16,5 +16,5 @@ PREFIX xsd: [ a sx:NodeConstraint ; sx:minlength 20 ] ) ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1card2.ttl b/schemas/1card2.ttl index 7bc7faad..9f85d318 100644 --- a/schemas/1card2.ttl +++ b/schemas/1card2.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max 2 ; sx:min 2 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1card25.ttl b/schemas/1card25.ttl index 77f4d4ee..d09490f5 100644 --- a/schemas/1card25.ttl +++ b/schemas/1card25.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max 5 ; sx:min 2 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1card2Star.ttl b/schemas/1card2Star.ttl index cb1a4ba4..912e9a27 100644 --- a/schemas/1card2Star.ttl +++ b/schemas/1card2Star.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max -1 ; sx:min 2 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1card2blank.ttl b/schemas/1card2blank.ttl index cb1a4ba4..912e9a27 100644 --- a/schemas/1card2blank.ttl +++ b/schemas/1card2blank.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max -1 ; sx:min 2 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1cardOpt.ttl b/schemas/1cardOpt.ttl index 921ec744..6e27c47d 100644 --- a/schemas/1cardOpt.ttl +++ b/schemas/1cardOpt.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max 1 ; sx:min 0 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1cardPlus.ttl b/schemas/1cardPlus.ttl index 4b4bd7a8..f390d6b5 100644 --- a/schemas/1cardPlus.ttl +++ b/schemas/1cardPlus.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max -1 ; sx:min 1 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1cardStar.ttl b/schemas/1cardStar.ttl index a9300d41..b9aaa445 100644 --- a/schemas/1cardStar.ttl +++ b/schemas/1cardStar.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max -1 ; sx:min 0 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1datatype.ttl b/schemas/1datatype.ttl index b23d4aa2..64036ddc 100644 --- a/schemas/1datatype.ttl +++ b/schemas/1datatype.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:datatype ] ] . + sx:datatype ] ] ] . diff --git a/schemas/1datatypeLength.ttl b/schemas/1datatypeLength.ttl index 66b54655..3000a05f 100644 --- a/schemas/1datatypeLength.ttl +++ b/schemas/1datatypeLength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:length 5 ] ] . + sx:length 5 ] ] ] . diff --git a/schemas/1datatypeRef1.ttl b/schemas/1datatypeRef1.ttl index f6dc1bd9..a5ea9293 100644 --- a/schemas/1datatypeRef1.ttl +++ b/schemas/1datatypeRef1.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:datatype ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1datatypelangString.ttl b/schemas/1datatypelangString.ttl index 7a18446b..1f7280a1 100644 --- a/schemas/1datatypelangString.ttl +++ b/schemas/1datatypelangString.ttl @@ -6,9 +6,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:datatype rdf:langString ] ] . + sx:datatype rdf:langString ] ] ] . diff --git a/schemas/1decimalMaxexclusiveDECIMAL.ttl b/schemas/1decimalMaxexclusiveDECIMAL.ttl index cda3a5a0..4a8cda74 100644 --- a/schemas/1decimalMaxexclusiveDECIMAL.ttl +++ b/schemas/1decimalMaxexclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxexclusive "5.5"^^xsd:decimal ] ] . + sx:maxexclusive "5.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1decimalMaxexclusiveDOUBLE.ttl b/schemas/1decimalMaxexclusiveDOUBLE.ttl index 8526e3b7..398bda1b 100644 --- a/schemas/1decimalMaxexclusiveDOUBLE.ttl +++ b/schemas/1decimalMaxexclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxexclusive "5.5E0"^^xsd:double ] ] . + sx:maxexclusive "5.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1decimalMaxexclusiveINTEGER.ttl b/schemas/1decimalMaxexclusiveINTEGER.ttl index 743ab90e..d82227c1 100644 --- a/schemas/1decimalMaxexclusiveINTEGER.ttl +++ b/schemas/1decimalMaxexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1decimalMaxexclusivexsd-byte.ttl b/schemas/1decimalMaxexclusivexsd-byte.ttl index 743ab90e..d82227c1 100644 --- a/schemas/1decimalMaxexclusivexsd-byte.ttl +++ b/schemas/1decimalMaxexclusivexsd-byte.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1decimalMaxinclusiveDECIMAL.ttl b/schemas/1decimalMaxinclusiveDECIMAL.ttl index 5f3e3274..b00584be 100644 --- a/schemas/1decimalMaxinclusiveDECIMAL.ttl +++ b/schemas/1decimalMaxinclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxinclusive "5.5"^^xsd:decimal ] ] . + sx:maxinclusive "5.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1decimalMaxinclusiveDOUBLE.ttl b/schemas/1decimalMaxinclusiveDOUBLE.ttl index 86ce4f88..0f702122 100644 --- a/schemas/1decimalMaxinclusiveDOUBLE.ttl +++ b/schemas/1decimalMaxinclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxinclusive "5.5E0"^^xsd:double ] ] . + sx:maxinclusive "5.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1decimalMaxinclusiveINTEGER.ttl b/schemas/1decimalMaxinclusiveINTEGER.ttl index 1c494324..e9a83cc7 100644 --- a/schemas/1decimalMaxinclusiveINTEGER.ttl +++ b/schemas/1decimalMaxinclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:maxinclusive 5 ] ] . + sx:maxinclusive 5 ] ] ] . diff --git a/schemas/1decimalMinexclusiveDECIMAL.ttl b/schemas/1decimalMinexclusiveDECIMAL.ttl index 9e393e9d..154cea84 100644 --- a/schemas/1decimalMinexclusiveDECIMAL.ttl +++ b/schemas/1decimalMinexclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:minexclusive "4.5"^^xsd:decimal ] ] . + sx:minexclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1decimalMinexclusiveDOUBLE.ttl b/schemas/1decimalMinexclusiveDOUBLE.ttl index 06b28dab..a367bd17 100644 --- a/schemas/1decimalMinexclusiveDOUBLE.ttl +++ b/schemas/1decimalMinexclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:minexclusive "4.5E0"^^xsd:double ] ] . + sx:minexclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1decimalMinexclusiveINTEGER.ttl b/schemas/1decimalMinexclusiveINTEGER.ttl index 5ea6f611..7585dd6a 100644 --- a/schemas/1decimalMinexclusiveINTEGER.ttl +++ b/schemas/1decimalMinexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:minexclusive 5 ] ] . + sx:minexclusive 5 ] ] ] . diff --git a/schemas/1decimalMininclusiveDECIMAL.ttl b/schemas/1decimalMininclusiveDECIMAL.ttl index 09311392..542fc9eb 100644 --- a/schemas/1decimalMininclusiveDECIMAL.ttl +++ b/schemas/1decimalMininclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive "4.5"^^xsd:decimal ] ] . + sx:mininclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1decimalMininclusiveDECIMALLeadTrail.ttl b/schemas/1decimalMininclusiveDECIMALLeadTrail.ttl index 17d3a8b2..eae1121d 100644 --- a/schemas/1decimalMininclusiveDECIMALLeadTrail.ttl +++ b/schemas/1decimalMininclusiveDECIMALLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive "04.50"^^xsd:decimal ] ] . + sx:mininclusive "04.50"^^xsd:decimal ] ] ] . diff --git a/schemas/1decimalMininclusiveDECIMALintLeadTrail.ttl b/schemas/1decimalMininclusiveDECIMALintLeadTrail.ttl index 2c6b282b..97ccbe38 100644 --- a/schemas/1decimalMininclusiveDECIMALintLeadTrail.ttl +++ b/schemas/1decimalMininclusiveDECIMALintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1decimalMininclusiveDOUBLE.ttl b/schemas/1decimalMininclusiveDOUBLE.ttl index 4d62b831..54927b48 100644 --- a/schemas/1decimalMininclusiveDOUBLE.ttl +++ b/schemas/1decimalMininclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive "4.5E0"^^xsd:double ] ] . + sx:mininclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1decimalMininclusiveDOUBLELeadTrail.ttl b/schemas/1decimalMininclusiveDOUBLELeadTrail.ttl index 98d758fb..bad62da8 100644 --- a/schemas/1decimalMininclusiveDOUBLELeadTrail.ttl +++ b/schemas/1decimalMininclusiveDOUBLELeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive "04.50E0"^^xsd:double ] ] . + sx:mininclusive "04.50E0"^^xsd:double ] ] ] . diff --git a/schemas/1decimalMininclusiveDOUBLEintLeadTrail.ttl b/schemas/1decimalMininclusiveDOUBLEintLeadTrail.ttl index 2c6b282b..97ccbe38 100644 --- a/schemas/1decimalMininclusiveDOUBLEintLeadTrail.ttl +++ b/schemas/1decimalMininclusiveDOUBLEintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1decimalMininclusiveINTEGER.ttl b/schemas/1decimalMininclusiveINTEGER.ttl index 2c6b282b..97ccbe38 100644 --- a/schemas/1decimalMininclusiveINTEGER.ttl +++ b/schemas/1decimalMininclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1decimalMininclusiveINTEGERLead.ttl b/schemas/1decimalMininclusiveINTEGERLead.ttl index 2c6b282b..97ccbe38 100644 --- a/schemas/1decimalMininclusiveINTEGERLead.ttl +++ b/schemas/1decimalMininclusiveINTEGERLead.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1dot-base.ttl b/schemas/1dot-base.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dot-base.ttl +++ b/schemas/1dot-base.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dot.ttl b/schemas/1dot.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dot.ttl +++ b/schemas/1dot.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dot3Extends.ttl b/schemas/1dot3Extends.ttl index d649de5a..0bc50205 100644 --- a/schemas/1dot3Extends.ttl +++ b/schemas/1dot3Extends.ttl @@ -5,19 +5,19 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . - a sx:Shape ; sx:extends ( ) ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extends ( ) ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . diff --git a/schemas/1dotAND1dotAND1dot.ttl b/schemas/1dotAND1dotAND1dot.ttl index de8cd9dd..047e488c 100644 --- a/schemas/1dotAND1dotAND1dot.ttl +++ b/schemas/1dotAND1dotAND1dot.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] ) -. +] . diff --git a/schemas/1dotANDopen1dotAND1dotclose.ttl b/schemas/1dotANDopen1dotAND1dotclose.ttl index 163ad6e2..c6b095ba 100644 --- a/schemas/1dotANDopen1dotAND1dotclose.ttl +++ b/schemas/1dotANDopen1dotAND1dotclose.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] [ a sx:ShapeAnd ; @@ -14,4 +14,4 @@ PREFIX xsd: [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] ) ] ) -. +] . diff --git a/schemas/1dotAnnot3.ttl b/schemas/1dotAnnot3.ttl index a07f6afd..8823989d 100644 --- a/schemas/1dotAnnot3.ttl +++ b/schemas/1dotAnnot3.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:annotation ( [ a sx:Annotation ; sx:predicate ; sx:object "1" ] [ a sx:Annotation ; sx:predicate ; sx:object "2" ] [ a sx:Annotation ; sx:predicate ; sx:object "3" ] ) - ] . + ] ] . diff --git a/schemas/1dotAnnotAIRIREF.ttl b/schemas/1dotAnnotAIRIREF.ttl index 7d07a45a..ab8effd0 100644 --- a/schemas/1dotAnnotAIRIREF.ttl +++ b/schemas/1dotAnnotAIRIREF.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:annotation ([ a sx:Annotation ; sx:object ; sx:predicate rdf:type ]) ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotAnnotIRIREF.ttl b/schemas/1dotAnnotIRIREF.ttl index 2e9232fa..1a58af94 100644 --- a/schemas/1dotAnnotIRIREF.ttl +++ b/schemas/1dotAnnotIRIREF.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:annotation ([ a sx:Annotation ; sx:object ; sx:predicate ]) ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotAnnotSTRING_LITERAL1.ttl b/schemas/1dotAnnotSTRING_LITERAL1.ttl index 56f9db91..05d30ea7 100644 --- a/schemas/1dotAnnotSTRING_LITERAL1.ttl +++ b/schemas/1dotAnnotSTRING_LITERAL1.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:annotation ([ a sx:Annotation ; sx:object "STRING_LITERAL1" ; sx:predicate ]) ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotClosed.ttl b/schemas/1dotClosed.ttl index 03ba836a..090ec247 100644 --- a/schemas/1dotClosed.ttl +++ b/schemas/1dotClosed.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotCode1.ttl b/schemas/1dotCode1.ttl index ad989d77..2854cb4c 100644 --- a/schemas/1dotCode1.ttl +++ b/schemas/1dotCode1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:semActs ([ a sx:SemAct; sx:code " print(o) "; sx:name - ]) ] . + ]) ] ] . diff --git a/schemas/1dotCode3.ttl b/schemas/1dotCode3.ttl index 96b7af15..8a3f6044 100644 --- a/schemas/1dotCode3.ttl +++ b/schemas/1dotCode3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:semActs ([ @@ -20,5 +20,5 @@ PREFIX xsd: a sx:SemAct; sx:code " print(o) "; sx:name - ]) ] . + ]) ] ] . diff --git a/schemas/1dotCode3fail.ttl b/schemas/1dotCode3fail.ttl index b2a7d71c..a4184a1f 100644 --- a/schemas/1dotCode3fail.ttl +++ b/schemas/1dotCode3fail.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:semActs ([ @@ -20,5 +20,5 @@ PREFIX xsd: a sx:SemAct; sx:code " print(o) "; sx:name - ])] . + ])] ] . diff --git a/schemas/1dotCodeWithEscapes1.ttl b/schemas/1dotCodeWithEscapes1.ttl index 723c63e2..e0848429 100644 --- a/schemas/1dotCodeWithEscapes1.ttl +++ b/schemas/1dotCodeWithEscapes1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:semActs ([ a sx:SemAct; sx:code " print(\"%{\\\\%}\") "; sx:name - ])] . + ])] ] . diff --git a/schemas/1dotExtends1.ttl b/schemas/1dotExtends1.ttl index bb7cd3f8..2b6853a4 100644 --- a/schemas/1dotExtends1.ttl +++ b/schemas/1dotExtends1.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . - a sx:Shape ; sx:extends () ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extends () ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . diff --git a/schemas/1dotExtra1.ttl b/schemas/1dotExtra1.ttl index 2b0be51b..920ee97e 100644 --- a/schemas/1dotExtra1.ttl +++ b/schemas/1dotExtra1.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ; - sx:extra . + sx:extra ] . diff --git a/schemas/1dotIMPORT1dot.ttl b/schemas/1dotIMPORT1dot.ttl index 3dba0035..cc5533e2 100644 --- a/schemas/1dotIMPORT1dot.ttl +++ b/schemas/1dotIMPORT1dot.ttl @@ -6,7 +6,7 @@ PREFIX xsd: sx:imports (<1dot>) ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotInline1.ttl b/schemas/1dotInline1.ttl index 53c9a86c..b1e2f46b 100644 --- a/schemas/1dotInline1.ttl +++ b/schemas/1dotInline1.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ] . + sx:predicate ] ] ] ] . diff --git a/schemas/1dotLNdefault.ttl b/schemas/1dotLNdefault.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotLNdefault.ttl +++ b/schemas/1dotLNdefault.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotLNex-HYPHEN_MINUS.ttl b/schemas/1dotLNex-HYPHEN_MINUS.ttl index 35e329d0..9a87e348 100644 --- a/schemas/1dotLNex-HYPHEN_MINUS.ttl +++ b/schemas/1dotLNex-HYPHEN_MINUS.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotLNex.ttl b/schemas/1dotLNex.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotLNex.ttl +++ b/schemas/1dotLNex.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotLNexMultiComment.ttl b/schemas/1dotLNexMultiComment.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotLNexMultiComment.ttl +++ b/schemas/1dotLNexMultiComment.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotLNexSingleComment.ttl b/schemas/1dotLNexSingleComment.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotLNexSingleComment.ttl +++ b/schemas/1dotLNexSingleComment.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotNS2.ttl b/schemas/1dotNS2.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotNS2.ttl +++ b/schemas/1dotNS2.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotNS2MultiComment.ttl b/schemas/1dotNS2MultiComment.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotNS2MultiComment.ttl +++ b/schemas/1dotNS2MultiComment.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotNS2SingleComment.ttl b/schemas/1dotNS2SingleComment.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotNS2SingleComment.ttl +++ b/schemas/1dotNS2SingleComment.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotNSdefault.ttl b/schemas/1dotNSdefault.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotNSdefault.ttl +++ b/schemas/1dotNSdefault.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotNoCode1.ttl b/schemas/1dotNoCode1.ttl index cb50f6cf..2eea1580 100644 --- a/schemas/1dotNoCode1.ttl +++ b/schemas/1dotNoCode1.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:semActs ([ a sx:SemAct; sx:name - ])] . + ])] ] . diff --git a/schemas/1dotNoCode3.ttl b/schemas/1dotNoCode3.ttl index 877c66ee..38589ab9 100644 --- a/schemas/1dotNoCode3.ttl +++ b/schemas/1dotNoCode3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:semActs ([ @@ -17,5 +17,5 @@ PREFIX xsd: ] [ a sx:SemAct; sx:name - ])] . + ])] ] . diff --git a/schemas/1dotOne1dot.ttl b/schemas/1dotOne1dot.ttl index fc73ad92..c4f13c3b 100644 --- a/schemas/1dotOne1dot.ttl +++ b/schemas/1dotOne1dot.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] - ) ] . + ) ] ] . diff --git a/schemas/1dotOne2dot.ttl b/schemas/1dotOne2dot.ttl index 49ede841..d425d519 100644 --- a/schemas/1dotOne2dot.ttl +++ b/schemas/1dotOne2dot.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/1dotPlusAnnotIRIREF.ttl b/schemas/1dotPlusAnnotIRIREF.ttl index cefdfa2d..8266e62c 100644 --- a/schemas/1dotPlusAnnotIRIREF.ttl +++ b/schemas/1dotPlusAnnotIRIREF.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:annotation ([ a sx:Annotation ; sx:object ; sx:predicate ]) ; sx:max -1 ; sx:min 1 ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRef1.ttl b/schemas/1dotRef1.ttl index 66341de3..9bd1dbce 100644 --- a/schemas/1dotRef1.ttl +++ b/schemas/1dotRef1.ttl @@ -6,12 +6,12 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRefAND3.ttl b/schemas/1dotRefAND3.ttl index 07704f86..25898f38 100644 --- a/schemas/1dotRefAND3.ttl +++ b/schemas/1dotRefAND3.ttl @@ -8,24 +8,24 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; sx:shapeExprs ( - ) ] ] . + ) ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRefLNex1.ttl b/schemas/1dotRefLNex1.ttl index 66341de3..9bd1dbce 100644 --- a/schemas/1dotRefLNex1.ttl +++ b/schemas/1dotRefLNex1.ttl @@ -6,12 +6,12 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRefNS1.ttl b/schemas/1dotRefNS1.ttl index 66341de3..9bd1dbce 100644 --- a/schemas/1dotRefNS1.ttl +++ b/schemas/1dotRefNS1.ttl @@ -6,12 +6,12 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRefOR3.ttl b/schemas/1dotRefOR3.ttl index 33495837..22ffc124 100644 --- a/schemas/1dotRefOR3.ttl +++ b/schemas/1dotRefOR3.ttl @@ -8,24 +8,24 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeOr ; sx:shapeExprs ( - ) ] ] . + ) ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRefSpaceLNex1.ttl b/schemas/1dotRefSpaceLNex1.ttl index 66341de3..9bd1dbce 100644 --- a/schemas/1dotRefSpaceLNex1.ttl +++ b/schemas/1dotRefSpaceLNex1.ttl @@ -6,12 +6,12 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotRefSpaceNS1.ttl b/schemas/1dotRefSpaceNS1.ttl index 66341de3..9bd1dbce 100644 --- a/schemas/1dotRefSpaceNS1.ttl +++ b/schemas/1dotRefSpaceNS1.ttl @@ -6,12 +6,12 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotSemi.ttl b/schemas/1dotSemi.ttl index d83aa495..af58a7de 100644 --- a/schemas/1dotSemi.ttl +++ b/schemas/1dotSemi.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1dotSemiOne1dotSemi.ttl b/schemas/1dotSemiOne1dotSemi.ttl index fb83014b..7b6a8aac 100644 --- a/schemas/1dotSemiOne1dotSemi.ttl +++ b/schemas/1dotSemiOne1dotSemi.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/1dotSemiOne2dotSemis.ttl b/schemas/1dotSemiOne2dotSemis.ttl index 49ede841..d425d519 100644 --- a/schemas/1dotSemiOne2dotSemis.ttl +++ b/schemas/1dotSemiOne2dotSemis.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/1dotShapeAND1dot3X.ttl b/schemas/1dotShapeAND1dot3X.ttl index d676c2c3..2fb81fbd 100644 --- a/schemas/1dotShapeAND1dot3X.ttl +++ b/schemas/1dotShapeAND1dot3X.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1dotShapeAnnotAIRIREF.ttl b/schemas/1dotShapeAnnotAIRIREF.ttl index b7d25601..12a97869 100644 --- a/schemas/1dotShapeAnnotAIRIREF.ttl +++ b/schemas/1dotShapeAnnotAIRIREF.ttl @@ -6,12 +6,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ; sx:annotation ([ a sx:Annotation ; sx:predicate rdf:type ; - sx:object ]) . + sx:object ]) ] . diff --git a/schemas/1dotShapeAnnotIRIREF.ttl b/schemas/1dotShapeAnnotIRIREF.ttl index ba7d1132..61e8bd83 100644 --- a/schemas/1dotShapeAnnotIRIREF.ttl +++ b/schemas/1dotShapeAnnotIRIREF.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ; sx:annotation ([ a sx:Annotation ; sx:object ; - sx:predicate ]) . + sx:predicate ]) ] . diff --git a/schemas/1dotShapeAnnotSTRING_LITERAL1.ttl b/schemas/1dotShapeAnnotSTRING_LITERAL1.ttl index 8ba7d6c0..81dc4152 100644 --- a/schemas/1dotShapeAnnotSTRING_LITERAL1.ttl +++ b/schemas/1dotShapeAnnotSTRING_LITERAL1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ; sx:annotation ([ a sx:Annotation ; sx:predicate ; - sx:object "STRING_LITERAL1" ]) . + sx:object "STRING_LITERAL1" ]) ] . diff --git a/schemas/1dotShapeCode1.ttl b/schemas/1dotShapeCode1.ttl index 44cf19f0..8d8fe6cf 100644 --- a/schemas/1dotShapeCode1.ttl +++ b/schemas/1dotShapeCode1.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ]; @@ -13,5 +13,5 @@ PREFIX xsd: a sx:SemAct; sx:code " print(\"shape action\") "; sx:name - ]) . + ]) ] . diff --git a/schemas/1dotShapeNoCode1.ttl b/schemas/1dotShapeNoCode1.ttl index 2af1cf48..6ae62a87 100644 --- a/schemas/1dotShapeNoCode1.ttl +++ b/schemas/1dotShapeNoCode1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ]; sx:semActs ([ a sx:SemAct; sx:name - ]) . + ]) ] . diff --git a/schemas/1dotShapePlusAnnotIRIREF.ttl b/schemas/1dotShapePlusAnnotIRIREF.ttl index 26bfa04e..458d6d3b 100644 --- a/schemas/1dotShapePlusAnnotIRIREF.ttl +++ b/schemas/1dotShapePlusAnnotIRIREF.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:annotation ([ a sx:Annotation ; sx:predicate ; - sx:object ]) . + sx:object ]) ] . diff --git a/schemas/1doubleMaxexclusiveDECIMAL.ttl b/schemas/1doubleMaxexclusiveDECIMAL.ttl index 56e3b2d2..3dc483a8 100644 --- a/schemas/1doubleMaxexclusiveDECIMAL.ttl +++ b/schemas/1doubleMaxexclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive "5.5"^^xsd:decimal ] ] . + sx:maxexclusive "5.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDECIMALLeadTrail.ttl b/schemas/1doubleMaxexclusiveDECIMALLeadTrail.ttl index 8bcd1741..b6a4d314 100644 --- a/schemas/1doubleMaxexclusiveDECIMALLeadTrail.ttl +++ b/schemas/1doubleMaxexclusiveDECIMALLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive "05.50"^^xsd:decimal ] ] . + sx:maxexclusive "05.50"^^xsd:decimal ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDECIMALint.ttl b/schemas/1doubleMaxexclusiveDECIMALint.ttl index a05c7b39..b4d0671c 100644 --- a/schemas/1doubleMaxexclusiveDECIMALint.ttl +++ b/schemas/1doubleMaxexclusiveDECIMALint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDECIMALintLeadTrail.ttl b/schemas/1doubleMaxexclusiveDECIMALintLeadTrail.ttl index a05c7b39..b4d0671c 100644 --- a/schemas/1doubleMaxexclusiveDECIMALintLeadTrail.ttl +++ b/schemas/1doubleMaxexclusiveDECIMALintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDOUBLE.ttl b/schemas/1doubleMaxexclusiveDOUBLE.ttl index c29d53c5..3baca2dd 100644 --- a/schemas/1doubleMaxexclusiveDOUBLE.ttl +++ b/schemas/1doubleMaxexclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive "5.5E0"^^xsd:double ] ] . + sx:maxexclusive "5.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDOUBLELeadTrail.ttl b/schemas/1doubleMaxexclusiveDOUBLELeadTrail.ttl index 4844e264..3e546674 100644 --- a/schemas/1doubleMaxexclusiveDOUBLELeadTrail.ttl +++ b/schemas/1doubleMaxexclusiveDOUBLELeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive "05.50E0"^^xsd:double ] ] . + sx:maxexclusive "05.50E0"^^xsd:double ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDOUBLEint.ttl b/schemas/1doubleMaxexclusiveDOUBLEint.ttl index a05c7b39..b4d0671c 100644 --- a/schemas/1doubleMaxexclusiveDOUBLEint.ttl +++ b/schemas/1doubleMaxexclusiveDOUBLEint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1doubleMaxexclusiveDOUBLEintLeadTrail.ttl b/schemas/1doubleMaxexclusiveDOUBLEintLeadTrail.ttl index a05c7b39..b4d0671c 100644 --- a/schemas/1doubleMaxexclusiveDOUBLEintLeadTrail.ttl +++ b/schemas/1doubleMaxexclusiveDOUBLEintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1doubleMaxexclusiveINTEGER.ttl b/schemas/1doubleMaxexclusiveINTEGER.ttl index a05c7b39..b4d0671c 100644 --- a/schemas/1doubleMaxexclusiveINTEGER.ttl +++ b/schemas/1doubleMaxexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1doubleMaxexclusiveINTEGERLead.ttl b/schemas/1doubleMaxexclusiveINTEGERLead.ttl index a05c7b39..b4d0671c 100644 --- a/schemas/1doubleMaxexclusiveINTEGERLead.ttl +++ b/schemas/1doubleMaxexclusiveINTEGERLead.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1doubleMaxinclusiveDECIMAL.ttl b/schemas/1doubleMaxinclusiveDECIMAL.ttl index 577fb89e..b0788c6c 100644 --- a/schemas/1doubleMaxinclusiveDECIMAL.ttl +++ b/schemas/1doubleMaxinclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxinclusive "5.5"^^xsd:decimal ] ] . + sx:maxinclusive "5.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1doubleMaxinclusiveDOUBLE.ttl b/schemas/1doubleMaxinclusiveDOUBLE.ttl index bd835edf..0442cc18 100644 --- a/schemas/1doubleMaxinclusiveDOUBLE.ttl +++ b/schemas/1doubleMaxinclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxinclusive "5.5E0"^^xsd:double ] ] . + sx:maxinclusive "5.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1doubleMaxinclusiveINTEGER.ttl b/schemas/1doubleMaxinclusiveINTEGER.ttl index 94dd1d04..9d2e48b1 100644 --- a/schemas/1doubleMaxinclusiveINTEGER.ttl +++ b/schemas/1doubleMaxinclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:maxinclusive 5 ] ] . + sx:maxinclusive 5 ] ] ] . diff --git a/schemas/1doubleMinexclusiveDECIMAL.ttl b/schemas/1doubleMinexclusiveDECIMAL.ttl index 80ad7cbd..6d1f2dfa 100644 --- a/schemas/1doubleMinexclusiveDECIMAL.ttl +++ b/schemas/1doubleMinexclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:minexclusive "4.5"^^xsd:decimal ] ] . + sx:minexclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1doubleMinexclusiveDOUBLE.ttl b/schemas/1doubleMinexclusiveDOUBLE.ttl index 757cbc55..71b4c9d5 100644 --- a/schemas/1doubleMinexclusiveDOUBLE.ttl +++ b/schemas/1doubleMinexclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:minexclusive "4.5E0"^^xsd:double ] ] . + sx:minexclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1doubleMinexclusiveINTEGER.ttl b/schemas/1doubleMinexclusiveINTEGER.ttl index c5e2207b..380214ab 100644 --- a/schemas/1doubleMinexclusiveINTEGER.ttl +++ b/schemas/1doubleMinexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:minexclusive 5 ] ] . + sx:minexclusive 5 ] ] ] . diff --git a/schemas/1doubleMininclusiveDECIMAL.ttl b/schemas/1doubleMininclusiveDECIMAL.ttl index a9b48993..8e3640bc 100644 --- a/schemas/1doubleMininclusiveDECIMAL.ttl +++ b/schemas/1doubleMininclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive "4.5"^^xsd:decimal ] ] . + sx:mininclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1doubleMininclusiveDECIMALLeadTrail.ttl b/schemas/1doubleMininclusiveDECIMALLeadTrail.ttl index 521c5474..5efb2452 100644 --- a/schemas/1doubleMininclusiveDECIMALLeadTrail.ttl +++ b/schemas/1doubleMininclusiveDECIMALLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive "04.50"^^xsd:decimal ] ] . + sx:mininclusive "04.50"^^xsd:decimal ] ] ] . diff --git a/schemas/1doubleMininclusiveDECIMALintLeadTrail.ttl b/schemas/1doubleMininclusiveDECIMALintLeadTrail.ttl index 84008f14..493e044c 100644 --- a/schemas/1doubleMininclusiveDECIMALintLeadTrail.ttl +++ b/schemas/1doubleMininclusiveDECIMALintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1doubleMininclusiveDOUBLE.ttl b/schemas/1doubleMininclusiveDOUBLE.ttl index 69d6c1d7..7d1d3ebc 100644 --- a/schemas/1doubleMininclusiveDOUBLE.ttl +++ b/schemas/1doubleMininclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive "4.5E0"^^xsd:double ] ] . + sx:mininclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1doubleMininclusiveDOUBLELeadTrail.ttl b/schemas/1doubleMininclusiveDOUBLELeadTrail.ttl index 6977fc9b..907ed6e4 100644 --- a/schemas/1doubleMininclusiveDOUBLELeadTrail.ttl +++ b/schemas/1doubleMininclusiveDOUBLELeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive "04.50E0"^^xsd:double ] ] . + sx:mininclusive "04.50E0"^^xsd:double ] ] ] . diff --git a/schemas/1doubleMininclusiveDOUBLEintLeadTrail.ttl b/schemas/1doubleMininclusiveDOUBLEintLeadTrail.ttl index 84008f14..493e044c 100644 --- a/schemas/1doubleMininclusiveDOUBLEintLeadTrail.ttl +++ b/schemas/1doubleMininclusiveDOUBLEintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1doubleMininclusiveINTEGERLead.ttl b/schemas/1doubleMininclusiveINTEGERLead.ttl index 84008f14..493e044c 100644 --- a/schemas/1doubleMininclusiveINTEGERLead.ttl +++ b/schemas/1doubleMininclusiveINTEGERLead.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1floatMaxexclusiveDECIMAL.ttl b/schemas/1floatMaxexclusiveDECIMAL.ttl index 7153fcc3..74ca4fdb 100644 --- a/schemas/1floatMaxexclusiveDECIMAL.ttl +++ b/schemas/1floatMaxexclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:maxexclusive "5.5"^^xsd:decimal ] ] . + sx:maxexclusive "5.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1floatMaxexclusiveDOUBLE.ttl b/schemas/1floatMaxexclusiveDOUBLE.ttl index 5bf7867b..5f59c39c 100644 --- a/schemas/1floatMaxexclusiveDOUBLE.ttl +++ b/schemas/1floatMaxexclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:maxexclusive "5.5E0"^^xsd:double ] ] . + sx:maxexclusive "5.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1floatMaxexclusiveINTEGER.ttl b/schemas/1floatMaxexclusiveINTEGER.ttl index f9c85e7a..79b2081e 100644 --- a/schemas/1floatMaxexclusiveINTEGER.ttl +++ b/schemas/1floatMaxexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1floatMaxinclusiveDECIMAL.ttl b/schemas/1floatMaxinclusiveDECIMAL.ttl index 824fdf10..73b88612 100644 --- a/schemas/1floatMaxinclusiveDECIMAL.ttl +++ b/schemas/1floatMaxinclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:maxinclusive "5.5"^^xsd:decimal ] ] . + sx:maxinclusive "5.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1floatMaxinclusiveDOUBLE.ttl b/schemas/1floatMaxinclusiveDOUBLE.ttl index 5bfdcc38..82601774 100644 --- a/schemas/1floatMaxinclusiveDOUBLE.ttl +++ b/schemas/1floatMaxinclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:maxinclusive "5.5E0"^^xsd:double ] ] . + sx:maxinclusive "5.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1floatMaxinclusiveINTEGER.ttl b/schemas/1floatMaxinclusiveINTEGER.ttl index ad5b94b0..fba94276 100644 --- a/schemas/1floatMaxinclusiveINTEGER.ttl +++ b/schemas/1floatMaxinclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:maxinclusive 5 ] ] . + sx:maxinclusive 5 ] ] ] . diff --git a/schemas/1floatMinexclusiveDECIMAL.ttl b/schemas/1floatMinexclusiveDECIMAL.ttl index 326a1eb3..a0071dd9 100644 --- a/schemas/1floatMinexclusiveDECIMAL.ttl +++ b/schemas/1floatMinexclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:minexclusive "4.5"^^xsd:decimal ] ] . + sx:minexclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1floatMinexclusiveDOUBLE.ttl b/schemas/1floatMinexclusiveDOUBLE.ttl index 93164028..d03fb1c9 100644 --- a/schemas/1floatMinexclusiveDOUBLE.ttl +++ b/schemas/1floatMinexclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:minexclusive "4.5E0"^^xsd:double ] ] . + sx:minexclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1floatMinexclusiveINTEGER.ttl b/schemas/1floatMinexclusiveINTEGER.ttl index 121bccb0..dfe01324 100644 --- a/schemas/1floatMinexclusiveINTEGER.ttl +++ b/schemas/1floatMinexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:minexclusive 5 ] ] . + sx:minexclusive 5 ] ] ] . diff --git a/schemas/1floatMininclusiveDECIMAL.ttl b/schemas/1floatMininclusiveDECIMAL.ttl index c8d1e0ff..b1cadf1b 100644 --- a/schemas/1floatMininclusiveDECIMAL.ttl +++ b/schemas/1floatMininclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive "4.5"^^xsd:decimal ] ] . + sx:mininclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1floatMininclusiveDECIMALLeadTrail.ttl b/schemas/1floatMininclusiveDECIMALLeadTrail.ttl index 8c836b09..6797eefa 100644 --- a/schemas/1floatMininclusiveDECIMALLeadTrail.ttl +++ b/schemas/1floatMininclusiveDECIMALLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive "04.50"^^xsd:decimal ] ] . + sx:mininclusive "04.50"^^xsd:decimal ] ] ] . diff --git a/schemas/1floatMininclusiveDECIMALintLeadTrail.ttl b/schemas/1floatMininclusiveDECIMALintLeadTrail.ttl index 4410d03a..8d41350e 100644 --- a/schemas/1floatMininclusiveDECIMALintLeadTrail.ttl +++ b/schemas/1floatMininclusiveDECIMALintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1floatMininclusiveDOUBLE.ttl b/schemas/1floatMininclusiveDOUBLE.ttl index 5075ba1c..b16f0a96 100644 --- a/schemas/1floatMininclusiveDOUBLE.ttl +++ b/schemas/1floatMininclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive "4.5E0"^^xsd:double ] ] . + sx:mininclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1floatMininclusiveDOUBLELeadTrail.ttl b/schemas/1floatMininclusiveDOUBLELeadTrail.ttl index 7163124d..49b8ff2c 100644 --- a/schemas/1floatMininclusiveDOUBLELeadTrail.ttl +++ b/schemas/1floatMininclusiveDOUBLELeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive "04.50E0"^^xsd:double ] ] . + sx:mininclusive "04.50E0"^^xsd:double ] ] ] . diff --git a/schemas/1floatMininclusiveDOUBLEintLeadTrail.ttl b/schemas/1floatMininclusiveDOUBLEintLeadTrail.ttl index 4410d03a..8d41350e 100644 --- a/schemas/1floatMininclusiveDOUBLEintLeadTrail.ttl +++ b/schemas/1floatMininclusiveDOUBLEintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1floatMininclusiveINTEGER.ttl b/schemas/1floatMininclusiveINTEGER.ttl index 4410d03a..8d41350e 100644 --- a/schemas/1floatMininclusiveINTEGER.ttl +++ b/schemas/1floatMininclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1floatMininclusiveINTEGERLead.ttl b/schemas/1floatMininclusiveINTEGERLead.ttl index 4410d03a..8d41350e 100644 --- a/schemas/1floatMininclusiveINTEGERLead.ttl +++ b/schemas/1floatMininclusiveINTEGERLead.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1focusBNODELength_dot.ttl b/schemas/1focusBNODELength_dot.ttl index 85f00778..a6f55e8a 100644 --- a/schemas/1focusBNODELength_dot.ttl +++ b/schemas/1focusBNODELength_dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:length 19 ; sx:nodeKind sx:bnode ] [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] ] ) . + [ a sx:TripleConstraint ; sx:predicate ] ] ) ] . diff --git a/schemas/1focusBNODE_dot.ttl b/schemas/1focusBNODE_dot.ttl index 4a634151..fbfcd69d 100644 --- a/schemas/1focusBNODE_dot.ttl +++ b/schemas/1focusBNODE_dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:nodeKind sx:bnode ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusIRILength_dot.ttl b/schemas/1focusIRILength_dot.ttl index 9cbcd244..0d8b0382 100644 --- a/schemas/1focusIRILength_dot.ttl +++ b/schemas/1focusIRILength_dot.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:length 19 ; sx:nodeKind sx:iri ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusIRI_dot.ttl b/schemas/1focusIRI_dot.ttl index 3a2d864e..d9fbe5dd 100644 --- a/schemas/1focusIRI_dot.ttl +++ b/schemas/1focusIRI_dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:nodeKind sx:iri ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusLength-dot.ttl b/schemas/1focusLength-dot.ttl index aacc55e1..3b0e854b 100644 --- a/schemas/1focusLength-dot.ttl +++ b/schemas/1focusLength-dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:length 19 ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusMaxLength-dot.ttl b/schemas/1focusMaxLength-dot.ttl index 73de433a..9379bdde 100644 --- a/schemas/1focusMaxLength-dot.ttl +++ b/schemas/1focusMaxLength-dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:maxlength 19 ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusMinLength-dot.ttl b/schemas/1focusMinLength-dot.ttl index ce9f2b72..a6b09395 100644 --- a/schemas/1focusMinLength-dot.ttl +++ b/schemas/1focusMinLength-dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:minlength 19 ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusPattern-dot.ttl b/schemas/1focusPattern-dot.ttl index d626fa69..19c1071a 100644 --- a/schemas/1focusPattern-dot.ttl +++ b/schemas/1focusPattern-dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "^http://a.example/s1$" ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusPatternB-dot.ttl b/schemas/1focusPatternB-dot.ttl index 868f575c..b67d238b 100644 --- a/schemas/1focusPatternB-dot.ttl +++ b/schemas/1focusPatternB-dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "abcdefghijklmnopqrs" ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusnonLiteral-dot.ttl b/schemas/1focusnonLiteral-dot.ttl index 480027f7..8345120f 100644 --- a/schemas/1focusnonLiteral-dot.ttl +++ b/schemas/1focusnonLiteral-dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:nodeKind sx:nonliteral ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusnonLiteralLength-dot.ttl b/schemas/1focusnonLiteralLength-dot.ttl index 0e063069..4e9e991d 100644 --- a/schemas/1focusnonLiteralLength-dot.ttl +++ b/schemas/1focusnonLiteralLength-dot.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:length 19 ; sx:nodeKind sx:nonliteral ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) . + sx:predicate ] ] ) ] . diff --git a/schemas/1focusnonLiteralLength-nonLiteralLength.ttl b/schemas/1focusnonLiteralLength-nonLiteralLength.ttl index a08c9ea6..69a00e72 100644 --- a/schemas/1focusnonLiteralLength-nonLiteralLength.ttl +++ b/schemas/1focusnonLiteralLength-nonLiteralLength.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:length 19 ; sx:nodeKind sx:nonliteral ] [ a sx:Shape ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:length 19 ; - sx:nodeKind sx:nonliteral ] ] ] ) . + sx:nodeKind sx:nonliteral ] ] ] ) ] . diff --git a/schemas/1integerMaxexclusiveDECIMALint.ttl b/schemas/1integerMaxexclusiveDECIMALint.ttl index 622ad0a0..d4b579d9 100644 --- a/schemas/1integerMaxexclusiveDECIMALint.ttl +++ b/schemas/1integerMaxexclusiveDECIMALint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1integerMaxexclusiveDOUBLEint.ttl b/schemas/1integerMaxexclusiveDOUBLEint.ttl index 622ad0a0..d4b579d9 100644 --- a/schemas/1integerMaxexclusiveDOUBLEint.ttl +++ b/schemas/1integerMaxexclusiveDOUBLEint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1integerMaxexclusiveINTEGER.ttl b/schemas/1integerMaxexclusiveINTEGER.ttl index 622ad0a0..d4b579d9 100644 --- a/schemas/1integerMaxexclusiveINTEGER.ttl +++ b/schemas/1integerMaxexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:maxexclusive 5 ] ] . + sx:maxexclusive 5 ] ] ] . diff --git a/schemas/1integerMaxinclusiveDECIMALint.ttl b/schemas/1integerMaxinclusiveDECIMALint.ttl index 321ac5b6..d1d4eaed 100644 --- a/schemas/1integerMaxinclusiveDECIMALint.ttl +++ b/schemas/1integerMaxinclusiveDECIMALint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:maxinclusive 5 ] ] . + sx:maxinclusive 5 ] ] ] . diff --git a/schemas/1integerMaxinclusiveDOUBLEint.ttl b/schemas/1integerMaxinclusiveDOUBLEint.ttl index 321ac5b6..d1d4eaed 100644 --- a/schemas/1integerMaxinclusiveDOUBLEint.ttl +++ b/schemas/1integerMaxinclusiveDOUBLEint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:maxinclusive 5 ] ] . + sx:maxinclusive 5 ] ] ] . diff --git a/schemas/1integerMaxinclusiveINTEGER.ttl b/schemas/1integerMaxinclusiveINTEGER.ttl index 321ac5b6..d1d4eaed 100644 --- a/schemas/1integerMaxinclusiveINTEGER.ttl +++ b/schemas/1integerMaxinclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:maxinclusive 5 ] ] . + sx:maxinclusive 5 ] ] ] . diff --git a/schemas/1integerMinexclusiveDECIMALint.ttl b/schemas/1integerMinexclusiveDECIMALint.ttl index 104b24bf..5673f6fe 100644 --- a/schemas/1integerMinexclusiveDECIMALint.ttl +++ b/schemas/1integerMinexclusiveDECIMALint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:minexclusive 5 ] ] . + sx:minexclusive 5 ] ] ] . diff --git a/schemas/1integerMinexclusiveDOUBLEint.ttl b/schemas/1integerMinexclusiveDOUBLEint.ttl index 104b24bf..5673f6fe 100644 --- a/schemas/1integerMinexclusiveDOUBLEint.ttl +++ b/schemas/1integerMinexclusiveDOUBLEint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:minexclusive 5 ] ] . + sx:minexclusive 5 ] ] ] . diff --git a/schemas/1integerMinexclusiveINTEGER.ttl b/schemas/1integerMinexclusiveINTEGER.ttl index 104b24bf..5673f6fe 100644 --- a/schemas/1integerMinexclusiveINTEGER.ttl +++ b/schemas/1integerMinexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:minexclusive 5 ] ] . + sx:minexclusive 5 ] ] ] . diff --git a/schemas/1integerMininclusiveDECIMAL.ttl b/schemas/1integerMininclusiveDECIMAL.ttl index 973bfd0c..14de08a9 100644 --- a/schemas/1integerMininclusiveDECIMAL.ttl +++ b/schemas/1integerMininclusiveDECIMAL.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive "4.5"^^xsd:decimal ] ] . + sx:mininclusive "4.5"^^xsd:decimal ] ] ] . diff --git a/schemas/1integerMininclusiveDECIMALLeadTrail.ttl b/schemas/1integerMininclusiveDECIMALLeadTrail.ttl index 54ba58ea..67196bbe 100644 --- a/schemas/1integerMininclusiveDECIMALLeadTrail.ttl +++ b/schemas/1integerMininclusiveDECIMALLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive "04.50"^^xsd:decimal ] ] . + sx:mininclusive "04.50"^^xsd:decimal ] ] ] . diff --git a/schemas/1integerMininclusiveDECIMALint.ttl b/schemas/1integerMininclusiveDECIMALint.ttl index 50cb3394..48debbf6 100644 --- a/schemas/1integerMininclusiveDECIMALint.ttl +++ b/schemas/1integerMininclusiveDECIMALint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1integerMininclusiveDECIMALintLeadTrail.ttl b/schemas/1integerMininclusiveDECIMALintLeadTrail.ttl index 50cb3394..48debbf6 100644 --- a/schemas/1integerMininclusiveDECIMALintLeadTrail.ttl +++ b/schemas/1integerMininclusiveDECIMALintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1integerMininclusiveDOUBLE.ttl b/schemas/1integerMininclusiveDOUBLE.ttl index bd3def0a..2f2ba6c0 100644 --- a/schemas/1integerMininclusiveDOUBLE.ttl +++ b/schemas/1integerMininclusiveDOUBLE.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive "4.5E0"^^xsd:double ] ] . + sx:mininclusive "4.5E0"^^xsd:double ] ] ] . diff --git a/schemas/1integerMininclusiveDOUBLELeadTrail.ttl b/schemas/1integerMininclusiveDOUBLELeadTrail.ttl index 1eacd424..99eea02b 100644 --- a/schemas/1integerMininclusiveDOUBLELeadTrail.ttl +++ b/schemas/1integerMininclusiveDOUBLELeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive "04.50E0"^^xsd:double ] ] . + sx:mininclusive "04.50E0"^^xsd:double ] ] ] . diff --git a/schemas/1integerMininclusiveDOUBLEint.ttl b/schemas/1integerMininclusiveDOUBLEint.ttl index 50cb3394..48debbf6 100644 --- a/schemas/1integerMininclusiveDOUBLEint.ttl +++ b/schemas/1integerMininclusiveDOUBLEint.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1integerMininclusiveDOUBLEintLeadTrail.ttl b/schemas/1integerMininclusiveDOUBLEintLeadTrail.ttl index 50cb3394..48debbf6 100644 --- a/schemas/1integerMininclusiveDOUBLEintLeadTrail.ttl +++ b/schemas/1integerMininclusiveDOUBLEintLeadTrail.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1integerMininclusiveINTEGER.ttl b/schemas/1integerMininclusiveINTEGER.ttl index 50cb3394..48debbf6 100644 --- a/schemas/1integerMininclusiveINTEGER.ttl +++ b/schemas/1integerMininclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1integerMininclusiveINTEGERLead.ttl b/schemas/1integerMininclusiveINTEGERLead.ttl index 50cb3394..48debbf6 100644 --- a/schemas/1integerMininclusiveINTEGERLead.ttl +++ b/schemas/1integerMininclusiveINTEGERLead.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ; - sx:mininclusive 5 ] ] . + sx:mininclusive 5 ] ] ] . diff --git a/schemas/1inversedot.ttl b/schemas/1inversedot.ttl index c4c53177..62bd4ee3 100644 --- a/schemas/1inversedot.ttl +++ b/schemas/1inversedot.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:inverse true ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1inversedotAnnot3.ttl b/schemas/1inversedotAnnot3.ttl index 442fc312..29c4e639 100644 --- a/schemas/1inversedotAnnot3.ttl +++ b/schemas/1inversedotAnnot3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:annotation ([ a sx:Annotation ; sx:object "1" ; @@ -17,5 +17,5 @@ PREFIX xsd: sx:object "3" ; sx:predicate ]) ; sx:inverse true ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1inversedotCode1.ttl b/schemas/1inversedotCode1.ttl index ccef00f1..63505c02 100644 --- a/schemas/1inversedotCode1.ttl +++ b/schemas/1inversedotCode1.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:inverse true ; sx:predicate ; @@ -13,5 +13,5 @@ PREFIX xsd: a sx:SemAct; sx:code " print(o) "; sx:name - ])] . + ])] ] . diff --git a/schemas/1iri.ttl b/schemas/1iri.ttl index 863cc71c..a9d0730d 100644 --- a/schemas/1iri.ttl +++ b/schemas/1iri.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:iri ] ] . + sx:nodeKind sx:iri ] ] ] . diff --git a/schemas/1iriLength.ttl b/schemas/1iriLength.ttl index 9845d406..924e89d8 100644 --- a/schemas/1iriLength.ttl +++ b/schemas/1iriLength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:length 19 ; - sx:nodeKind sx:iri ] ] . + sx:nodeKind sx:iri ] ] ] . diff --git a/schemas/1iriMaxlength.ttl b/schemas/1iriMaxlength.ttl index 3569e0ed..1e311e0f 100644 --- a/schemas/1iriMaxlength.ttl +++ b/schemas/1iriMaxlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:maxlength 19 ; - sx:nodeKind sx:iri ] ] . + sx:nodeKind sx:iri ] ] ] . diff --git a/schemas/1iriMinlength.ttl b/schemas/1iriMinlength.ttl index 271e1c1c..9737ffd6 100644 --- a/schemas/1iriMinlength.ttl +++ b/schemas/1iriMinlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:minlength 19 ; - sx:nodeKind sx:iri ] ] . + sx:nodeKind sx:iri ] ] ] . diff --git a/schemas/1iriPattern.ttl b/schemas/1iriPattern.ttl index 4c6feff0..1dd9a639 100644 --- a/schemas/1iriPattern.ttl +++ b/schemas/1iriPattern.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:iri ; - sx:pattern "http://a.example/o1$" ] ] . + sx:pattern "http://a.example/o1$" ] ] ] . diff --git a/schemas/1iriPatternbc.ttl b/schemas/1iriPatternbc.ttl index 0829bf1e..96484912 100644 --- a/schemas/1iriPatternbc.ttl +++ b/schemas/1iriPatternbc.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:iri ; - sx:pattern "^bc$" ] ] . + sx:pattern "^bc$" ] ] ] . diff --git a/schemas/1iriRef1.ttl b/schemas/1iriRef1.ttl index 30a0f9d4..f0d8d1d8 100644 --- a/schemas/1iriRef1.ttl +++ b/schemas/1iriRef1.ttl @@ -6,14 +6,14 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; - sx:nodeKind sx:iri ] ) ] ] . + sx:nodeKind sx:iri ] ) ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1iriRefLength1.ttl b/schemas/1iriRefLength1.ttl index 5efc4213..bab81f42 100644 --- a/schemas/1iriRefLength1.ttl +++ b/schemas/1iriRefLength1.ttl @@ -6,15 +6,15 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:length 19 ; - sx:nodeKind sx:iri ] ) ] ] . + sx:nodeKind sx:iri ] ) ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1list0PlusDot.ttl b/schemas/1list0PlusDot.ttl index fee2a6b4..099f5451 100644 --- a/schemas/1list0PlusDot.ttl +++ b/schemas/1list0PlusDot.ttl @@ -1,15 +1,15 @@ PREFIX sx: PREFIX rdf: - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr - ] . + ] ] . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:values ( () ) ] [ a sx:Shape ; sx:closed true ; @@ -26,7 +26,7 @@ PREFIX rdf: ) ] ] - ) . + ) ] . [] a sx:Schema ; sx:shapes ( diff --git a/schemas/1list0PlusIri.ttl b/schemas/1list0PlusIri.ttl index f201d887..46d5e877 100644 --- a/schemas/1list0PlusIri.ttl +++ b/schemas/1list0PlusIri.ttl @@ -1,15 +1,15 @@ PREFIX sx: PREFIX rdf: - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr - ] . + ] ] . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:values ( () ) ] [ a sx:Shape ; sx:closed true ; @@ -29,7 +29,7 @@ PREFIX rdf: ) ] ] - ) . + ) ] . [] a sx:Schema ; sx:shapes ( diff --git a/schemas/1list1PlusIri.ttl b/schemas/1list1PlusIri.ttl index 1f656eab..515fb59a 100644 --- a/schemas/1list1PlusIri.ttl +++ b/schemas/1list1PlusIri.ttl @@ -1,15 +1,15 @@ PREFIX sx: PREFIX rdf: - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr - ] . + ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:expression [ a sx:EachOf ; @@ -30,7 +30,7 @@ PREFIX rdf: ] ] ) - ] . + ] ] . [] a sx:Schema ; sx:shapes ( diff --git a/schemas/1literal.ttl b/schemas/1literal.ttl index 15caa772..90a21a19 100644 --- a/schemas/1literal.ttl +++ b/schemas/1literal.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalCarrotPatternDollar.ttl b/schemas/1literalCarrotPatternDollar.ttl index e752e61b..17566aeb 100644 --- a/schemas/1literalCarrotPatternDollar.ttl +++ b/schemas/1literalCarrotPatternDollar.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "\\^bc\\$" ] ] . + sx:pattern "\\^bc\\$" ] ] ] . diff --git a/schemas/1literalFractiondigits4.ttl b/schemas/1literalFractiondigits4.ttl index f42eb367..817227aa 100644 --- a/schemas/1literalFractiondigits4.ttl +++ b/schemas/1literalFractiondigits4.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; sx:fractiondigits 4 - ] ] . + ] ] ] . diff --git a/schemas/1literalFractiondigits5.ttl b/schemas/1literalFractiondigits5.ttl index d46ff0b9..f4f33878 100644 --- a/schemas/1literalFractiondigits5.ttl +++ b/schemas/1literalFractiondigits5.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; sx:fractiondigits 5 - ] ] . + ] ] ] . diff --git a/schemas/1literalLength.ttl b/schemas/1literalLength.ttl index 58ebcd15..0b118ea5 100644 --- a/schemas/1literalLength.ttl +++ b/schemas/1literalLength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:length 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalLength19.ttl b/schemas/1literalLength19.ttl index 6291b18e..63c9333f 100644 --- a/schemas/1literalLength19.ttl +++ b/schemas/1literalLength19.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:length 19 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalMaxexclusiveINTEGER.ttl b/schemas/1literalMaxexclusiveINTEGER.ttl index 97ddc962..545ca7ab 100644 --- a/schemas/1literalMaxexclusiveINTEGER.ttl +++ b/schemas/1literalMaxexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:maxexclusive 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalMaxinclusiveINTEGER.ttl b/schemas/1literalMaxinclusiveINTEGER.ttl index 75edd9b8..c3f87fc7 100644 --- a/schemas/1literalMaxinclusiveINTEGER.ttl +++ b/schemas/1literalMaxinclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:maxinclusive 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalMaxlength.ttl b/schemas/1literalMaxlength.ttl index 2d6e91cc..2ddecfe5 100644 --- a/schemas/1literalMaxlength.ttl +++ b/schemas/1literalMaxlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:maxlength 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalMinexclusiveINTEGER.ttl b/schemas/1literalMinexclusiveINTEGER.ttl index f8419706..cefc9729 100644 --- a/schemas/1literalMinexclusiveINTEGER.ttl +++ b/schemas/1literalMinexclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:minexclusive 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalMininclusiveINTEGER.ttl b/schemas/1literalMininclusiveINTEGER.ttl index f6124145..89216925 100644 --- a/schemas/1literalMininclusiveINTEGER.ttl +++ b/schemas/1literalMininclusiveINTEGER.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:mininclusive 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalMinlength.ttl b/schemas/1literalMinlength.ttl index ab866ed0..511dea70 100644 --- a/schemas/1literalMinlength.ttl +++ b/schemas/1literalMinlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalPattern.ttl b/schemas/1literalPattern.ttl index 33948da6..f70ae129 100644 --- a/schemas/1literalPattern.ttl +++ b/schemas/1literalPattern.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "bc" ] ] . + sx:pattern "bc" ] ] ] . diff --git a/schemas/1literalPattern19.ttl b/schemas/1literalPattern19.ttl index 42578643..335dcb8d 100644 --- a/schemas/1literalPattern19.ttl +++ b/schemas/1literalPattern19.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "http://a.example/o1" ] ] . + sx:pattern "http://a.example/o1" ] ] ] . diff --git a/schemas/1literalPatternDollar.ttl b/schemas/1literalPatternDollar.ttl index 23a969f0..0bed3c7d 100644 --- a/schemas/1literalPatternDollar.ttl +++ b/schemas/1literalPatternDollar.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "bc\\$" ] ] . + sx:pattern "bc\\$" ] ] ] . diff --git a/schemas/1literalPatternEnd.ttl b/schemas/1literalPatternEnd.ttl index b8049e68..54f3d5bf 100644 --- a/schemas/1literalPatternEnd.ttl +++ b/schemas/1literalPatternEnd.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "bc$" ] ] . + sx:pattern "bc$" ] ] ] . diff --git a/schemas/1literalPattern_with_REGEXP_escapes.ttl b/schemas/1literalPattern_with_REGEXP_escapes.ttl index b9719618..98e2e007 100644 --- a/schemas/1literalPattern_with_REGEXP_escapes.ttl +++ b/schemas/1literalPattern_with_REGEXP_escapes.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^/\\t\\n\\r\\-\\\\\u0061\U0001D4B8$" ] ] . + sx:pattern "^/\\t\\n\\r\\-\\\\\u0061\U0001D4B8$" ] ] ] . diff --git a/schemas/1literalPattern_with_REGEXP_escapes_bare.ttl b/schemas/1literalPattern_with_REGEXP_escapes_bare.ttl index ef27c779..b89b878c 100644 --- a/schemas/1literalPattern_with_REGEXP_escapes_bare.ttl +++ b/schemas/1literalPattern_with_REGEXP_escapes_bare.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^/ \\n\\r-\\\\a𝒸$" ] ] . + sx:pattern "^/ \\n\\r-\\\\a𝒸$" ] ] ] . diff --git a/schemas/1literalPattern_with_REGEXP_escapes_escaped.ttl b/schemas/1literalPattern_with_REGEXP_escapes_escaped.ttl index eb67ee4a..d8baa9a5 100644 --- a/schemas/1literalPattern_with_REGEXP_escapes_escaped.ttl +++ b/schemas/1literalPattern_with_REGEXP_escapes_escaped.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^\\\\/\\\\t\\\\n\\\\r\\\\-\\\\\\\\\\\\u0061\\\\U0001D4B8$" ] ] . + sx:pattern "^\\\\/\\\\t\\\\n\\\\r\\\\-\\\\\\\\\\\\u0061\\\\U0001D4B8$" ] ] ] . diff --git a/schemas/1literalPattern_with_UTF8_boundaries.ttl b/schemas/1literalPattern_with_UTF8_boundaries.ttl index 43cb122b..1eaf6aa1 100644 --- a/schemas/1literalPattern_with_UTF8_boundaries.ttl +++ b/schemas/1literalPattern_with_UTF8_boundaries.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern '^€߿ࠀ࿿က쿿퀀퟿�𐀀𿿽񀀀󿿽􀀀􏿽$' ] ] . + sx:pattern '^€߿ࠀ࿿က쿿퀀퟿�𐀀𿿽񀀀󿿽􀀀􏿽$' ] ] ] . diff --git a/schemas/1literalPattern_with_all_controls.ttl b/schemas/1literalPattern_with_all_controls.ttl index 99568085fab57cffe1e154c4fedfc994788700da..bb3382912499a3e10c76a0add61ac3a7e28323d0 100644 GIT binary patch delta 38 tcmcb?{EK1ttIh diff --git a/schemas/1literalPattern_with_all_meta.ttl b/schemas/1literalPattern_with_all_meta.ttl index b22f250f..cd17c685 100644 --- a/schemas/1literalPattern_with_all_meta.ttl +++ b/schemas/1literalPattern_with_all_meta.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern '^\\t(v:[0-9]+( *, *)?){2,3}/\\.\\r\\n$|\\\\N/A' ] ] . + sx:pattern '^\\t(v:[0-9]+( *, *)?){2,3}/\\.\\r\\n$|\\\\N/A' ] ] ] . diff --git a/schemas/1literalPattern_with_all_punctuation.ttl b/schemas/1literalPattern_with_all_punctuation.ttl index 3c98138f..800f4cc0 100644 --- a/schemas/1literalPattern_with_all_punctuation.ttl +++ b/schemas/1literalPattern_with_all_punctuation.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern '^ !"#\\$%&\'\\(\\)/:;<=>\\?@\\[\\]\\^_`\\{\\|\\}~$' ] ] . + sx:pattern '^ !"#\\$%&\'\\(\\)/:;<=>\\?@\\[\\]\\^_`\\{\\|\\}~$' ] ] ] . diff --git a/schemas/1literalPattern_with_ascii_boundaries.ttl b/schemas/1literalPattern_with_ascii_boundaries.ttl index 66db954b2c28784ae28f7e4276dd1a258019c236..981401c2af90c5f1362a3fd2116f31c4e3ad365e 100644 GIT binary patch delta 38 tcmX@b{DyhLMNya3 [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "bc$" ] ] . + sx:pattern "bc$" ] ] ] . diff --git a/schemas/1literalPatterni.ttl b/schemas/1literalPatterni.ttl index ad5801c3..cb17f0ac 100644 --- a/schemas/1literalPatterni.ttl +++ b/schemas/1literalPatterni.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "bc" ; sx:flags "i" ] ] . + sx:pattern "bc" ; sx:flags "i" ] ] ] . diff --git a/schemas/1literalPlus.ttl b/schemas/1literalPlus.ttl index 27257d4a..e4ab5169 100644 --- a/schemas/1literalPlus.ttl +++ b/schemas/1literalPlus.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max -1 ; sx:min 1 ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:literal ] ] . + sx:nodeKind sx:literal ] ] ] . diff --git a/schemas/1literalStartPattern.ttl b/schemas/1literalStartPattern.ttl index 9cd6193e..07803642 100644 --- a/schemas/1literalStartPattern.ttl +++ b/schemas/1literalStartPattern.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^bc" ] ] . + sx:pattern "^bc" ] ] ] . diff --git a/schemas/1literalStartPatternEnd.ttl b/schemas/1literalStartPatternEnd.ttl index a356169e..c5a20aa3 100644 --- a/schemas/1literalStartPatternEnd.ttl +++ b/schemas/1literalStartPatternEnd.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^bc$" ] ] . + sx:pattern "^bc$" ] ] ] . diff --git a/schemas/1literalTotaldigits2.ttl b/schemas/1literalTotaldigits2.ttl index 966a60b1..89b73737 100644 --- a/schemas/1literalTotaldigits2.ttl +++ b/schemas/1literalTotaldigits2.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:totaldigits 2 ] ] . + sx:totaldigits 2 ] ] ] . diff --git a/schemas/1literalTotaldigits5.ttl b/schemas/1literalTotaldigits5.ttl index d25efa5f..9dc12449 100644 --- a/schemas/1literalTotaldigits5.ttl +++ b/schemas/1literalTotaldigits5.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:totaldigits 5 ] ] . + sx:totaldigits 5 ] ] ] . diff --git a/schemas/1literalTotaldigits6.ttl b/schemas/1literalTotaldigits6.ttl index 02c30ead..ee47f495 100644 --- a/schemas/1literalTotaldigits6.ttl +++ b/schemas/1literalTotaldigits6.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:totaldigits 6 ] ] . + sx:totaldigits 6 ] ] ] . diff --git a/schemas/1nonliteral.ttl b/schemas/1nonliteral.ttl index 88902b44..13c34f5f 100644 --- a/schemas/1nonliteral.ttl +++ b/schemas/1nonliteral.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:nonliteral ] ] . + sx:nodeKind sx:nonliteral ] ] ] . diff --git a/schemas/1nonliteralLength.ttl b/schemas/1nonliteralLength.ttl index e7cc28ae..627596dc 100644 --- a/schemas/1nonliteralLength.ttl +++ b/schemas/1nonliteralLength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:length 19 ; - sx:nodeKind sx:nonliteral ] ] . + sx:nodeKind sx:nonliteral ] ] ] . diff --git a/schemas/1nonliteralMaxlength.ttl b/schemas/1nonliteralMaxlength.ttl index f9d99080..fb70a31d 100644 --- a/schemas/1nonliteralMaxlength.ttl +++ b/schemas/1nonliteralMaxlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:maxlength 19 ; - sx:nodeKind sx:nonliteral ] ] . + sx:nodeKind sx:nonliteral ] ] ] . diff --git a/schemas/1nonliteralMinlength.ttl b/schemas/1nonliteralMinlength.ttl index a9edae0a..154c15f2 100644 --- a/schemas/1nonliteralMinlength.ttl +++ b/schemas/1nonliteralMinlength.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:minlength 19 ; - sx:nodeKind sx:nonliteral ] ] . + sx:nodeKind sx:nonliteral ] ] ] . diff --git a/schemas/1nonliteralPattern.ttl b/schemas/1nonliteralPattern.ttl index c66d78c8..2775b4b0 100644 --- a/schemas/1nonliteralPattern.ttl +++ b/schemas/1nonliteralPattern.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:nonliteral ; - sx:pattern "bc$" ] ] . + sx:pattern "bc$" ] ] ] . diff --git a/schemas/1refbnode1.ttl b/schemas/1refbnode1.ttl index 25b0f255..914932e4 100644 --- a/schemas/1refbnode1.ttl +++ b/schemas/1refbnode1.ttl @@ -7,10 +7,10 @@ PREFIX xsd: _:S2) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:S2 ] . -_:S2 a sx:Shape ; + sx:valueExpr _:S2 ] ] . +_:S2 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1refbnode_with_leading_digit1.ttl b/schemas/1refbnode_with_leading_digit1.ttl index 8c5d15aa..696220ae 100644 --- a/schemas/1refbnode_with_leading_digit1.ttl +++ b/schemas/1refbnode_with_leading_digit1.ttl @@ -6,11 +6,11 @@ PREFIX xsd: sx:shapes ( _:0) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:0 ] . + sx:valueExpr _:0 ] ] . -_:0 a sx:Shape ; +_:0 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ]. + [ a sx:TripleConstraint ; sx:predicate ]] . diff --git a/schemas/1refbnode_with_leading_underscore1.ttl b/schemas/1refbnode_with_leading_underscore1.ttl index 171e740b..56638b08 100644 --- a/schemas/1refbnode_with_leading_underscore1.ttl +++ b/schemas/1refbnode_with_leading_underscore1.ttl @@ -6,10 +6,10 @@ PREFIX xsd: sx:shapes ( _:_) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:_ ] . -_:_ a sx:Shape ; + sx:valueExpr _:_ ] ] . +_:_ a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1refbnode_with_spanning_PN_CHARS1.ttl b/schemas/1refbnode_with_spanning_PN_CHARS1.ttl index 9b9cdc23..ca155f11 100644 --- a/schemas/1refbnode_with_spanning_PN_CHARS1.ttl +++ b/schemas/1refbnode_with_spanning_PN_CHARS1.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( _:a·̀ͯ‿.⁀) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:a·̀ͯ‿.⁀ ] . + sx:valueExpr _:a·̀ͯ‿.⁀ ] ] . -_:a·̀ͯ‿.⁀ a sx:Shape ; +_:a·̀ͯ‿.⁀ a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1refbnode_with_spanning_PN_CHARS_BASE1.ttl b/schemas/1refbnode_with_spanning_PN_CHARS_BASE1.ttl index c3374670..61bc6ee5 100644 --- a/schemas/1refbnode_with_spanning_PN_CHARS_BASE1.ttl +++ b/schemas/1refbnode_with_spanning_PN_CHARS_BASE1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 ] . + sx:valueExpr _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 ] ] . -_:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 a sx:Shape ; +_:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/1val1DECIMAL.ttl b/schemas/1val1DECIMAL.ttl index 8bbc8d56..7f27647b 100644 --- a/schemas/1val1DECIMAL.ttl +++ b/schemas/1val1DECIMAL.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values [ rdf:first 0.0 ; - rdf:rest () ] ] ] . + rdf:rest () ] ] ] ] . diff --git a/schemas/1val1DOUBLE.ttl b/schemas/1val1DOUBLE.ttl index a50743ef..c602de0d 100644 --- a/schemas/1val1DOUBLE.ttl +++ b/schemas/1val1DOUBLE.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values [ rdf:first "0E0"^^xsd:double ; - rdf:rest () ] ] ] . + rdf:rest () ] ] ] ] . diff --git a/schemas/1val1DOUBLElowercase.ttl b/schemas/1val1DOUBLElowercase.ttl index 5deb7d2b..a23e3c46 100644 --- a/schemas/1val1DOUBLElowercase.ttl +++ b/schemas/1val1DOUBLElowercase.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values [ rdf:first "0e0"^^xsd:double ; - rdf:rest () ] ] ] . + rdf:rest () ] ] ] ] . diff --git a/schemas/1val1INTEGER.ttl b/schemas/1val1INTEGER.ttl index deed526e..b6d68233 100644 --- a/schemas/1val1INTEGER.ttl +++ b/schemas/1val1INTEGER.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values [ rdf:first 0 ; - rdf:rest () ] ] ] . + rdf:rest () ] ] ] ] . diff --git a/schemas/1val1IRIREF.ttl b/schemas/1val1IRIREF.ttl index f2729f93..fa8a6440 100644 --- a/schemas/1val1IRIREF.ttl +++ b/schemas/1val1IRIREF.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] . + sx:values ( ) ] ] ] . diff --git a/schemas/1val1IRIREFClosedExtra1.ttl b/schemas/1val1IRIREFClosedExtra1.ttl index 3c173307..c5245b1e 100644 --- a/schemas/1val1IRIREFClosedExtra1.ttl +++ b/schemas/1val1IRIREFClosedExtra1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; sx:closed true ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:extra ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] . + sx:values ( ) ] ] ] . diff --git a/schemas/1val1IRIREFDatatype.ttl b/schemas/1val1IRIREFDatatype.ttl index e4b20236..856e9292 100644 --- a/schemas/1val1IRIREFDatatype.ttl +++ b/schemas/1val1IRIREFDatatype.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "ab"^^ ) ] ] . + sx:values ( "ab"^^ ) ] ] ] . diff --git a/schemas/1val1IRIREFExtra1.ttl b/schemas/1val1IRIREFExtra1.ttl index 8e1cac8f..e665a94d 100644 --- a/schemas/1val1IRIREFExtra1.ttl +++ b/schemas/1val1IRIREFExtra1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extra ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] . + sx:values ( ) ] ] ] . diff --git a/schemas/1val1IRIREFExtra1Closed.ttl b/schemas/1val1IRIREFExtra1Closed.ttl index 3c173307..c5245b1e 100644 --- a/schemas/1val1IRIREFExtra1Closed.ttl +++ b/schemas/1val1IRIREFExtra1Closed.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; sx:closed true ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:extra ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] . + sx:values ( ) ] ] ] . diff --git a/schemas/1val1IRIREFExtra1One.ttl b/schemas/1val1IRIREFExtra1One.ttl index d6f50584..b098a0fe 100644 --- a/schemas/1val1IRIREFExtra1One.ttl +++ b/schemas/1val1IRIREFExtra1One.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:max 1 ; sx:min 0 ; sx:predicate ] ) ] ) ] ; - sx:extra . + sx:extra ] . diff --git a/schemas/1val1IRIREFExtra1p2.ttl b/schemas/1val1IRIREFExtra1p2.ttl index cf11e737..2d0b4859 100644 --- a/schemas/1val1IRIREFExtra1p2.ttl +++ b/schemas/1val1IRIREFExtra1p2.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( ) ] ] ; - sx:extra . + sx:extra ] . diff --git a/schemas/1val1LANGTAG.ttl b/schemas/1val1LANGTAG.ttl index 284b6b8c..5984114a 100644 --- a/schemas/1val1LANGTAG.ttl +++ b/schemas/1val1LANGTAG.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "ab"@en-fr ) ] ] . + sx:values ( "ab"@en-fr ) ] ] ] . diff --git a/schemas/1val1LNDatatype.ttl b/schemas/1val1LNDatatype.ttl index e4b20236..856e9292 100644 --- a/schemas/1val1LNDatatype.ttl +++ b/schemas/1val1LNDatatype.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "ab"^^ ) ] ] . + sx:values ( "ab"^^ ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL1.ttl b/schemas/1val1STRING_LITERAL1.ttl index 4a26ac89..b63632b8 100644 --- a/schemas/1val1STRING_LITERAL1.ttl +++ b/schemas/1val1STRING_LITERAL1.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL1" ) ] ] . + sx:values ( "STRING_LITERAL1" ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL1_with_ECHAR_escapes.ttl b/schemas/1val1STRING_LITERAL1_with_ECHAR_escapes.ttl index 59a31d63..b21f0bb1 100644 --- a/schemas/1val1STRING_LITERAL1_with_ECHAR_escapes.ttl +++ b/schemas/1val1STRING_LITERAL1_with_ECHAR_escapes.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "\t\b\n\r\f\\\"\'\u0061\U0001D4B8" ) ] ] . + sx:values ( "\t\b\n\r\f\\\"\'\u0061\U0001D4B8" ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL1_with_UTF8_boundaries.ttl b/schemas/1val1STRING_LITERAL1_with_UTF8_boundaries.ttl index 7105bfe4..ac55d940 100644 --- a/schemas/1val1STRING_LITERAL1_with_UTF8_boundaries.ttl +++ b/schemas/1val1STRING_LITERAL1_with_UTF8_boundaries.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( '€߿ࠀ࿿က쿿퀀퟿�𐀀𿿽񀀀󿿽􀀀􏿽' ) ] ] . + sx:values ( '€߿ࠀ࿿က쿿퀀퟿�𐀀𿿽񀀀󿿽􀀀􏿽' ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL1_with_all_controls.ttl b/schemas/1val1STRING_LITERAL1_with_all_controls.ttl index 656350093b4777a40a5cbcb6b07d868d3cbf7ee9..1a1f2034e79979b15000a168552d76997a3679b0 100644 GIT binary patch delta 37 tcmZ3(e2#g-MNya30RRZT4LAS* delta 13 VcmX@dyoPzg#fcwpFzaz~0RSvY1%Utn diff --git a/schemas/1val1STRING_LITERAL1_with_all_punctuation.ttl b/schemas/1val1STRING_LITERAL1_with_all_punctuation.ttl index a7359118..c25a3046 100644 --- a/schemas/1val1STRING_LITERAL1_with_all_punctuation.ttl +++ b/schemas/1val1STRING_LITERAL1_with_all_punctuation.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( ' !"#$%&\'()/:;<=>?@[]^_`{|}~' ) ] ] . + sx:values ( ' !"#$%&\'()/:;<=>?@[]^_`{|}~' ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL1_with_ascii_boundaries.ttl b/schemas/1val1STRING_LITERAL1_with_ascii_boundaries.ttl index d732ba0ce68189a2247f61a50f7d05b88a08addf..315ef6d80156302c1e9e4ea4e675703648a50903 100644 GIT binary patch delta 37 tcmbQiyo-6lMNya30RRG$4Ez89 delta 13 VcmdnRJcD_{#fcw}Fzaz~0RSon1w{Y= diff --git a/schemas/1val1STRING_LITERAL2.ttl b/schemas/1val1STRING_LITERAL2.ttl index 470b4d7d..351f9ba4 100644 --- a/schemas/1val1STRING_LITERAL2.ttl +++ b/schemas/1val1STRING_LITERAL2.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL2" ) ] ] . + sx:values ( "STRING_LITERAL2" ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL2_with_LANGTAG.ttl b/schemas/1val1STRING_LITERAL2_with_LANGTAG.ttl index 2a5df4bb..45100f67 100644 --- a/schemas/1val1STRING_LITERAL2_with_LANGTAG.ttl +++ b/schemas/1val1STRING_LITERAL2_with_LANGTAG.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL2"@en ) ] ] . + sx:values ( "STRING_LITERAL2"@en ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL2_with_subtag.ttl b/schemas/1val1STRING_LITERAL2_with_subtag.ttl index 0aece382..90b3986d 100644 --- a/schemas/1val1STRING_LITERAL2_with_subtag.ttl +++ b/schemas/1val1STRING_LITERAL2_with_subtag.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL2"@en-uk ) ] ] . + sx:values ( "STRING_LITERAL2"@en-uk ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL_LONG1.ttl b/schemas/1val1STRING_LITERAL_LONG1.ttl index 641a5e7e..ad4de95b 100644 --- a/schemas/1val1STRING_LITERAL_LONG1.ttl +++ b/schemas/1val1STRING_LITERAL_LONG1.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL_LONG1" ) ] ] . + sx:values ( "STRING_LITERAL_LONG1" ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL_LONG2.ttl b/schemas/1val1STRING_LITERAL_LONG2.ttl index 042b0954..88a5f370 100644 --- a/schemas/1val1STRING_LITERAL_LONG2.ttl +++ b/schemas/1val1STRING_LITERAL_LONG2.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL_LONG2" ) ] ] . + sx:values ( "STRING_LITERAL_LONG2" ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL_LONG2_with_LANGTAG.ttl b/schemas/1val1STRING_LITERAL_LONG2_with_LANGTAG.ttl index dacc1d84..89614962 100644 --- a/schemas/1val1STRING_LITERAL_LONG2_with_LANGTAG.ttl +++ b/schemas/1val1STRING_LITERAL_LONG2_with_LANGTAG.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL_LONG2"@en ) ] ] . + sx:values ( "STRING_LITERAL_LONG2"@en ) ] ] ] . diff --git a/schemas/1val1STRING_LITERAL_LONG2_with_subtag.ttl b/schemas/1val1STRING_LITERAL_LONG2_with_subtag.ttl index e83ece3c..2fb5bdd2 100644 --- a/schemas/1val1STRING_LITERAL_LONG2_with_subtag.ttl +++ b/schemas/1val1STRING_LITERAL_LONG2_with_subtag.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL_LONG2"@en-uk ) ] ] . + sx:values ( "STRING_LITERAL_LONG2"@en-uk ) ] ] ] . diff --git a/schemas/1val1dotMinusiri3.ttl b/schemas/1val1dotMinusiri3.ttl index 6883a695..fc7bd19d 100644 --- a/schemas/1val1dotMinusiri3.ttl +++ b/schemas/1val1dotMinusiri3.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:IriStemRange ; sx:exclusion ( ) ; sx:stem [ a sx:Wildcard ] ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1val1dotMinusiriStem3.ttl b/schemas/1val1dotMinusiriStem3.ttl index b0566218..9a470dba 100644 --- a/schemas/1val1dotMinusiriStem3.ttl +++ b/schemas/1val1dotMinusiriStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "http://a.example/v2" ] [ a sx:IriStem ; sx:stem "http://a.example/v3" ]) ; - sx:stem [ a sx:Wildcard ] ] ) ] ] . + sx:stem [ a sx:Wildcard ] ] ) ] ] ] . diff --git a/schemas/1val1dotMinuslanguage3.ttl b/schemas/1val1dotMinuslanguage3.ttl index 7001a905..ed462aec 100644 --- a/schemas/1val1dotMinuslanguage3.ttl +++ b/schemas/1val1dotMinuslanguage3.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LanguageStemRange ; sx:exclusion ("fr-be" "fr-cd" "fr-ch") ; sx:stem [ a sx:Wildcard ] ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1val1dotMinuslanguageStem3.ttl b/schemas/1val1dotMinuslanguageStem3.ttl index 17ff9e9a..77a9d78b 100644 --- a/schemas/1val1dotMinuslanguageStem3.ttl +++ b/schemas/1val1dotMinuslanguageStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "fr-cd" ] [ a sx:LanguageStem ; sx:stem "fr-ch" ]) ; - sx:stem [ a sx:Wildcard ] ] ) ] ] . + sx:stem [ a sx:Wildcard ] ] ) ] ] ] . diff --git a/schemas/1val1dotMinusliteral3.ttl b/schemas/1val1dotMinusliteral3.ttl index 0f9d1926..d57cb8fe 100644 --- a/schemas/1val1dotMinusliteral3.ttl +++ b/schemas/1val1dotMinusliteral3.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LiteralStemRange ; sx:exclusion ("v1" "v2" "v3") ; sx:stem [ a sx:Wildcard ] ] - ) ] ] . + ) ] ] ] . diff --git a/schemas/1val1dotMinusliteralStem3.ttl b/schemas/1val1dotMinusliteralStem3.ttl index 80346e07..0fdb9ec1 100644 --- a/schemas/1val1dotMinusliteralStem3.ttl +++ b/schemas/1val1dotMinusliteralStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "v2" ] [ a sx:LiteralStem ; sx:stem "v3" ]) ; - sx:stem [ a sx:Wildcard ] ] ) ] ] . + sx:stem [ a sx:Wildcard ] ] ) ] ] ] . diff --git a/schemas/1val1emptylanguageStem.ttl b/schemas/1val1emptylanguageStem.ttl index 11e8612f..fffdd094 100644 --- a/schemas/1val1emptylanguageStem.ttl +++ b/schemas/1val1emptylanguageStem.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LanguageStem ; - sx:stem "" ] ) ] ] . + sx:stem "" ] ) ] ] ] . diff --git a/schemas/1val1emptylanguageStemMinuslanguage3.ttl b/schemas/1val1emptylanguageStemMinuslanguage3.ttl index 5396b964..fb341439 100644 --- a/schemas/1val1emptylanguageStemMinuslanguage3.ttl +++ b/schemas/1val1emptylanguageStemMinuslanguage3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ("fr-be" "fr-cd" "fr-ch") ; - sx:stem "" ] ) ] ] . + sx:stem "" ] ) ] ] ] . diff --git a/schemas/1val1emptylanguageStemMinuslanguageStem3.ttl b/schemas/1val1emptylanguageStemMinuslanguageStem3.ttl index 4611e97e..69e94f3f 100644 --- a/schemas/1val1emptylanguageStemMinuslanguageStem3.ttl +++ b/schemas/1val1emptylanguageStemMinuslanguageStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "fr-cd" ] [ a sx:LanguageStem ; sx:stem "fr-ch" ]) ; - sx:stem "" ] ) ] ] . + sx:stem "" ] ) ] ] ] . diff --git a/schemas/1val1false.ttl b/schemas/1val1false.ttl index 24171227..3911efcb 100644 --- a/schemas/1val1false.ttl +++ b/schemas/1val1false.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values [ rdf:first false ; - rdf:rest () ] ] ] . + rdf:rest () ] ] ] ] . diff --git a/schemas/1val1iri.ttl b/schemas/1val1iri.ttl index f2729f93..fa8a6440 100644 --- a/schemas/1val1iri.ttl +++ b/schemas/1val1iri.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( ) ] ] . + sx:values ( ) ] ] ] . diff --git a/schemas/1val1iriStem.ttl b/schemas/1val1iriStem.ttl index 2e7728fd..b6bce9de 100644 --- a/schemas/1val1iriStem.ttl +++ b/schemas/1val1iriStem.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:IriStem ; - sx:stem "http://a.example/v" ] ) ] ] . + sx:stem "http://a.example/v" ] ) ] ] ] . diff --git a/schemas/1val1iriStemMinusiri3.ttl b/schemas/1val1iriStemMinusiri3.ttl index 0a2f5acb..82d7ffd8 100644 --- a/schemas/1val1iriStemMinusiri3.ttl +++ b/schemas/1val1iriStemMinusiri3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ( ) ; - sx:stem "http://a.example/v" ] ) ] ] . + sx:stem "http://a.example/v" ] ) ] ] ] . diff --git a/schemas/1val1iriStemMinusiriStem3.ttl b/schemas/1val1iriStemMinusiriStem3.ttl index e98d51da..cff036dc 100644 --- a/schemas/1val1iriStemMinusiriStem3.ttl +++ b/schemas/1val1iriStemMinusiriStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "http://a.example/v2" ] [ a sx:IriStem ; sx:stem "http://a.example/v3" ]) ; - sx:stem "http://a.example/v" ] ) ] ] . + sx:stem "http://a.example/v" ] ) ] ] ] . diff --git a/schemas/1val1language.ttl b/schemas/1val1language.ttl index 0c04096a..678ee696 100644 --- a/schemas/1val1language.ttl +++ b/schemas/1val1language.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:Language ; - sx:languageTag "fr" ] ) ] ] . + sx:languageTag "fr" ] ) ] ] ] . diff --git a/schemas/1val1languageStem.ttl b/schemas/1val1languageStem.ttl index 2c7e7043..96753a9a 100644 --- a/schemas/1val1languageStem.ttl +++ b/schemas/1val1languageStem.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LanguageStem ; - sx:stem "fr" ] ) ] ] . + sx:stem "fr" ] ) ] ] ] . diff --git a/schemas/1val1languageStemMinuslanguage3.ttl b/schemas/1val1languageStemMinuslanguage3.ttl index aae22f73..23876d71 100644 --- a/schemas/1val1languageStemMinuslanguage3.ttl +++ b/schemas/1val1languageStemMinuslanguage3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ("fr-be" "fr-cd" "fr-ch") ; - sx:stem "fr" ] ) ] ] . + sx:stem "fr" ] ) ] ] ] . diff --git a/schemas/1val1languageStemMinuslanguageStem3.ttl b/schemas/1val1languageStemMinuslanguageStem3.ttl index 34e03ca4..81d82938 100644 --- a/schemas/1val1languageStemMinuslanguageStem3.ttl +++ b/schemas/1val1languageStemMinuslanguageStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "fr-cd" ] [ a sx:LanguageStem ; sx:stem "fr-ch" ]) ; - sx:stem "fr" ] ) ] ] . + sx:stem "fr" ] ) ] ] ] . diff --git a/schemas/1val1literal.ttl b/schemas/1val1literal.ttl index d1012131..03e0ce68 100644 --- a/schemas/1val1literal.ttl +++ b/schemas/1val1literal.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "v" ) ] ] . + sx:values ( "v" ) ] ] ] . diff --git a/schemas/1val1literalAtlanguageStem.ttl b/schemas/1val1literalAtlanguageStem.ttl index 33ae4ad4..dd6dc305 100644 --- a/schemas/1val1literalAtlanguageStem.ttl +++ b/schemas/1val1literalAtlanguageStem.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LiteralStem ; - sx:stem "@fr" ] ) ] ] . + sx:stem "@fr" ] ) ] ] ] . diff --git a/schemas/1val1literalAtlanguageStemMinusliteralAtlanguage3.ttl b/schemas/1val1literalAtlanguageStemMinusliteralAtlanguage3.ttl index c8a66bc5..16bf634c 100644 --- a/schemas/1val1literalAtlanguageStemMinusliteralAtlanguage3.ttl +++ b/schemas/1val1literalAtlanguageStemMinusliteralAtlanguage3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ("@fr-be" "@fr-cd" "@fr-ch") ; - sx:stem "@fr" ] ) ] ] . + sx:stem "@fr" ] ) ] ] ] . diff --git a/schemas/1val1literalStem.ttl b/schemas/1val1literalStem.ttl index 8a12428e..f9fdef1e 100644 --- a/schemas/1val1literalStem.ttl +++ b/schemas/1val1literalStem.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LiteralStem ; - sx:stem "v" ] ) ] ] . + sx:stem "v" ] ) ] ] ] . diff --git a/schemas/1val1literalStemMinusliteral3.ttl b/schemas/1val1literalStemMinusliteral3.ttl index 6c295c4e..41aeabf6 100644 --- a/schemas/1val1literalStemMinusliteral3.ttl +++ b/schemas/1val1literalStemMinusliteral3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ("v1" "v2" "v3") ; - sx:stem "v" ] ) ] ] . + sx:stem "v" ] ) ] ] ] . diff --git a/schemas/1val1literalStemMinusliteralStem3.ttl b/schemas/1val1literalStemMinusliteralStem3.ttl index 2683aaf6..5b7a4e5a 100644 --- a/schemas/1val1literalStemMinusliteralStem3.ttl +++ b/schemas/1val1literalStemMinusliteralStem3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -16,5 +16,5 @@ PREFIX xsd: sx:stem "v2" ] [ a sx:LiteralStem ; sx:stem "v3" ]) ; - sx:stem "v" ] ) ] ] . + sx:stem "v" ] ) ] ] ] . diff --git a/schemas/1val1literaliriStem.ttl b/schemas/1val1literaliriStem.ttl index ec279b76..940cb536 100644 --- a/schemas/1val1literaliriStem.ttl +++ b/schemas/1val1literaliriStem.ttl @@ -6,10 +6,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LiteralStem ; - sx:stem "http://a.example/v" ] ) ] ] . + sx:stem "http://a.example/v" ] ) ] ] ] . diff --git a/schemas/1val1literaliriStemMinusliteraliri3.ttl b/schemas/1val1literaliriStemMinusliteraliri3.ttl index 5d7c6953..bd12dd9c 100644 --- a/schemas/1val1literaliriStemMinusliteraliri3.ttl +++ b/schemas/1val1literaliriStemMinusliteraliri3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ("http://a.example/v1" "http://a.example/v2" "http://a.example/v3") ; - sx:stem "http://a.example/v" ] ) ] ] . + sx:stem "http://a.example/v" ] ) ] ] ] . diff --git a/schemas/1val1literallanguageStem.ttl b/schemas/1val1literallanguageStem.ttl index 002575ed..94ca2a29 100644 --- a/schemas/1val1literallanguageStem.ttl +++ b/schemas/1val1literallanguageStem.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:LiteralStem ; - sx:stem "fr" ] ) ] ] . + sx:stem "fr" ] ) ] ] ] . diff --git a/schemas/1val1literallanguageStemMinusliterallanguage3.ttl b/schemas/1val1literallanguageStemMinusliterallanguage3.ttl index 855f1ef4..07f994ef 100644 --- a/schemas/1val1literallanguageStemMinusliterallanguage3.ttl +++ b/schemas/1val1literallanguageStemMinusliterallanguage3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:exclusion ("fr-be" "fr-cd" "fr-ch") ; - sx:stem "fr" ] ) ] ] . + sx:stem "fr" ] ) ] ] ] . diff --git a/schemas/1val1refvsMinusiri3.ttl b/schemas/1val1refvsMinusiri3.ttl index 338c2f3a..7eb66704 100644 --- a/schemas/1val1refvsMinusiri3.ttl +++ b/schemas/1val1refvsMinusiri3.ttl @@ -5,15 +5,15 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:values ( [ a sx:IriStemRange ; sx:exclusion ( ) ; - sx:stem [ a sx:Wildcard ] ] ) . + sx:stem [ a sx:Wildcard ] ] ) ] . diff --git a/schemas/1val1true.ttl b/schemas/1val1true.ttl index 7ba6df5d..306ebf19 100644 --- a/schemas/1val1true.ttl +++ b/schemas/1val1true.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( true ) ] ] . + sx:values ( true ) ] ] ] . diff --git a/schemas/1val1vExpr1AND1AND1Ref3.ttl b/schemas/1val1vExpr1AND1AND1Ref3.ttl index 955e603c..69436994 100644 --- a/schemas/1val1vExpr1AND1AND1Ref3.ttl +++ b/schemas/1val1vExpr1AND1AND1Ref3.ttl @@ -9,24 +9,24 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; sx:shapeExprs ( - ) ] ] . + ) ] ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 4 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:maxlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^(ab)+$" . + sx:pattern "^(ab)+$" ] . diff --git a/schemas/1val1vExpr1AND1OR1Ref3.ttl b/schemas/1val1vExpr1AND1OR1Ref3.ttl index db0e55b5..cc095bdb 100644 --- a/schemas/1val1vExpr1AND1OR1Ref3.ttl +++ b/schemas/1val1vExpr1AND1OR1Ref3.ttl @@ -9,24 +9,24 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeAnd ; sx:shapeExprs ( ) ] - ) ] ] . + ) ] ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 4 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:maxlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^(ab)*$" . + sx:pattern "^(ab)*$" ] . diff --git a/schemas/1val1vExpr1OR1AND1Ref3.ttl b/schemas/1val1vExpr1OR1AND1Ref3.ttl index b7e09fb6..b67373e5 100644 --- a/schemas/1val1vExpr1OR1AND1Ref3.ttl +++ b/schemas/1val1vExpr1OR1AND1Ref3.ttl @@ -9,24 +9,24 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeAnd ; sx:shapeExprs ( - ) ] ) ] ] . + ) ] ) ] ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:maxlength 3 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^(ab)*$" . + sx:pattern "^(ab)*$" ] . diff --git a/schemas/1val1vExpr1OR1OR1Ref3.ttl b/schemas/1val1vExpr1OR1OR1Ref3.ttl index c45c968b..947564b1 100644 --- a/schemas/1val1vExpr1OR1OR1Ref3.ttl +++ b/schemas/1val1vExpr1OR1OR1Ref3.ttl @@ -9,24 +9,24 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeOr ; sx:shapeExprs ( - ) ] ] . + ) ] ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "ab.*" . + sx:pattern "ab.*" ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern ".*cd.*" . + sx:pattern ".*cd.*" ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern ".*ef" . + sx:pattern ".*ef" ] . diff --git a/schemas/1val1vExprAND3.ttl b/schemas/1val1vExprAND3.ttl index 31e80201..7603d4dc 100644 --- a/schemas/1val1vExprAND3.ttl +++ b/schemas/1val1vExprAND3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeAnd ; @@ -15,5 +15,5 @@ PREFIX xsd: sx:maxlength 5 ; sx:nodeKind sx:literal ] [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^(ab)+$" ] ) ] ] . + sx:pattern "^(ab)+$" ] ) ] ] ] . diff --git a/schemas/1val1vExprOR3.ttl b/schemas/1val1vExprOR3.ttl index 6148b72f..3d3e4f53 100644 --- a/schemas/1val1vExprOR3.ttl +++ b/schemas/1val1vExprOR3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:ShapeOr ; @@ -15,5 +15,5 @@ PREFIX xsd: sx:nodeKind sx:literal ; sx:pattern ".*cd.*" ] [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern ".*ef" ] ) ] ] . + sx:pattern ".*ef" ] ) ] ] ] . diff --git a/schemas/1val1vExprRefAND3.ttl b/schemas/1val1vExprRefAND3.ttl index 063cf212..654c0d1d 100644 --- a/schemas/1val1vExprRefAND3.ttl +++ b/schemas/1val1vExprRefAND3.ttl @@ -10,26 +10,26 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 4 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:maxlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "^(ab)+$" . + sx:pattern "^(ab)+$" ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( - ) . + ) ] . diff --git a/schemas/1val1vExprRefIRIREF1.ttl b/schemas/1val1vExprRefIRIREF1.ttl index ed80985e..d0fbdc1d 100644 --- a/schemas/1val1vExprRefIRIREF1.ttl +++ b/schemas/1val1vExprRefIRIREF1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . diff --git a/schemas/1val1vExprRefOR3.ttl b/schemas/1val1vExprRefOR3.ttl index 7dc1c1bc..71c03bba 100644 --- a/schemas/1val1vExprRefOR3.ttl +++ b/schemas/1val1vExprRefOR3.ttl @@ -10,26 +10,26 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "ab.*" . + sx:pattern "ab.*" ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern ".*cd.*" . + sx:pattern ".*cd.*" ] . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern ".*ef" . + sx:pattern ".*ef" ] . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( - ) . + ) ] . diff --git a/schemas/1val1vExprRefbnode1.ttl b/schemas/1val1vExprRefbnode1.ttl index a269b032..5d612e96 100644 --- a/schemas/1val1vExprRefbnode1.ttl +++ b/schemas/1val1vExprRefbnode1.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes (_:vc1 ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:vc1 ] . -_:vc1 a sx:NodeConstraint ; + sx:valueExpr _:vc1 ] ] . +_:vc1 a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . diff --git a/schemas/1val1vShapeANDRef3.ttl b/schemas/1val1vShapeANDRef3.ttl index 6b3a4e46..3f121a87 100644 --- a/schemas/1val1vShapeANDRef3.ttl +++ b/schemas/1val1vShapeANDRef3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; @@ -21,5 +21,5 @@ PREFIX xsd: sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:literal ; - sx:pattern "(ab)+" ] ] ] ) . + sx:pattern "(ab)+" ] ] ] ) ] . diff --git a/schemas/1val2IRIREFExtra1.ttl b/schemas/1val2IRIREFExtra1.ttl index b992c07b..0ed2dcf7 100644 --- a/schemas/1val2IRIREFExtra1.ttl +++ b/schemas/1val2IRIREFExtra1.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( ) ] ] ; - sx:extra . + sx:extra ] . diff --git a/schemas/1val2IRIREFPlusExtra1.ttl b/schemas/1val2IRIREFPlusExtra1.ttl index 93d90878..d429abb3 100644 --- a/schemas/1val2IRIREFPlusExtra1.ttl +++ b/schemas/1val2IRIREFPlusExtra1.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:max -1 ; sx:min 1 ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; sx:values ( ) ] ] ; - sx:extra . + sx:extra ] . diff --git a/schemas/1val2STRING_LITERAL1.ttl b/schemas/1val2STRING_LITERAL1.ttl index ab2309c4..e0accb69 100644 --- a/schemas/1val2STRING_LITERAL1.ttl +++ b/schemas/1val2STRING_LITERAL1.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:NodeConstraint ; - sx:values ( "STRING_LITERAL1" "STRING_LITERAL1b" ) ] ] . + sx:values ( "STRING_LITERAL1" "STRING_LITERAL1b" ) ] ] ] . diff --git a/schemas/1valExprRef-IV1.ttl b/schemas/1valExprRef-IV1.ttl index 63e32669..b6e22a93 100644 --- a/schemas/1valExprRef-IV1.ttl +++ b/schemas/1valExprRef-IV1.ttl @@ -6,8 +6,8 @@ PREFIX xsd: sx:imports (<1valExprRef-vc1>) ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/1valExprRef-vc1.ttl b/schemas/1valExprRef-vc1.ttl index d1bfb35f..35bc82fa 100644 --- a/schemas/1valExprRef-vc1.ttl +++ b/schemas/1valExprRef-vc1.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:NodeConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . diff --git a/schemas/1valExprRefbnode-IV1.ttl b/schemas/1valExprRefbnode-IV1.ttl index 807014a0..637d317f 100644 --- a/schemas/1valExprRefbnode-IV1.ttl +++ b/schemas/1valExprRefbnode-IV1.ttl @@ -7,7 +7,7 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr _:vc1 ] . + sx:valueExpr _:vc1 ] ] . diff --git a/schemas/1valExprRefbnode-vc1.ttl b/schemas/1valExprRefbnode-vc1.ttl index 29bea66c..1ba5bcae 100644 --- a/schemas/1valExprRefbnode-vc1.ttl +++ b/schemas/1valExprRefbnode-vc1.ttl @@ -6,6 +6,6 @@ PREFIX xsd: sx:shapes ( _:vc1) . -_:vc1 a sx:NodeConstraint ; +_:vc1 a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:minlength 5 ; - sx:nodeKind sx:literal . + sx:nodeKind sx:literal ] . diff --git a/schemas/2EachInclude1-IS2.ttl b/schemas/2EachInclude1-IS2.ttl index ed59e4f3..b9dbb6fe 100644 --- a/schemas/2EachInclude1-IS2.ttl +++ b/schemas/2EachInclude1-IS2.ttl @@ -6,9 +6,9 @@ PREFIX xsd: sx:imports (<2EachInclude1-S2>) ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( - [ a sx:TripleConstraint ; sx:predicate ] ) ] . + [ a sx:TripleConstraint ; sx:predicate ] ) ] ] . diff --git a/schemas/2EachInclude1-S2.ttl b/schemas/2EachInclude1-S2.ttl index fca05477..8edb2fb8 100644 --- a/schemas/2EachInclude1-S2.ttl +++ b/schemas/2EachInclude1-S2.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate . diff --git a/schemas/2EachInclude1-after.ttl b/schemas/2EachInclude1-after.ttl index cd81b47c..d38aae42 100644 --- a/schemas/2EachInclude1-after.ttl +++ b/schemas/2EachInclude1-after.ttl @@ -6,13 +6,13 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate . diff --git a/schemas/2EachInclude1.ttl b/schemas/2EachInclude1.ttl index e7641b96..5a60fce5 100644 --- a/schemas/2EachInclude1.ttl +++ b/schemas/2EachInclude1.ttl @@ -6,14 +6,14 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( - [ a sx:TripleConstraint ; sx:predicate ] ) ] . + [ a sx:TripleConstraint ; sx:predicate ] ) ] ] . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate . diff --git a/schemas/2Eachdot.ttl b/schemas/2Eachdot.ttl index 9d7d8b51..a13b03d2 100644 --- a/schemas/2Eachdot.ttl +++ b/schemas/2Eachdot.ttl @@ -4,11 +4,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ; - ] . + ] ] . diff --git a/schemas/2OneInclude1-after.ttl b/schemas/2OneInclude1-after.ttl index 8c5d63ee..9bcb97bd 100644 --- a/schemas/2OneInclude1-after.ttl +++ b/schemas/2OneInclude1-after.ttl @@ -6,13 +6,13 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate . diff --git a/schemas/2OneInclude1.ttl b/schemas/2OneInclude1.ttl index afa4901e..95d6ca9e 100644 --- a/schemas/2OneInclude1.ttl +++ b/schemas/2OneInclude1.ttl @@ -6,13 +6,13 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . - a sx:Shape ; - sx:expression . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression ] . a sx:TripleConstraint ; sx:predicate . diff --git a/schemas/2RefS1-IS2.ttl b/schemas/2RefS1-IS2.ttl index 1d6b785e..be2ddcd2 100644 --- a/schemas/2RefS1-IS2.ttl +++ b/schemas/2RefS1-IS2.ttl @@ -3,7 +3,8 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <2RefS2> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/2RefS1-Icirc.ttl b/schemas/2RefS1-Icirc.ttl index 8802c386..93dd33ff 100644 --- a/schemas/2RefS1-Icirc.ttl +++ b/schemas/2RefS1-Icirc.ttl @@ -3,7 +3,8 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <2RefS2-Icirc> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr: [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/2RefS1.ttl b/schemas/2RefS1.ttl index 82d6ec50..e9910ade 100644 --- a/schemas/2RefS1.ttl +++ b/schemas/2RefS1.ttl @@ -2,7 +2,6 @@ PREFIX sx: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; sx:expression [ - a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ + a sx:TripleConstraint ; sx:predicate ; sx:valueExpr ] ] . diff --git a/schemas/2dot.ttl b/schemas/2dot.ttl index 492a2fd0..aab3f6fb 100644 --- a/schemas/2dot.ttl +++ b/schemas/2dot.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/2dotOne1dot.ttl b/schemas/2dotOne1dot.ttl index d745b2ad..2b37e045 100644 --- a/schemas/2dotOne1dot.ttl +++ b/schemas/2dotOne1dot.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/2dotSemiOne1dotSemi.ttl b/schemas/2dotSemiOne1dotSemi.ttl index d745b2ad..2b37e045 100644 --- a/schemas/2dotSemiOne1dotSemi.ttl +++ b/schemas/2dotSemiOne1dotSemi.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/2dotSemis.ttl b/schemas/2dotSemis.ttl index 492a2fd0..aab3f6fb 100644 --- a/schemas/2dotSemis.ttl +++ b/schemas/2dotSemis.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/3Eachdot.ttl b/schemas/3Eachdot.ttl index bd0b1f9d..923f0931 100644 --- a/schemas/3Eachdot.ttl +++ b/schemas/3Eachdot.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/3Eachdot3Extra.ttl b/schemas/3Eachdot3Extra.ttl index b5b34cab..c7456766 100644 --- a/schemas/3Eachdot3Extra.ttl +++ b/schemas/3Eachdot3Extra.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ; @@ -19,5 +19,5 @@ PREFIX xsd: sx:values ( ) ] ] ) ] ; sx:extra , , - . + ] . diff --git a/schemas/3EachdotExtra3.ttl b/schemas/3EachdotExtra3.ttl index b5b34cab..c7456766 100644 --- a/schemas/3EachdotExtra3.ttl +++ b/schemas/3EachdotExtra3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ; @@ -19,5 +19,5 @@ PREFIX xsd: sx:values ( ) ] ] ) ] ; sx:extra , , - . + ] . diff --git a/schemas/3EachdotExtra3NLex.ttl b/schemas/3EachdotExtra3NLex.ttl index b5b34cab..c7456766 100644 --- a/schemas/3EachdotExtra3NLex.ttl +++ b/schemas/3EachdotExtra3NLex.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ; @@ -19,5 +19,5 @@ PREFIX xsd: sx:values ( ) ] ] ) ] ; sx:extra , , - . + ] . diff --git a/schemas/3circRefPlus1.ttl b/schemas/3circRefPlus1.ttl index a2b7d8cb..69c2a3bf 100644 --- a/schemas/3circRefPlus1.ttl +++ b/schemas/3circRefPlus1.ttl @@ -6,24 +6,24 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; - sx:expression [ a sx:TripleConstraint ; sx:predicate ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr ] - ) ] . + ) ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/3circRefS1-IS2-IS3-IS3.ttl b/schemas/3circRefS1-IS2-IS3-IS3.ttl index c0e4c2d5..605c1aa3 100644 --- a/schemas/3circRefS1-IS2-IS3-IS3.ttl +++ b/schemas/3circRefS1-IS2-IS3-IS3.ttl @@ -3,10 +3,11 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <3circRefS2-IS3> <3circRefS3> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr ] - ) ] . + ) ] ] . diff --git a/schemas/3circRefS1-IS2-IS3.ttl b/schemas/3circRefS1-IS2-IS3.ttl index 84950093..c379a9d5 100644 --- a/schemas/3circRefS1-IS2-IS3.ttl +++ b/schemas/3circRefS1-IS2-IS3.ttl @@ -3,10 +3,11 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <3circRefS2-IS3> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr ] - ) ] . + ) ] ] . diff --git a/schemas/3circRefS1-IS23.ttl b/schemas/3circRefS1-IS23.ttl index 694e865d..61e3faef 100644 --- a/schemas/3circRefS1-IS23.ttl +++ b/schemas/3circRefS1-IS23.ttl @@ -3,10 +3,11 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <3circRefS23> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr ] - ) ] . + ) ] ] . diff --git a/schemas/3circRefS1-Icirc.ttl b/schemas/3circRefS1-Icirc.ttl index 8ffed9e1..2537e5ac 100644 --- a/schemas/3circRefS1-Icirc.ttl +++ b/schemas/3circRefS1-Icirc.ttl @@ -3,10 +3,11 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <3circRefS2-Icirc> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr ] - ) ] . + ) ] ] . diff --git a/schemas/3circRefS12.ttl b/schemas/3circRefS12.ttl index d790d2ca..402a8bd0 100644 --- a/schemas/3circRefS12.ttl +++ b/schemas/3circRefS12.ttl @@ -2,14 +2,15 @@ PREFIX sx: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ; sx:min 0 ; sx:max 1 ; sx:valueExpr ] - ) ] . + ) ] ] . - a sx:Shape ; sx:expression [ + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/3circRefS23.ttl b/schemas/3circRefS23.ttl index efff3729..faecb972 100644 --- a/schemas/3circRefS23.ttl +++ b/schemas/3circRefS23.ttl @@ -2,11 +2,13 @@ PREFIX sx: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . + - a sx:Shape ; sx:expression [ + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/3circRefS3-IS12.ttl b/schemas/3circRefS3-IS12.ttl index 7cfe6d78..1caf44e4 100644 --- a/schemas/3circRefS3-IS12.ttl +++ b/schemas/3circRefS3-IS12.ttl @@ -3,7 +3,8 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <3circRefS12> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/3circRefS3-Icirc.ttl b/schemas/3circRefS3-Icirc.ttl index cc266564..aae8086a 100644 --- a/schemas/3circRefS3-Icirc.ttl +++ b/schemas/3circRefS3-Icirc.ttl @@ -3,7 +3,8 @@ PREFIX sx: [] a sx:Schema ; sx:imports ( <3circRefS1-Icirc> ) ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/3circRefS3.ttl b/schemas/3circRefS3.ttl index 4b09841e..70be3e9d 100644 --- a/schemas/3circRefS3.ttl +++ b/schemas/3circRefS3.ttl @@ -2,7 +2,8 @@ PREFIX sx: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/AND3G.ttl b/schemas/AND3G.ttl index 1acffa9c..ae9f5e6c 100644 --- a/schemas/AND3G.ttl +++ b/schemas/AND3G.ttl @@ -45,7 +45,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s..C........$" @@ -60,9 +60,9 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:extends ( ) ] @@ -79,5 +79,5 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . diff --git a/schemas/ANDAbstract.ttl b/schemas/ANDAbstract.ttl index e1827596..7fc1040d 100644 --- a/schemas/ANDAbstract.ttl +++ b/schemas/ANDAbstract.ttl @@ -24,7 +24,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:extends ( ) ] [ a sx:NodeConstraint ; @@ -40,5 +40,5 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . diff --git a/schemas/Cycle2Extra.ttl b/schemas/Cycle2Extra.ttl index 76904c5f..7515e4b5 100644 --- a/schemas/Cycle2Extra.ttl +++ b/schemas/Cycle2Extra.ttl @@ -1,17 +1,17 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes ( ) . +[] a sx:Schema ; + sx:shapes ( ) . - a shex:Shape ; - shex:extra ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:extra ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ] ] . diff --git a/schemas/Cycle2NoNegation.ttl b/schemas/Cycle2NoNegation.ttl index db4f53a9..302fc933 100644 --- a/schemas/Cycle2NoNegation.ttl +++ b/schemas/Cycle2NoNegation.ttl @@ -1,10 +1,10 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes () . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] . +[] a sx:Schema ; + sx:shapes () . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] . diff --git a/schemas/CycleNoNegation.ttl b/schemas/CycleNoNegation.ttl index 421e89e6..0490b2f6 100644 --- a/schemas/CycleNoNegation.ttl +++ b/schemas/CycleNoNegation.ttl @@ -1,19 +1,19 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes () . +[] a sx:Schema ; + sx:shapes () . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr [ - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr [ + a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] - ] . + ] ] . diff --git a/schemas/Extend3G.ttl b/schemas/Extend3G.ttl index 5ead55da..b56ef57f 100644 --- a/schemas/Extend3G.ttl +++ b/schemas/Extend3G.ttl @@ -45,7 +45,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s..C........$" @@ -60,7 +60,7 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . a sx:ShapeDecl ; sx:abstract true ; @@ -103,7 +103,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s.....F.....$" @@ -116,9 +116,9 @@ PREFIX xsd: ] ] ] - ) . + ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s......G....$" @@ -132,5 +132,5 @@ PREFIX xsd: ] ] ] - ) . + ) ] . diff --git a/schemas/ExtendAND3G.ttl b/schemas/ExtendAND3G.ttl index 263cf247..f3c497a1 100644 --- a/schemas/ExtendAND3G.ttl +++ b/schemas/ExtendAND3G.ttl @@ -45,7 +45,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s..C........$" @@ -60,7 +60,7 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . a sx:ShapeDecl ; sx:abstract true ; @@ -84,7 +84,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s....E......$" @@ -98,5 +98,5 @@ PREFIX xsd: ] ] ] - ) . + ) ] . diff --git a/schemas/ExtendANDExtend3GAND3G.ttl b/schemas/ExtendANDExtend3GAND3G.ttl index f4290888..92bd7c6b 100644 --- a/schemas/ExtendANDExtend3GAND3G.ttl +++ b/schemas/ExtendANDExtend3GAND3G.ttl @@ -45,7 +45,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s..C........$" @@ -60,7 +60,7 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . a sx:ShapeDecl ; sx:abstract true ; @@ -103,7 +103,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s.....F.....$" @@ -116,7 +116,7 @@ PREFIX xsd: ] ] ] - ) . + ) ]. a sx:ShapeDecl ; sx:abstract true ; @@ -158,7 +158,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "s........I..$" @@ -171,9 +171,9 @@ PREFIX xsd: ] ] ] - ) . + ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:extends ( ) ] [ a sx:NodeConstraint ; @@ -188,5 +188,5 @@ PREFIX xsd: ] ] ] - ) . + ) ] . diff --git a/schemas/Extends-sAB.ttl b/schemas/Extends-sAB.ttl index 0007eea1..6465ae2f 100644 --- a/schemas/Extends-sAB.ttl +++ b/schemas/Extends-sAB.ttl @@ -24,7 +24,7 @@ PREFIX xsd: ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; @@ -40,5 +40,5 @@ PREFIX xsd: sx:max -1 ] ] - ) . + ) ] . diff --git a/schemas/ExtendsRepeatedP.ttl b/schemas/ExtendsRepeatedP.ttl index bedaf0ed..6f794290 100644 --- a/schemas/ExtendsRepeatedP.ttl +++ b/schemas/ExtendsRepeatedP.ttl @@ -4,8 +4,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . -a sx:Shape ; -sx:expression [ a sx:EachOf; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ; @@ -19,9 +18,9 @@ sx:expression [ a sx:EachOf; ] ] ) -] . +] ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; @@ -40,11 +39,11 @@ sx:expression [ a sx:EachOf; ) ] ] - ) . + ) ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extends () ; sx:expression [ a sx:TripleConstraint ; sx:predicate - ] . + ] ] . diff --git a/schemas/FocusIRI2EachBnodeNested2EachIRIRef.ttl b/schemas/FocusIRI2EachBnodeNested2EachIRIRef.ttl index 6fc4739c..352c3b2d 100644 --- a/schemas/FocusIRI2EachBnodeNested2EachIRIRef.ttl +++ b/schemas/FocusIRI2EachBnodeNested2EachIRIRef.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:nodeKind sx:iri ; sx:pattern "^https?://" ] [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( @@ -30,5 +30,5 @@ PREFIX xsd: ) ] ] ) ] ] ) ] ] - ) . + ) ] . diff --git a/schemas/NOT1NOTvs.ttl b/schemas/NOT1NOTvs.ttl index 400aa81c..44125025 100644 --- a/schemas/NOT1NOTvs.ttl +++ b/schemas/NOT1NOTvs.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeNot ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeNot ; sx:shapeExpr [ a sx:Shape ; sx:expression [ @@ -15,4 +15,4 @@ PREFIX xsd: a sx:ShapeNot ; sx:shapeExpr [ a sx:NodeConstraint ; - sx:values ( )]]]]. + sx:values ( )]]]]] . diff --git a/schemas/NOT1dotOR2dot.ttl b/schemas/NOT1dotOR2dot.ttl index 87b8a2eb..7937b2ee 100644 --- a/schemas/NOT1dotOR2dot.ttl +++ b/schemas/NOT1dotOR2dot.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeNot ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ] ) . + sx:predicate ] ) ] ] ) ] . diff --git a/schemas/NOT1dotOR2dotX3.ttl b/schemas/NOT1dotOR2dotX3.ttl index 35478132..f8a45df7 100644 --- a/schemas/NOT1dotOR2dotX3.ttl +++ b/schemas/NOT1dotOR2dotX3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeNot ; sx:shapeExpr [ a sx:Shape ; @@ -35,5 +35,5 @@ PREFIX xsd: [ a sx:TripleConstraint ; sx:predicate ] ) ] ] ) ] - ) . + ) ] . diff --git a/schemas/NOT1dotOR2dotX3AND1.ttl b/schemas/NOT1dotOR2dotX3AND1.ttl index 7fcec6c7..67b9e82f 100644 --- a/schemas/NOT1dotOR2dotX3AND1.ttl +++ b/schemas/NOT1dotOR2dotX3AND1.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeNot ; sx:shapeExpr [ a sx:Shape ; @@ -37,5 +37,5 @@ PREFIX xsd: sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] ] ) ] ) . + sx:predicate ] ] ) ] ) ] . diff --git a/schemas/NoNegation.ttl b/schemas/NoNegation.ttl index c7903f02..63a01993 100644 --- a/schemas/NoNegation.ttl +++ b/schemas/NoNegation.ttl @@ -1,29 +1,29 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes ( ) . +[] a sx:Schema ; + sx:shapes ( ) . - a shex:ShapeAnd ; - shex:shapeExprs ( + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; + sx:shapeExprs ( - ) . + ) ] . - a shex:Shape ; - shex:expression [ - a shex:EachOf ; - shex:expressions ( - [ a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] - [ a shex:TripleConstraint ; - shex:predicate ] + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:EachOf ; + sx:expressions ( + [ a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] + [ a sx:TripleConstraint ; + sx:predicate ] ) - ] . + ] ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ] ] . diff --git a/schemas/NoNegation2.ttl b/schemas/NoNegation2.ttl index d8987fd2..cd2a1d9a 100644 --- a/schemas/NoNegation2.ttl +++ b/schemas/NoNegation2.ttl @@ -1,28 +1,28 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes ( ) . +[] a sx:Schema ; + sx:shapes ( ) . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr [ - a shex:ShapeAnd ; - shex:shapeExprs ( + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr [ + a sx:ShapeAnd ; + sx:shapeExprs ( - ) ] ] . + ) ] ] ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] . diff --git a/schemas/OneNegation.ttl b/schemas/OneNegation.ttl index a8010827..36be4353 100644 --- a/schemas/OneNegation.ttl +++ b/schemas/OneNegation.ttl @@ -1,23 +1,23 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes ( ) . +[] a sx:Schema ; + sx:shapes ( ) . - a shex:ShapeAnd . - shex:shapeExprs ( + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; + sx:shapeExprs ( - [ a shex:ShapeNot ; - shex:shapeExpr ] - ) . + [ a sx:ShapeNot ; + sx:shapeExpr ] + ) ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ] ] . diff --git a/schemas/TwoNegation.ttl b/schemas/TwoNegation.ttl index e2838982..b58be818 100644 --- a/schemas/TwoNegation.ttl +++ b/schemas/TwoNegation.ttl @@ -1,22 +1,22 @@ -PREFIX shex: +PREFIX sx: -[] a shex:Schema ; - shex:shapes ( ) . +[] a sx:Schema ; + sx:shapes ( ) . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr [ - a shex:ShapeNot ; - shex:shapeExpr ] ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr [ + a sx:ShapeNot ; + sx:shapeExpr ] ] ] . - a shex:ShapeNot ; - shex:shapeExpr . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeNot ; + sx:shapeExpr ] . - a shex:Shape ; - shex:expression [ - a shex:TripleConstraint ; - shex:predicate ; - shex:valueExpr ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression [ + a sx:TripleConstraint ; + sx:predicate ; + sx:valueExpr ] ] . diff --git a/schemas/_all.ttl b/schemas/_all.ttl index 217bdd25..da6da9c0 100644 --- a/schemas/_all.ttl +++ b/schemas/_all.ttl @@ -26,27 +26,27 @@ PREFIX a: _:a·̀ͯ‿.⁀ _:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽) . - a sx:NodeConstraint ; sx:nodeKind sx:iri . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:iri ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extra , , ; - sx:expression . + sx:expression ] . a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extra , , ; - sx:expression prefix1:S2e . + sx:expression prefix1:S2e ] . prefix1:S2e a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:extra , , ; sx:expression [ a sx:EachOf ; sx:expressions ( @@ -98,7 +98,7 @@ prefix1:S2e a sx:EachOf ; 0.0 0e0 0E0 false 0 "ab"^^ "o+"^^prefix1:bloodType ' !"#$%&():;<=>?@[]^_`{|}~' - ' &([]' # Eliding \u0000 because it confuses UTF-8 detectors. + ' &([]' # Eliding \u0000 because it confuses UTF-8 detectors] . '€߿ࠀ࿿က쿿퀀퟿�𐀀𿿽񀀀󿿽􀀀􏿽' "\"\\" "𝟘𝟙𝟚𝟛𝟜𝟝𝟞𝟟𝟠𝟡" # outside of BMP @@ -157,26 +157,26 @@ prefix1:S2e a sx:EachOf ; [ a sx:IriStemRange ; sx:stem [ a sx:Wildcard ] ; sx:exclusion ([ a sx:IriStem ; sx:stem "http://all.example/a" ] ) ] ) ] ] - ) ] . + ) ] ] . - a sx:NodeConstraint ; sx:nodeKind sx:iri . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; sx:nodeKind sx:iri ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:values ( [ a sx:IriStemRange ; sx:stem "http://all.example/" ; sx:exclusion ([ a sx:IriStem ; sx:stem "http://all.example/a" ] ) ] ) ] - [ a sx:NodeConstraint ; sx:datatype ] ) . + [ a sx:NodeConstraint ; sx:datatype ] ) ] . -_:a·̀ͯ‿.⁀ a sx:Shape ; sx:closed true ; - sx:expression _:a·̀ͯ‿.⁀e . +_:a·̀ͯ‿.⁀ a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; + sx:expression _:a·̀ͯ‿.⁀e ] . _:a·̀ͯ‿.⁀e a sx:EachOf ; sx:expressions ( a:S1e ) . -_:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 a sx:Shape ; - sx:expression _:a·̀ͯ‿.⁀e . +_:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression _:a·̀ͯ‿.⁀e ] . diff --git a/schemas/bnode1dot.ttl b/schemas/bnode1dot.ttl index caa62768..c1c72ce2 100644 --- a/schemas/bnode1dot.ttl +++ b/schemas/bnode1dot.ttl @@ -4,7 +4,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes (_:S1) . -_:S1 a sx:Shape ; +_:S1 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/datatypes.ttl b/schemas/datatypes.ttl index de179888..d4f97f21 100644 --- a/schemas/datatypes.ttl +++ b/schemas/datatypes.ttl @@ -23,98 +23,98 @@ PREFIX xsd: ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:integer ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:decimal ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:float ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:double ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:string ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:string ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:boolean ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:boolean ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:dateTime ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:dateTime ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:nonPositiveInteger ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:nonPositiveInteger ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:negativeInteger ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:negativeInteger ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:long ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:long ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:int ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:int ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:short ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:short ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:byte ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:byte ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:nonNegativeInteger ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:nonNegativeInteger ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedLong ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedLong ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedInt ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedInt ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedShort ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedShort ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedByte ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:unsignedByte ] ] ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:positiveInteger ] ] . + sx:valueExpr [ a sx:NodeConstraint ; sx:datatype xsd:positiveInteger ] ] ] . diff --git a/schemas/dependent_shape.ttl b/schemas/dependent_shape.ttl index 1dd11b8f..4f7e3380 100644 --- a/schemas/dependent_shape.ttl +++ b/schemas/dependent_shape.ttl @@ -1,22 +1,22 @@ -@prefix rdf: . +PREFIX sx: - a ; - [ - a ; - ; - - ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape; + sx:expression [ + a sx:TripleConstraint; + sx:predicate ; + sx:valueExpr + ] ] . - a ; - [ - a ; - ; - [ - a ; - () + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape; + sx:expression [ + a sx:TripleConstraint; + sx:predicate ; + sx:valueExpr [ + a sx:NodeConstraint; + sx:values () ] - ] . + ] ] . [] - a ; - ( ) . + a sx:Schema; + sx:shapes ( ) . diff --git a/schemas/focusNOTRefOR1dot.ttl b/schemas/focusNOTRefOR1dot.ttl index 7ed46e0a..f037d7a2 100644 --- a/schemas/focusNOTRefOR1dot.ttl +++ b/schemas/focusNOTRefOR1dot.ttl @@ -4,7 +4,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeNot ; sx:shapeExpr @@ -14,10 +14,10 @@ PREFIX xsd: sx:predicate ] ] - ) . + ) ] . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate - ] . + ] ] . diff --git a/schemas/focusbnode0ORfocusPattern0.ttl b/schemas/focusbnode0ORfocusPattern0.ttl index 586338c6..0036ebe8 100644 --- a/schemas/focusbnode0ORfocusPattern0.ttl +++ b/schemas/focusbnode0ORfocusPattern0.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:ShapeAnd ; sx:shapeExprs ( @@ -15,4 +15,4 @@ PREFIX xsd: sx:shapeExprs ( [ a sx:NodeConstraint ; sx:pattern "^http://a.example/s1$" ] [ a sx:Shape ] ) ] - ) . + ) ] . diff --git a/schemas/focusdatatype.ttl b/schemas/focusdatatype.ttl index d5d8943c..a989d461 100644 --- a/schemas/focusdatatype.ttl +++ b/schemas/focusdatatype.ttl @@ -5,6 +5,6 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:NodeConstraint ; - sx:datatype . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; + sx:datatype ] . diff --git a/schemas/focusvs.ttl b/schemas/focusvs.ttl index ec912aea..241d48e8 100644 --- a/schemas/focusvs.ttl +++ b/schemas/focusvs.ttl @@ -5,6 +5,6 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:NodeConstraint ; - sx:values ( ) . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:NodeConstraint ; + sx:values ( ) ] . diff --git a/schemas/focusvsANDIRI.ttl b/schemas/focusvsANDIRI.ttl index 82c22af2..bbee17a0 100644 --- a/schemas/focusvsANDIRI.ttl +++ b/schemas/focusvsANDIRI.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:values ( ) ] [ a sx:NodeConstraint ; - sx:nodeKind sx:iri ] ) . + sx:nodeKind sx:iri ] ) ] . diff --git a/schemas/focusvsANDdatatype.ttl b/schemas/focusvsANDdatatype.ttl index f979d8ad..f5804949 100644 --- a/schemas/focusvsANDdatatype.ttl +++ b/schemas/focusvsANDdatatype.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:values ( ) ] [ a sx:NodeConstraint ; - sx:datatype ] ) . + sx:datatype ] ) ] . diff --git a/schemas/focusvsORdatatype.ttl b/schemas/focusvsORdatatype.ttl index 00ea58a0..a7d066b4 100644 --- a/schemas/focusvsORdatatype.ttl +++ b/schemas/focusvsORdatatype.ttl @@ -5,8 +5,8 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeOr ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeOr ; sx:shapeExprs ( [ a sx:NodeConstraint ; sx:values ( ) ] [ a sx:NodeConstraint ; - sx:datatype ] ) . + sx:datatype ] ) ] . diff --git a/schemas/kitchenSink.ttl b/schemas/kitchenSink.ttl index 11035cd8..6434ca69 100644 --- a/schemas/kitchenSink.ttl +++ b/schemas/kitchenSink.ttl @@ -23,7 +23,7 @@ prefix rdfs: _:IDshape ex:FooID) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate rdf:type ; sx:max 1 ; sx:min 0 ; @@ -57,9 +57,9 @@ prefix rdfs: [ a sx:TripleConstraint ; sx:predicate ex:related ; sx:max -1 ; sx:min 0 ; sx:valueExpr ] - ) ] . + ) ] ] . -ex:UserShape a sx:Shape ; +ex:UserShape a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate foaf:name ; @@ -79,9 +79,9 @@ ex:UserShape a sx:Shape ; [ a sx:NodeConstraint ; sx:nodeKind sx:bnode ] _:IDshape ) ] ] - ) ] . + ) ] ] . -ex:EmployeeShape a sx:Shape ; +ex:EmployeeShape a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate foaf:givenName ; sx:max -1 ; sx:min 1 ; @@ -94,10 +94,10 @@ ex:EmployeeShape a sx:Shape ; [ a sx:TripleConstraint ; sx:predicate foaf:mbox ; sx:max 1 ; sx:min 0 ; sx:valueExpr [ a sx:NodeConstraint ; sx:nodeKind sx:iri ] ] - ) ] . + ) ] ] . -_:IDshape a sx:Shape ; - sx:expression _:IDshapeE . +_:IDshape a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:expression _:IDshapeE ] . _:IDshapeE a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( @@ -137,7 +137,7 @@ _:IDshapeE a sx:OneOf ; sx:expressions ( ) ] ) . -ex:FooID a sx:Shape ; sx:closed true ; +ex:FooID a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:closed true ; sx:extra ex:code, ex:system ; - sx:expression _:IDshapeE . + sx:expression _:IDshapeE ] . diff --git a/schemas/meta.ttl b/schemas/meta.ttl index 866c1c28..3c03c569 100644 --- a/schemas/meta.ttl +++ b/schemas/meta.ttl @@ -30,7 +30,7 @@ PREFIX sht: sht:sameAbstractSyntaxAs <2dotOr1dot.shex> . sht:sameAbstractSyntaxAs <2dotOr1dot.shex> . sht:sameAbstractSyntaxAs <2dotOr1dot.shex> . - sht:sameAbstractSyntaxAs . + a sx:ShapeDecl ; sx:shapeExpr [ sht:sameAbstractSyntaxAs ] . <1card2blank.shex> sht:sameAbstractSyntaxAs <1card2Star.shex> . <1val1DOUBLElowercase.shex> sht:sameAbstractSyntaxAs <1val1DOUBLE.shex> . <1dotRefSpaceLNex.shex> sht:sameAbstractSyntaxAs <1dotRefLNex.shex> . @@ -40,7 +40,7 @@ PREFIX sht: sht:sameAbstractSyntaxAs <1dotOr2dot.shex> . sht:sameAbstractSyntaxAs <1dotOr2dot.shex> . sht:sameAbstractSyntaxAs <1dotOr2dot.shex> . - sht:sameAbstractSyntaxAs . + a sx:ShapeDecl ; sx:shapeExpr [ sht:sameAbstractSyntaxAs ] . <3groupdot3Extra.shex> sht:sameAbstractSyntaxAs <3groupdotExtra3.shex> . <3groupdotExtra3NLex.shex> sht:sameAbstractSyntaxAs <3groupdotExtra3.shex> . sht:sameAbstractSyntaxAs . diff --git a/schemas/node_kind_example.ttl b/schemas/node_kind_example.ttl index ac0adb69..4dc263e1 100644 --- a/schemas/node_kind_example.ttl +++ b/schemas/node_kind_example.ttl @@ -4,9 +4,9 @@ PREFIX sx: [] a sx:Schema ; sx:shapes (ex:IssueShape) . -ex:IssueShape a sx:Shape ; +ex:IssueShape a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ex:state ; sx:valueExpr [ a sx:NodeConstraint ; - sx:nodeKind sx:iri ] ] . + sx:nodeKind sx:iri ] ] ] . diff --git a/schemas/open1dotAND1dotcloseAND1dot.ttl b/schemas/open1dotAND1dotcloseAND1dot.ttl index 7f65187c..4bd59f7e 100644 --- a/schemas/open1dotAND1dotcloseAND1dot.ttl +++ b/schemas/open1dotAND1dotcloseAND1dot.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:ShapeAnd ; sx:shapeExprs ( @@ -14,4 +14,4 @@ PREFIX xsd: ) ] [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ] ] ) -. +] . diff --git a/schemas/open1dotOne1dotclose.ttl b/schemas/open1dotOne1dotclose.ttl index fb83014b..7b6a8aac 100644 --- a/schemas/open1dotOne1dotclose.ttl +++ b/schemas/open1dotOne1dotclose.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open1dotOne2dotclose.ttl b/schemas/open1dotOne2dotclose.ttl index 49ede841..d425d519 100644 --- a/schemas/open1dotOne2dotclose.ttl +++ b/schemas/open1dotOne2dotclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/open1dotOneopen2dotcloseclose.ttl b/schemas/open1dotOneopen2dotcloseclose.ttl index 49ede841..d425d519 100644 --- a/schemas/open1dotOneopen2dotcloseclose.ttl +++ b/schemas/open1dotOneopen2dotcloseclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/open1dotSemiOne1dotSemicloseSemi.ttl b/schemas/open1dotSemiOne1dotSemicloseSemi.ttl index fb83014b..7b6a8aac 100644 --- a/schemas/open1dotSemiOne1dotSemicloseSemi.ttl +++ b/schemas/open1dotSemiOne1dotSemicloseSemi.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open1dotSemiOne2dotsemisclose.ttl b/schemas/open1dotSemiOne2dotsemisclose.ttl index 49ede841..d425d519 100644 --- a/schemas/open1dotSemiOne2dotsemisclose.ttl +++ b/schemas/open1dotSemiOne2dotsemisclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/open1dotSemiOneopen2dotSemiscloseclose.ttl b/schemas/open1dotSemiOneopen2dotSemiscloseclose.ttl index 49ede841..d425d519 100644 --- a/schemas/open1dotSemiOneopen2dotSemiscloseclose.ttl +++ b/schemas/open1dotSemiOneopen2dotSemiscloseclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/open1dotopen1dotOne1dotcloseclose.ttl b/schemas/open1dotopen1dotOne1dotcloseclose.ttl index d494f780..42d10daa 100644 --- a/schemas/open1dotopen1dotOne1dotcloseclose.ttl +++ b/schemas/open1dotopen1dotOne1dotcloseclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/open1dotopen1dotSemiOne1dotSemicloseSemicloseSemi.ttl b/schemas/open1dotopen1dotSemiOne1dotSemicloseSemicloseSemi.ttl index d494f780..42d10daa 100644 --- a/schemas/open1dotopen1dotSemiOne1dotSemicloseSemicloseSemi.ttl +++ b/schemas/open1dotopen1dotSemiOne1dotSemicloseSemicloseSemi.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] ) ] . + sx:predicate ] ) ] ) ] ] . diff --git a/schemas/open2Eachdotclosecard25c1dot.ttl b/schemas/open2Eachdotclosecard25c1dot.ttl index c44eb023..3a032e8a 100644 --- a/schemas/open2Eachdotclosecard25c1dot.ttl +++ b/schemas/open2Eachdotclosecard25c1dot.ttl @@ -4,7 +4,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( @@ -16,4 +16,4 @@ PREFIX xsd: sx:min 2 ; sx:max 5 ] [ a sx:TripleConstraint ; sx:predicate ] - ) ] . + ) ] ] . diff --git a/schemas/open2dotOne1dotclose.ttl b/schemas/open2dotOne1dotclose.ttl index d745b2ad..2b37e045 100644 --- a/schemas/open2dotOne1dotclose.ttl +++ b/schemas/open2dotOne1dotclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open2dotSemisOne1dotSemiclose.ttl b/schemas/open2dotSemisOne1dotSemiclose.ttl index d745b2ad..2b37e045 100644 --- a/schemas/open2dotSemisOne1dotSemiclose.ttl +++ b/schemas/open2dotSemisOne1dotSemiclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open2dotclose.ttl b/schemas/open2dotclose.ttl index 492a2fd0..aab3f6fb 100644 --- a/schemas/open2dotclose.ttl +++ b/schemas/open2dotclose.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open2dotsemisclose.ttl b/schemas/open2dotsemisclose.ttl index 492a2fd0..aab3f6fb 100644 --- a/schemas/open2dotsemisclose.ttl +++ b/schemas/open2dotsemisclose.ttl @@ -5,9 +5,9 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open3Eachdotclose.ttl b/schemas/open3Eachdotclose.ttl index bd0b1f9d..923f0931 100644 --- a/schemas/open3Eachdotclose.ttl +++ b/schemas/open3Eachdotclose.ttl @@ -5,10 +5,10 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open3EachdotcloseAnnot3.ttl b/schemas/open3EachdotcloseAnnot3.ttl index 451b39cb..3d4f6c7f 100644 --- a/schemas/open3EachdotcloseAnnot3.ttl +++ b/schemas/open3EachdotcloseAnnot3.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:annotation ([ a sx:Annotation ; sx:object "1" ; @@ -19,5 +19,5 @@ PREFIX xsd: sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/open3EachdotcloseCode1.ttl b/schemas/open3EachdotcloseCode1.ttl index b7b274e4..11b45ee0 100644 --- a/schemas/open3EachdotcloseCode1.ttl +++ b/schemas/open3EachdotcloseCode1.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; @@ -15,5 +15,5 @@ PREFIX xsd: a sx:SemAct; sx:code " print(\"group semAct\") "; sx:name - ]) ] . + ]) ] ] . diff --git a/schemas/open3Eachdotclosecard23.ttl b/schemas/open3Eachdotclosecard23.ttl index 195c4a31..88feee5b 100644 --- a/schemas/open3Eachdotclosecard23.ttl +++ b/schemas/open3Eachdotclosecard23.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ; sx:max 3 ; - sx:min 2 ] . + sx:min 2 ] ] . diff --git a/schemas/open3Eachdotclosecard23Annot3Code2.ttl b/schemas/open3Eachdotclosecard23Annot3Code2.ttl index 50fa4b89..8360a920 100644 --- a/schemas/open3Eachdotclosecard23Annot3Code2.ttl +++ b/schemas/open3Eachdotclosecard23Annot3Code2.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:annotation ([ a sx:Annotation ; sx:object "1" ; @@ -30,5 +30,5 @@ PREFIX xsd: a sx:SemAct; sx:code " print(\"group semAct 2\") "; sx:name - ])] . + ])] ] . diff --git a/schemas/open3Onedotclosecard2.ttl b/schemas/open3Onedotclosecard2.ttl index e33edb65..f6b21620 100644 --- a/schemas/open3Onedotclosecard2.ttl +++ b/schemas/open3Onedotclosecard2.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:min 2 ; sx:max 2 ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] - ) ] . + ) ] ] . diff --git a/schemas/open3Onedotclosecard23.ttl b/schemas/open3Onedotclosecard23.ttl index 9878d379..f43fd89a 100644 --- a/schemas/open3Onedotclosecard23.ttl +++ b/schemas/open3Onedotclosecard23.ttl @@ -5,12 +5,12 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ; sx:max 3 ; - sx:min 2 ] . + sx:min 2 ] ] . diff --git a/schemas/open4Onedotclosecard23.ttl b/schemas/open4Onedotclosecard23.ttl index 8df97ce7..ab80bd54 100644 --- a/schemas/open4Onedotclosecard23.ttl +++ b/schemas/open4Onedotclosecard23.ttl @@ -5,7 +5,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; @@ -13,5 +13,5 @@ PREFIX xsd: sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ; sx:max 3 ; - sx:min 2 ] . + sx:min 2 ] ] . diff --git a/schemas/openopen1dotOne1dotclose1dotclose.ttl b/schemas/openopen1dotOne1dotclose1dotclose.ttl index b6f70096..477fe18a 100644 --- a/schemas/openopen1dotOne1dotclose1dotclose.ttl +++ b/schemas/openopen1dotOne1dotclose1dotclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/openopen1dotSemiOne1dotSemiclose1dotSemicloseSemi.ttl b/schemas/openopen1dotSemiOne1dotSemiclose1dotSemicloseSemi.ttl index b6f70096..477fe18a 100644 --- a/schemas/openopen1dotSemiOne1dotSemiclose1dotSemicloseSemi.ttl +++ b/schemas/openopen1dotSemiOne1dotSemiclose1dotSemicloseSemi.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf ; sx:expressions ( [ a sx:OneOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/openopen2dotSemiscloseOne1dotSemiclose.ttl b/schemas/openopen2dotSemiscloseOne1dotSemiclose.ttl index d745b2ad..2b37e045 100644 --- a/schemas/openopen2dotSemiscloseOne1dotSemiclose.ttl +++ b/schemas/openopen2dotSemiscloseOne1dotSemiclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/openopen2dotcloseOne1dotclose.ttl b/schemas/openopen2dotcloseOne1dotclose.ttl index d745b2ad..2b37e045 100644 --- a/schemas/openopen2dotcloseOne1dotclose.ttl +++ b/schemas/openopen2dotcloseOne1dotclose.ttl @@ -5,11 +5,11 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:OneOf ; sx:expressions ( [ a sx:EachOf ; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ] [ a sx:TripleConstraint ; sx:predicate ] ) ] [ a sx:TripleConstraint ; - sx:predicate ] ) ] . + sx:predicate ] ) ] ] . diff --git a/schemas/recursion_example.ttl b/schemas/recursion_example.ttl index 995fff21..12829de9 100644 --- a/schemas/recursion_example.ttl +++ b/schemas/recursion_example.ttl @@ -1,15 +1,14 @@ -@prefix rdf: . -@prefix xsd: . +PREFIX sx: - a ; - [ - a ; - -1; - 0; - ; - - ] . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape; + sx:expression [ + a sx:TripleConstraint; + sx:max -1; + sx:min 0; + sx:predicate ; + sx:valueExpr + ] ] . [] - a ; - () . + a sx:Schema; + sx:shapes () . diff --git a/schemas/shapeExtern.ttl b/schemas/shapeExtern.ttl index f12f6710..d97bb5e7 100644 --- a/schemas/shapeExtern.ttl +++ b/schemas/shapeExtern.ttl @@ -5,5 +5,5 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes () . - a sx:ShapeExternal . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeExternal ] . diff --git a/schemas/shapeExternRef.ttl b/schemas/shapeExternRef.ttl index 46aa48bb..d8541d75 100644 --- a/schemas/shapeExternRef.ttl +++ b/schemas/shapeExternRef.ttl @@ -6,10 +6,10 @@ PREFIX xsd: sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . - a sx:ShapeExternal . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeExternal ] . diff --git a/schemas/start2RefS1-IstartS2.ttl b/schemas/start2RefS1-IstartS2.ttl index b5fd7562..e5d21d93 100644 --- a/schemas/start2RefS1-IstartS2.ttl +++ b/schemas/start2RefS1-IstartS2.ttl @@ -4,7 +4,8 @@ PREFIX sx: sx:imports ( ) ; sx:start ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/start2RefS1.ttl b/schemas/start2RefS1.ttl index b24bd900..626eed5f 100644 --- a/schemas/start2RefS1.ttl +++ b/schemas/start2RefS1.ttl @@ -1,8 +1,9 @@ PREFIX sx: [] a sx:Schema ; - sx:start ; + sx:start ; sx:shapes () . - a sx:Shape ; sx:expression [ - a sx:TripleConstraint ; sx:predicate ] . + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ + a sx:TripleConstraint ; sx:predicate ] ] . diff --git a/schemas/start2RefS2-IstartS1.ttl b/schemas/start2RefS2-IstartS1.ttl index b14295bd..07df7db4 100644 --- a/schemas/start2RefS2-IstartS1.ttl +++ b/schemas/start2RefS2-IstartS1.ttl @@ -4,7 +4,8 @@ PREFIX sx: sx:imports ( ) ; sx:start ; sx:shapes () . - a sx:Shape ; sx:expression [ + + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/startCode1.ttl b/schemas/startCode1.ttl index 100bb80e..df030054 100644 --- a/schemas/startCode1.ttl +++ b/schemas/startCode1.ttl @@ -10,7 +10,7 @@ PREFIX xsd: sx:name ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startCode1fail.ttl b/schemas/startCode1fail.ttl index 35f8c8a9..310385d9 100644 --- a/schemas/startCode1fail.ttl +++ b/schemas/startCode1fail.ttl @@ -10,7 +10,7 @@ PREFIX xsd: sx:name ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startCode1startRef.ttl b/schemas/startCode1startRef.ttl index 46609332..5b7a613a 100644 --- a/schemas/startCode1startRef.ttl +++ b/schemas/startCode1startRef.ttl @@ -11,7 +11,7 @@ PREFIX xsd: sx:name ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startCode1startReffail.ttl b/schemas/startCode1startReffail.ttl index 0795b313..67e1dfc2 100644 --- a/schemas/startCode1startReffail.ttl +++ b/schemas/startCode1startReffail.ttl @@ -11,7 +11,7 @@ PREFIX xsd: sx:name ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startCode3.ttl b/schemas/startCode3.ttl index c0363dc2..bb678eff 100644 --- a/schemas/startCode3.ttl +++ b/schemas/startCode3.ttl @@ -18,7 +18,7 @@ PREFIX xsd: sx:name ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startCode3fail.ttl b/schemas/startCode3fail.ttl index 58fdbef0..fea1df16 100644 --- a/schemas/startCode3fail.ttl +++ b/schemas/startCode3fail.ttl @@ -18,7 +18,7 @@ PREFIX xsd: ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startNoCode1.ttl b/schemas/startNoCode1.ttl index e1d835f0..a771e4f6 100644 --- a/schemas/startNoCode1.ttl +++ b/schemas/startNoCode1.ttl @@ -9,7 +9,7 @@ PREFIX xsd: sx:name ]) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; - sx:predicate ] . + sx:predicate ] ] . diff --git a/schemas/startRefIRIREF.ttl b/schemas/startRefIRIREF.ttl index 0f240f2f..f380bbb7 100644 --- a/schemas/startRefIRIREF.ttl +++ b/schemas/startRefIRIREF.ttl @@ -6,7 +6,7 @@ PREFIX xsd: sx:start ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . diff --git a/schemas/startRefbnode.ttl b/schemas/startRefbnode.ttl index f4f05141..51d5392b 100644 --- a/schemas/startRefbnode.ttl +++ b/schemas/startRefbnode.ttl @@ -7,6 +7,6 @@ PREFIX xsd: sx:shapes (_:S1) . -_:S1 a sx:Shape ; +_:S1 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression - [ a sx:TripleConstraint ; sx:predicate ] . + [ a sx:TripleConstraint ; sx:predicate ] ] . diff --git a/schemas/startSelfRefIRIREF.ttl b/schemas/startSelfRefIRIREF.ttl index 9b29d468..83457e02 100644 --- a/schemas/startSelfRefIRIREF.ttl +++ b/schemas/startSelfRefIRIREF.ttl @@ -6,8 +6,8 @@ PREFIX xsd: sx:start ; sx:shapes () . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ex:p1 ; sx:min 0 ; sx:max -1 ; - sx:valueExpr ] . + sx:valueExpr ] ] . diff --git a/schemas/startSelfRefbnode.ttl b/schemas/startSelfRefbnode.ttl index 0ac91cca..26848a4d 100644 --- a/schemas/startSelfRefbnode.ttl +++ b/schemas/startSelfRefbnode.ttl @@ -6,8 +6,8 @@ PREFIX sx: sx:start _:S1 ; sx:shapes (_:S1) . -_:S1 a sx:Shape ; +_:S1 a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ex:p1 ; sx:min 0 ; sx:max -1 ; - sx:valueExpr _:S1 ] . + sx:valueExpr _:S1 ] ] . diff --git a/schemas/vitals-RESTRICTS.ttl b/schemas/vitals-RESTRICTS.ttl index 97031675..af6d202c 100644 --- a/schemas/vitals-RESTRICTS.ttl +++ b/schemas/vitals-RESTRICTS.ttl @@ -4,7 +4,7 @@ PREFIX xsd: [] a sx:Schema ; sx:shapes ( ) . - a sx:Shape ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:EachOf; sx:expressions ( [ a sx:TripleConstraint ; sx:predicate ; @@ -28,7 +28,7 @@ sx:expression [ a sx:EachOf; sx:max -1 ] ) -] . +] ] . a sx:ShapeDecl ; sx:abstract true ; @@ -61,7 +61,7 @@ sx:expression [ a sx:EachOf; ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:extends () @@ -93,15 +93,15 @@ sx:expression [ a sx:EachOf; ) ] ] - ) . + ) ] . - a sx:Shape ; - sx:extends ( ) . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:extends ( ) ] . - a sx:Shape ; - sx:extends ( ) . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:extends ( ) ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; sx:extends () @@ -114,16 +114,15 @@ sx:expression [ a sx:EachOf; ] ] ] - ) . + ) ] . - a sx:Shape ; - sx:extends ( ) . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:extends ( ) ] . - a sx:Shape ; - sx:extends ( ) . + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; + sx:extends ( ) ] . -a sx:Shape ; -sx:expression [ a sx:TripleConstraint ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; sx:predicate ; sx:valueExpr [ a sx:Shape ; sx:expression [ a sx:TripleConstraint ; @@ -133,9 +132,9 @@ sx:expression [ a sx:TripleConstraint ; ] ] ] -] . +] ] . - a sx:ShapeAnd ; + a sx:ShapeDecl ; sx:shapeExpr [ a sx:ShapeAnd ; sx:shapeExprs ( [ a sx:Shape ; @@ -160,5 +159,5 @@ sx:expression [ a sx:TripleConstraint ; ] ] ] - ) . + ) ] .