From 24103fdc3b597d6e5bd0bb1497d3f2e744cea6eb Mon Sep 17 00:00:00 2001 From: Eric Prud'hommeaux Date: Sun, 20 Sep 2015 19:22:54 -0400 Subject: [PATCH] ~ change semantic actions to a list --- parsedSchemas/1dotCode1.json | 4 +- parsedSchemas/1dotCode3.json | 9 ++-- parsedSchemas/1dotCodeWithEscapes1.json | 4 +- parsedSchemas/1dotShapeCode1.json | 4 +- parsedSchemas/1dotUnlabeledCode1.json | 4 +- parsedSchemas/1dotVirtualShapeCode1.json | 4 +- parsedSchemas/1inversedotCode1.json | 4 +- parsedSchemas/_all.json | 45 +++++++++---------- parsedSchemas/kitchenSink.json | 20 ++++----- parsedSchemas/open1dotcloseCode1.json | 4 +- parsedSchemas/open3groupdotcloseCode1.json | 6 +-- .../open3groupdotclosecard23Annot3Code2.json | 8 ++-- .../openopen1dotcloseCode1closeCode2.json | 15 +++---- parsedSchemas/startCode1.json | 2 +- parsedSchemas/startCode1startRef.json | 2 +- parsedSchemas/startCode3.json | 9 ++-- 16 files changed, 77 insertions(+), 67 deletions(-) diff --git a/parsedSchemas/1dotCode1.json b/parsedSchemas/1dotCode1.json index e626e072..1198587b 100644 --- a/parsedSchemas/1dotCode1.json +++ b/parsedSchemas/1dotCode1.json @@ -8,7 +8,9 @@ "type": "tripleConstraint", "predicate": "http://a.example/p1", "value": { "type": "valueClass" }, - "semAct": { "http://a.example/semAct1": " code1 " } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/1dotCode3.json b/parsedSchemas/1dotCode3.json index 12a1ae25..30ac56d1 100644 --- a/parsedSchemas/1dotCode3.json +++ b/parsedSchemas/1dotCode3.json @@ -8,10 +8,11 @@ "type": "tripleConstraint", "predicate": "http://a.example/p1", "value": { "type": "valueClass" }, - "semAct": { "http://a.example/semAct1": " code1 ", - "http://a.example/semAct2": " code2 ", - "http://a.example/semAct3": " code3 " - } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " }, + { "name": "http://a.example/semAct2", "contents": " code2 " }, + { "name": "http://a.example/semAct3", "contents": " code3 " } + ] } } } diff --git a/parsedSchemas/1dotCodeWithEscapes1.json b/parsedSchemas/1dotCodeWithEscapes1.json index 04a84afa..1b940969 100644 --- a/parsedSchemas/1dotCodeWithEscapes1.json +++ b/parsedSchemas/1dotCodeWithEscapes1.json @@ -8,7 +8,9 @@ "type": "tripleConstraint", "predicate": "http://a.example/p1", "value": { "type": "valueClass" }, - "semAct": { "http://a.example/semAct1": "%{\\%};" } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": "%{\\%};" } + ] } } } diff --git a/parsedSchemas/1dotShapeCode1.json b/parsedSchemas/1dotShapeCode1.json index 997496fb..cb5a4325 100644 --- a/parsedSchemas/1dotShapeCode1.json +++ b/parsedSchemas/1dotShapeCode1.json @@ -9,7 +9,9 @@ "predicate": "http://a.example/p1", "value": { "type": "valueClass" } }, - "semAct": { "http://a.example/semAct1": " code1 " } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/1dotUnlabeledCode1.json b/parsedSchemas/1dotUnlabeledCode1.json index abacd438..1cd8373c 100644 --- a/parsedSchemas/1dotUnlabeledCode1.json +++ b/parsedSchemas/1dotUnlabeledCode1.json @@ -8,7 +8,9 @@ "type": "tripleConstraint", "predicate": "http://a.example/p1", "value": { "type": "valueClass" }, - "semAct": { "": " code1 " } + "semActs": [ + { "name": "", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/1dotVirtualShapeCode1.json b/parsedSchemas/1dotVirtualShapeCode1.json index 00f4cf98..2b52feca 100644 --- a/parsedSchemas/1dotVirtualShapeCode1.json +++ b/parsedSchemas/1dotVirtualShapeCode1.json @@ -10,7 +10,9 @@ "predicate": "http://a.example/p1", "value": { "type": "valueClass" } }, - "semAct": { "http://a.example/semAct1": " code1 " } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/1inversedotCode1.json b/parsedSchemas/1inversedotCode1.json index 8cecfad4..d389103f 100644 --- a/parsedSchemas/1inversedotCode1.json +++ b/parsedSchemas/1inversedotCode1.json @@ -9,7 +9,9 @@ "inverse": true, "predicate": "http://a.example/p1", "value": { "type": "valueClass" }, - "semAct": { "http://a.example/semAct1": " code1 " } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/_all.json b/parsedSchemas/_all.json index 32ca6cb0..0e73823d 100644 --- a/parsedSchemas/_all.json +++ b/parsedSchemas/_all.json @@ -20,10 +20,10 @@ "xsd":"http://www.w3.org/2001/XMLSchema#", "":"http://all.example/" }, - "startAct":{ - "http://all.example/act1":" START1 ", - "http://all.example/act2":" START2 " - }, + "startActs": [ + { "name": "http://all.example/act1", "contents": " START1 "}, + { "name": "http://all.example/act2", "contents": " START2 "} + ], "start":"http://all.example/S3", "shapes":{ "http://all.example/S1":{ @@ -228,9 +228,9 @@ "type":"valueClass", "reference":"_:b0" }, - "min":2,"max":3,"semAct":{ - "http://all.example/act1":" code1 " - } + "min":2,"max":3,"semActs": [ + { "name": "http://all.example/act1", "contents": " code1 " } + ] }, { "type":"tripleConstraint", @@ -240,9 +240,9 @@ "nodeKind":"literal" }, "min":1,"max":"*", - "semAct":{ - "http://all.example/act1":" %{printf(\"品川\\n\");%} " - }, + "semActs": [ + { "name": "http://all.example/act1", "contents": " %{printf(\"品川\\n\");%} " } + ], "annotations":[ [ "http://a.example/annot1", @@ -268,9 +268,9 @@ "type":"valueClass" }, "min":1,"max":"*", - "semAct":{ - "http://all.example/act1":" code1 " - } + "semActs": [ + { "name": "http://all.example/act1", "contents": " code1 " } + ] }, { "type":"tripleConstraint", @@ -279,9 +279,9 @@ "type":"valueClass" }, "min":1,"max":"*", - "semAct":{ - "http://all.example/act1":" code1 " - } + "semActs": [ + { "name": "http://all.example/act1", "contents": " code1 " } + ] } ] } @@ -322,9 +322,6 @@ } }, { - "type":"wrapper", - "expression": - { "type":"tripleConstraint", "predicate":"http://all.example/pattern", "value":{ @@ -344,12 +341,10 @@ ] } ] - },"semAct":{ - "http://all.example/act1":" code1 " - } - },"semAct":{ - "http://all.example/act2":" code2 " - } + },"semActs": [ + { "name": "http://all.example/act1", "contents": " code1 " }, + { "name": "http://all.example/act2", "contents": " code2 " } + ] } ] }, diff --git a/parsedSchemas/kitchenSink.json b/parsedSchemas/kitchenSink.json index b3f0c57b..9e568122 100644 --- a/parsedSchemas/kitchenSink.json +++ b/parsedSchemas/kitchenSink.json @@ -9,9 +9,9 @@ "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "rdfs": "http://www.w3.org/2000/01/rdf-schem#" }, - "startAct": { - "http://ex.example/#foo": " initializer for ignored extension " - }, + "startActs": [ + { "name": "http://ex.example/#foo", "contents": " initializer for ignored extension " } + ], "start": "http://ex.example/IssueShape", "shapes": { "http://ex.example/IssueShape": { @@ -97,9 +97,9 @@ ], "min": 0, "max": 1, - "semAct": { - "http://ex.example/#foo": " asdfasdf " - } + "semActs": [ + { "name": "http://ex.example/#foo", "contents": " asdfasdf " } + ] }, { "type": "tripleConstraint", @@ -266,10 +266,10 @@ "type": "valueClass", "nodeKind": "bnode" }, - "semAct": { - "http://ex.example/#foo": " ignored ", - "http://ex.example/#bar": " also ignored " - } + "semActs": [ + { "name": "http://ex.example/#foo", "contents": " ignored "}, + { "name": "http://ex.example/#bar", "contents": " also ignored " } + ] } ] }, diff --git a/parsedSchemas/open1dotcloseCode1.json b/parsedSchemas/open1dotcloseCode1.json index e626e072..1198587b 100644 --- a/parsedSchemas/open1dotcloseCode1.json +++ b/parsedSchemas/open1dotcloseCode1.json @@ -8,7 +8,9 @@ "type": "tripleConstraint", "predicate": "http://a.example/p1", "value": { "type": "valueClass" }, - "semAct": { "http://a.example/semAct1": " code1 " } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/open3groupdotcloseCode1.json b/parsedSchemas/open3groupdotcloseCode1.json index cb219a6c..5080d0d3 100644 --- a/parsedSchemas/open3groupdotcloseCode1.json +++ b/parsedSchemas/open3groupdotcloseCode1.json @@ -29,9 +29,9 @@ } } ], - "semAct": { - "http://a.example/semAct1": " code1 " - } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " } + ] } } } diff --git a/parsedSchemas/open3groupdotclosecard23Annot3Code2.json b/parsedSchemas/open3groupdotclosecard23Annot3Code2.json index 4edbac23..4e0d99d4 100644 --- a/parsedSchemas/open3groupdotclosecard23Annot3Code2.json +++ b/parsedSchemas/open3groupdotclosecard23Annot3Code2.json @@ -29,10 +29,10 @@ [ "http://a.example/annot2", "\"2\"" ], [ "http://a.example/annot3", "\"3\"" ] ], - "semAct": { - "http://a.example/semAct1": " code1 ", - "http://a.example/semAct2": " code2 " - } + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " }, + { "name": "http://a.example/semAct2", "contents": " code2 " } + ] } } } diff --git a/parsedSchemas/openopen1dotcloseCode1closeCode2.json b/parsedSchemas/openopen1dotcloseCode1closeCode2.json index 349f7307..6058ab5d 100644 --- a/parsedSchemas/openopen1dotcloseCode1closeCode2.json +++ b/parsedSchemas/openopen1dotcloseCode1closeCode2.json @@ -5,14 +5,13 @@ "http://a.example/IssueShape": { "type": "shape", "expression": { - "type": "wrapper", - "expression": { - "type": "tripleConstraint", - "predicate": "http://a.example/p1", - "value": { "type": "valueClass" }, - "semAct": { "http://a.example/semAct1": " code1 " } - }, - "semAct": { "http://a.example/semAct2": " code2 " } + "type": "tripleConstraint", + "predicate": "http://a.example/p1", + "value": { "type": "valueClass" }, + "semActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 " }, + { "name": "http://a.example/semAct2", "contents": " code2 " } + ] } } } diff --git a/parsedSchemas/startCode1.json b/parsedSchemas/startCode1.json index 98a12687..f29ffb8f 100644 --- a/parsedSchemas/startCode1.json +++ b/parsedSchemas/startCode1.json @@ -1,7 +1,7 @@ { "type": "schema", "prefixes": {}, - "startAct": { "http://a.example/semAct1": " code1 " }, + "startActs": [ { "name": "http://a.example/semAct1", "contents": " code1 " } ], "shapes":{ "http://a.example/IssueShape": { "type": "shape", diff --git a/parsedSchemas/startCode1startRef.json b/parsedSchemas/startCode1startRef.json index 2fb6c982..d8b894fe 100644 --- a/parsedSchemas/startCode1startRef.json +++ b/parsedSchemas/startCode1startRef.json @@ -1,7 +1,7 @@ { "type": "schema", "prefixes": {}, - "startAct": { "http://a.example/semAct1": " code1 " }, + "startActs": [ { "name": "http://a.example/semAct1", "contents": " code1 " } ], "start": "http://a.example/IssueShape", "shapes":{ "http://a.example/IssueShape": { diff --git a/parsedSchemas/startCode3.json b/parsedSchemas/startCode3.json index 44caf6ce..080fc581 100644 --- a/parsedSchemas/startCode3.json +++ b/parsedSchemas/startCode3.json @@ -1,10 +1,11 @@ { "type": "schema", "prefixes": {}, - "startAct": { "http://a.example/semAct1": " code1 ", - "http://a.example/semAct2": " code2 ", - "http://a.example/semAct3": " code3 " - }, + "startActs": [ + { "name": "http://a.example/semAct1", "contents": " code1 "}, + { "name": "http://a.example/semAct2", "contents": " code2 "}, + { "name": "http://a.example/semAct3", "contents": " code3 "} + ], "shapes":{ "http://a.example/IssueShape": { "type": "shape",