Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
MAS
SDT
Commits
0d914d56
Commit
0d914d56
authored
Apr 30, 2019
by
ankraft
Browse files
Added ‘default’ attribute to Arg. Added test.
parent
45b8cb0d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
1 deletion
+29
-1
SDT/schema4.0/etc/domain.rnc
SDT/schema4.0/etc/domain.rnc
+2
-0
SDT/schema4.0/src/domain.rng
SDT/schema4.0/src/domain.rng
+10
-0
SDT/schema4.0/src/domain.xsd
SDT/schema4.0/src/domain.xsd
+2
-0
SDT/schema4.0/test/arg-test.xml
SDT/schema4.0/test/arg-test.xml
+15
-1
No files found.
SDT/schema4.0/etc/domain.rnc
View file @
0d914d56
...
@@ -139,6 +139,7 @@ ArgDef =
...
@@ -139,6 +139,7 @@ ArgDef =
element Arg {
element Arg {
attribute name { xsd:Name },
attribute name { xsd:Name },
attribute optional { xsd:boolean }?,
attribute optional { xsd:boolean }?,
attribute default { text }?,
attribute semanticURI { xsd:anyURI }?,
attribute semanticURI { xsd:anyURI }?,
DocDef,
DocDef,
DataTypeDef
DataTypeDef
...
@@ -152,6 +153,7 @@ Data =
...
@@ -152,6 +153,7 @@ Data =
attribute writable { xsd:boolean }?,
attribute writable { xsd:boolean }?,
attribute readable { xsd:boolean }?,
attribute readable { xsd:boolean }?,
attribute eventable { xsd:boolean }?,
attribute eventable { xsd:boolean }?,
attribute default { text }?,
attribute semanticURI { xsd:anyURI }?,
attribute semanticURI { xsd:anyURI }?,
DocDef,
DocDef,
DataTypeDef
DataTypeDef
...
...
SDT/schema4.0/src/domain.rng
View file @
0d914d56
...
@@ -391,6 +391,11 @@
...
@@ -391,6 +391,11 @@
<data type="boolean"/>
<data type="boolean"/>
</attribute>
</attribute>
</optional>
</optional>
<optional>
<attribute name="default">
<text />
</attribute>
</optional>
<optional>
<optional>
<attribute name="semanticURI">
<attribute name="semanticURI">
<data type="anyURI"/>
<data type="anyURI"/>
...
@@ -431,6 +436,11 @@
...
@@ -431,6 +436,11 @@
<data type="boolean"/>
<data type="boolean"/>
</attribute>
</attribute>
</optional>
</optional>
<optional>
<attribute name="default">
<text />
</attribute>
</optional>
<optional>
<optional>
<attribute name="semanticURI">
<attribute name="semanticURI">
<data type="anyURI"/>
<data type="anyURI"/>
...
...
SDT/schema4.0/src/domain.xsd
View file @
0d914d56
...
@@ -313,6 +313,7 @@
...
@@ -313,6 +313,7 @@
</xs:sequence>
</xs:sequence>
<xs:attribute
name=
"name"
use=
"required"
type=
"xs:Name"
/>
<xs:attribute
name=
"name"
use=
"required"
type=
"xs:Name"
/>
<xs:attribute
name=
"optional"
type=
"xs:boolean"
/>
<xs:attribute
name=
"optional"
type=
"xs:boolean"
/>
<xs:attribute
name=
"default"
/>
<xs:attribute
name=
"semanticURI"
type=
"xs:anyURI"
/>
<xs:attribute
name=
"semanticURI"
type=
"xs:anyURI"
/>
</xs:extension>
</xs:extension>
</xs:complexContent>
</xs:complexContent>
...
@@ -337,6 +338,7 @@
...
@@ -337,6 +338,7 @@
<xs:attribute
name=
"writable"
type=
"xs:boolean"
/>
<xs:attribute
name=
"writable"
type=
"xs:boolean"
/>
<xs:attribute
name=
"readable"
type=
"xs:boolean"
/>
<xs:attribute
name=
"readable"
type=
"xs:boolean"
/>
<xs:attribute
name=
"eventable"
type=
"xs:boolean"
/>
<xs:attribute
name=
"eventable"
type=
"xs:boolean"
/>
<xs:attribute
name=
"default"
/>
<xs:attribute
name=
"semanticURI"
type=
"xs:anyURI"
/>
<xs:attribute
name=
"semanticURI"
type=
"xs:anyURI"
/>
</xs:extension>
</xs:extension>
</xs:complexContent>
</xs:complexContent>
...
...
SDT/schema4.0/test/arg-test.xml
View file @
0d914d56
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<ModuleClasses>
<ModuleClasses>
<ModuleClass
name=
"TestArg"
>
<ModuleClass
name=
"TestArg"
>
<Actions>
<Actions>
<Action
name=
"testAction"
>
<Action
name=
"testAction
Optional
"
>
<Args>
<Args>
<Arg
name=
"argMandatory"
>
<Arg
name=
"argMandatory"
>
<DataType>
<DataType>
...
@@ -20,6 +20,20 @@
...
@@ -20,6 +20,20 @@
</Arg>
</Arg>
</Args>
</Args>
</Action>
</Action>
<Action
name=
"testActionDefault"
>
<Args>
<Arg
name=
"arg1"
default=
"true"
>
<DataType>
<SimpleType
type=
"boolean"
/>
</DataType>
</Arg>
<Arg
name=
"arg2"
default=
"foo"
>
<DataType>
<SimpleType
type=
"string"
/>
</DataType>
</Arg>
</Args>
</Action>
</Actions>
</Actions>
</ModuleClass>
</ModuleClass>
</ModuleClasses>
</ModuleClasses>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment