Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding missing conditional tests to the RNG Grammar #84

Merged
merged 1 commit into from Feb 12, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 75 additions & 5 deletions etc/phing-grammar.rng
Expand Up @@ -901,6 +901,11 @@
<ref name="equals"/>
<ref name="or"/>
<ref name="and"/>
<ref name="isfalse"/>
<ref name="istrue"/>
<ref name="isset"/>
<ref name="contains_cond"/>
<ref name="referenceexists"/>
</choice>
<ref name="then"/>
<zeroOrMore>
Expand All @@ -912,10 +917,54 @@
</element>
</define>

<define name="istrue">
<element name="istrue">
<attribute name="value"/>
</element>
</define>

<define name="isset">
<element name="isset">
<attribute name="property"/>
</element>
</define>

<define name="isfalse">
<element name="isfalse">
<attribute name="value"/>
</element>
</define>

<define name="referenceexists">
<element name="referenceexists">
<attribute name="ref"/>
</element>
</define>

<define name="contains_cond">
<element name="contains">
<interleave>
<attribute name="string"/>
<attribute name="substring"/>
<optional>
<attribute name="casesensitive"/>
</optional>
</interleave>
</element>
</define>

<define name="equals">
<element name="equals">
<attribute name="arg1"/>
<attribute name="arg2"/>
<interleave>
<attribute name="arg1"/>
<attribute name="arg2"/>
<optional>
<attribute name="casesensitive"/>
</optional>
<optional>
<attribute name="trim"/>
</optional>
</interleave>
</element>
</define>

Expand All @@ -935,6 +984,11 @@
<ref name="equals"/>
<ref name="or"/>
<ref name="and"/>
<ref name="isfalse"/>
<ref name="istrue"/>
<ref name="isset"/>
<ref name="contains_cond"/>
<ref name="referenceexists"/>
</choice>
<interleave>
<ref name="coretasks"/>
Expand Down Expand Up @@ -967,15 +1021,31 @@
<define name="or">
<element name="or">
<oneOrMore>
<ref name="property"/>
<interleave>
<ref name="property"/>
<ref name="and"/>
<ref name="isfalse"/>
<ref name="istrue"/>
<ref name="isset"/>
<ref name="contains_cond"/>
<ref name="referenceexists"/>
</interleave>
</oneOrMore>
</element>
</define>

<define name="and">
<element name="and">
<oneOrMore>
<ref name="property"/>
<interleave>
<ref name="property"/>
<ref name="or"/>
<ref name="isfalse"/>
<ref name="istrue"/>
<ref name="isset"/>
<ref name="contains_cond"/>
<ref name="referenceexists"/>
</interleave>
</oneOrMore>
</element>
</define>
Expand Down Expand Up @@ -1501,7 +1571,7 @@
=========================================
ApiGenTask
=========================================
-->
-->

<define name="apigen">
<element name="apigen">
Expand Down