From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 9 Feb 2020 17:56:28 +0000 (+0000)
Subject: work on vizml schema
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9fa3be93146c8ee43b8aa90173c4b7608da55ee;p=pspp

work on vizml schema
---

diff --git a/src/output/spv/vizml.grammar b/src/output/spv/vizml.grammar
index 7457776f3f..02733c2f0f 100644
--- a/src/output/spv/vizml.grammar
+++ b/src/output/spv/vizml.grammar
@@ -134,7 +134,7 @@ statisticSort
 
 sourceVariable
    :categorical=bool?
-   :source=ref (userSource | delimitedFileSource | embeddedSource)
+   :source=ref (userSource | delimitedFileSource | embeddedSource)?
    :domain=ref categoricalDomain?
    :sourceName
    :dependsOn=ref sourceVariable?
@@ -156,7 +156,7 @@ derivedVariable
    :creator?
    :key=bool?
    :label?
-   :source=ref (userSource | delimitedFileSource | embeddedSource)
+   :source=ref (userSource | delimitedFileSource | embeddedSource)?
    :weight=bool?
    :domain=ref categoricalDomain?
 => variable_extension* (format | stringFormat)? valueMapEntry*
@@ -176,7 +176,7 @@ expressionVariable
    :expression?
    :shortLabel?
    :label?
-   :source?
+   :source=ref (userSource | delimitedFileSource | embeddedSource)?
 => EMPTY
 
 valueMapEntry :from :to => EMPTY
@@ -208,14 +208,14 @@ coordinates
     | rectangularTransform | obliqueTransform)*
 
 dimension
-   :domain?
+   :domain=ref (sourceVariable | derivedVariable | expressionVariable | categoricalDomain | intervalDomain)?
    :lowerMargin?
    :upperMargin?
    :niceLowerMapping=bool?
    :niceUpperMapping=bool?
    :unionDomain=bool?
    :clusterGap?
-   :clusterVariable?
+   :clusterVariable=ref (sourceVariable | derivedVariable | expressionVariable)?
    :facetsShareScale=bool?
 => scale? axis*
 
@@ -518,7 +518,7 @@ position[position_element]
    :variable=ref expressionVariable
 => EMPTY
 
-schema
+schema // aka boxplot
    :dot=bool?
    :extremeStyle?
    :fenceStyle=ref style?