Extend expressions section, based on patch by Phil Housley

2008-05-12  Juerg Billeter  <j@bitron.ch>

	* doc/vala/expressions.xml:

	Extend expressions section, based on patch by Phil Housley

svn path=/trunk/; revision=1377

diff --git a/ChangeLog b/ChangeLog
index 5b460f5..8504a9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-12  Jürg Billeter  <j@bitron.ch>
+
+       * doc/vala/expressions.xml:
+
+       Extend expressions section, based on patch by Phil Housley
+
 2008-05-12  Marc-André Lureau  <marcandre.lureau@gmail.com>
 
        * vapi/glib-2.0.vapi: add some debug and logging function

diff --git a/doc/vala/expressions.xml b/doc/vala/expressions.xml
index e2a66ea..aaf7725 100644 (file)
--- a/doc/vala/expressions.xml
+++ b/doc/vala/expressions.xml
@@ -1,21 +1,108 @@
 <?xml version="1.0"?>
 <section id="expressions">
        <h>Expressions</h>
+       <section id="primary">
+               <h>Primary expressions</h>
+               <blockquote>
+primary-expression:
+       literal
+       simple-name
+       <l>(</l> expression <l>)</l>
+       member-access
+       invocation-expression
+       element-access
+       <l>this</l>
+       <l>base</l>
+       object-creation-expression
+       array-creation-expression
+       <l>sizeof (</l> type <l>)</l>
+       <l>typeof (</l> type <l>)</l>
+               </blockquote>
+       </section>
+       <section id="unary">
+               <h>Unary expressions</h>
+               <blockquote>
+unary-expression:
+       primary-expression
+       <l>+</l> unary-expression
+       <l>-</l> unary-expression
+       <l>!</l> unary-expression
+       <l>~</l> unary-expression
+       cast-expression
+               </blockquote>
+       </section>
        <section id="arithmetic">
                <h>Arithmetic operations</h>
-               <p>Documentation</p>
+               <blockquote>
+multiplicative-expression:
+       unary-expression
+       multiplicative-expression <l>*</l> unary-expression
+       multiplicative-expression <l>/</l> unary-expression
+       multiplicative-expression <l>%</l> unary-expression
+
+additive-expression:
+       multiplicative-expression
+       additive-expression <l>+</l> multiplicative-expression
+       additive-expression <l>-</l> multiplicative-expression
+               </blockquote>
+       </section>
+       <section id="shift">
+               <h>Shift operations</h>
+               <blockquote>
+shift-expression:
+       additive-expression
+       shift-expression <l>&lt;&lt;</l> additive-expression
+       shift-expression <l>&gt;&gt;</l> additive-expression
+               </blockquote>
        </section>
        <section id="relational">
                <h>Relational operations</h>
-               <p>Documentation</p>
+               <blockquote>
+relational-expression:
+       shift-expression
+       relational-expression <l>&lt;</l> shift-expression
+       relational-expression <l>&lt;=</l> shift-expression
+       relational-expression <l>&gt;</l> shift-expression
+       relational-expression <l>&gt;=</l> shift-expression
+
+equality-expression:
+       relational-expression
+       equality-expression <l>==</l> relational-expression
+       equality-expression <l>!=</l> relational-expression
+               </blockquote>
        </section>
        <section id="logical">
                <h>Logical operations</h>
-               <p>Documentation</p>
+               <blockquote>
+and-expression:
+       equality-expression
+       and-expression <l>&amp;</l> equality-expression
+
+exclusive-or-expression:
+       and-expression
+       exclusive-or-expression <l>^</l> and-expression
+
+inclusive-or-expression:
+       exclusive-or-expression
+       inclusive-or-expression <l>|</l> exclusive-or-expression
+               </blockquote>
        </section>
        <section id="assignments">
                <h>Assignments</h>
-               <p>Documentation</p>
+               <blockquote>
+assigment:
+       unary-expression <l>=</l> expression
+       unary-expression <l>+=</l> expression
+       unary-expression <l>-=</l> expression
+       unary-expression <l>*=</l> expression
+       unary-expression <l>/=</l> expression
+       unary-expression <l>%=</l> expression
+       unary-expression <l>&amp;=</l> expression
+       unary-expression <l>|=</l> expression
+       unary-expression <l>^=</l> expression
+       unary-expression <l>&lt;&lt;=</l> expression
+       unary-expression <l>&gt;&gt;=</l> expression
+               </blockquote>
        </section>
 </section>