Enable runnable (WASM) examples for language.control-structures section

language/control-structures.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<chapter xml:id="language.control-structures" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+<chapter xml:id="language.control-structures" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
  <title>Control Structures</title>
 
  <sect1 xml:id="control-structures.intro">

language/control-structures/alternative-syntax.xml

@@ -17,7 +17,9 @@
   <informalexample>
    <programlisting role="php">
 <![CDATA[
-<?php if ($a == 5): ?>
+<?php
+$a = 5;
+if ($a == 5): ?>
 A is equal to 5
 <?php endif; ?>
 ]]>
@@ -38,6 +40,7 @@ A is equal to 5
    <programlisting role="php">
 <![CDATA[
 <?php
+$a = 5;
 if ($a == 5):
     echo "a equals 5";
     echo "...";
@@ -47,7 +50,6 @@ elseif ($a == 6):
 else:
     echo "a is neither 5 nor 6";
 endif;
-?>
 ]]>
    </programlisting>
   </informalexample>
@@ -66,9 +68,11 @@ endif;
   <informalexample>
    <programlisting role="php">
 <![CDATA[
-<?php switch ($foo): ?>
+<?php
+$foo = 1;
+switch ($foo): ?>
     <?php case 1: ?>
-    // ...
+    Foo is 1
 <?php endswitch; ?>
 ]]>
    </programlisting>
@@ -82,9 +86,11 @@ endif;
   <informalexample>
    <programlisting role="php">
 <![CDATA[
-<?php switch ($foo): ?>
+<?php
+$foo = 1;
+switch ($foo): ?>
 <?php case 1: ?>
-    ...
+    Foo is 1
 <?php endswitch; ?>
 ]]>
    </programlisting>

language/control-structures/break.xml

@@ -26,25 +26,24 @@ foreach ($arr as $val) {
     if ($val == 'stop') {
         break;    /* You could also write 'break 1;' here. */
     }
-    echo "$val<br />\n";
+    echo "$val\n";
 }
 
-/* Using the optional argument. */
-
+echo "\nUsing the optional argument:\n";
 $i = 0;
 while (++$i) {
     switch ($i) {
         case 5:
-            echo "At 5<br />\n";
+            echo "At 5\n";
             break 1;  /* Exit only the switch. */
         case 10:
-            echo "At 10; quitting<br />\n";
+            echo "At 10; quitting\n";
             break 2;  /* Exit the switch and the while. */
         default:
             break;
     }
+    echo "$i\n";
 }
-?>
 ]]>
    </programlisting>
   </informalexample>

language/control-structures/continue.xml

@@ -40,7 +40,6 @@ foreach ($arr as $key => $value) {
     }
     echo $value . "\n";
 }
-?>
 ]]>
    </programlisting>
    &examples.outputs;
@@ -67,7 +66,6 @@ while ($i++ < 5) {
     }
     echo "Neither does this.\n";
 }
-?>
 ]]>
    </programlisting>
    &examples.outputs;
@@ -103,10 +101,9 @@ Inner
 <?php
 for ($i = 0; $i < 5; ++$i) {
     if ($i == 2)
-        continue
+        continue;
     print "$i\n";
 }
-?>
 ]]>
    </programlisting>
    <para>

language/control-structures/declare.xml

@@ -36,7 +36,7 @@ declare (directive)
   be given as directive values. Variables and constants cannot be used. To
   illustrate:
   <informalexample>
-   <programlisting role="php">
+   <programlisting role="php" annotations="non-interactive">
 <![CDATA[
 <?php
 // This is valid:
@@ -45,7 +45,6 @@ declare(ticks=1);
 // This is invalid:
 const TICK_VALUE = 1;
 declare(ticks=TICK_VALUE);
-?>
 ]]>
    </programlisting>
   </informalexample>
@@ -63,7 +62,7 @@ declare(ticks=TICK_VALUE);
   <literal>declare</literal> was included then it does not affect the parent
   file).
   <informalexample>
-   <programlisting role="php">
+   <programlisting role="php" annotations="non-interactive">
 <![CDATA[
 <?php
 // these are the same:
@@ -76,7 +75,6 @@ declare(ticks=1) {
 // or you can use this:
 declare(ticks=1);
 // entire script here
-?>
 ]]>
    </programlisting>
   </informalexample>
@@ -123,10 +121,8 @@ $a = 1; // causes a tick event
 
 if ($a > 0) {
     $a += 2; // causes a tick event
-    print $a; // causes a tick event
+    print $a . "\n"; // causes a tick event
 }
-
-?>
 ]]>
    </programlisting>
   </example>
@@ -142,12 +138,11 @@ if ($a > 0) {
     A script's encoding can be specified per-script using the <literal>encoding</literal> directive.
   <example>
    <title>Declaring an encoding for the script</title>
-    <programlisting role="php">
+    <programlisting role="php" annotations="non-interactive">
 <![CDATA[
 <?php
 declare(encoding='ISO-8859-1');
 // code here
-?>
 ]]>
     </programlisting>
    </example>

language/control-structures/do-while.xml

@@ -28,7 +28,6 @@ $i = 0;
 do {
     echo $i;
 } while ($i > 0);
-?>
 ]]>
    </programlisting>
   </informalexample>
@@ -50,21 +49,24 @@ do {
    <programlisting role="php">
 <![CDATA[
 <?php
+$i = 50;
+$factor = 0.5;
+$minimum_limit = 20;
 do {
     if ($i < 5) {
-        echo "i is not big enough";
+        echo "i is not big enough\n";
         break;
     }
     $i *= $factor;
     if ($i < $minimum_limit) {
+        echo "i is less than minimum limit after factor\n";
         break;
     }
-    echo "i is ok";
+    echo $i ." is ok\n";
 
     /* process i */
 
 } while (0);
-?>
 ]]>
    </programlisting>
   </informalexample>

language/control-structures/else.xml

@@ -19,12 +19,13 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+$a = 3;
+$b = 5;
 if ($a > $b) {
-  echo "a is greater than b";
+  echo "a is greater than b\n";
 } else {
-  echo "a is NOT greater than b";
+  echo "a is NOT greater than b\n";
 }
-?>
 ]]>
    </programlisting>
   </informalexample>
@@ -53,7 +54,6 @@ if ($a)
         echo "b";
 else
     echo "c";
-?>
 ]]>
     </programlisting>
    </informalexample>

language/control-structures/elseif.xml

@@ -21,14 +21,15 @@
    <programlisting role="php">
 <![CDATA[
 <?php
+$a = 1;
+$b = 1;
 if ($a > $b) {
     echo "a is bigger than b";
 } elseif ($a == $b) {
     echo "a is equal to b";
 } else {
     echo "a is smaller than b";
 }
-?>
 ]]>
    </programlisting>
   </informalexample>
@@ -67,6 +68,8 @@ if ($a > $b) {
    <programlisting role="php">
 <![CDATA[
 <?php
+$a = 3;
+$b = 1;
 
 /* Incorrect Method: */
 if ($a > $b):
@@ -82,6 +85,9 @@ endif;
    <programlisting role="php">
 <![CDATA[
 <?php
+$a = 3;
+$b = 1;
+
 /* Correct Method: */
 if ($a > $b):
     echo $a." is greater than ".$b;
@@ -90,8 +96,6 @@ elseif ($a == $b): // Note the combination of the words.
 else:
     echo $a." is neither greater than or equal to ".$b;
 endif;
-
-?>
 ]]>
    </programlisting>
   </informalexample>

language/control-structures/for.xml

@@ -54,36 +54,31 @@ for (expr1; expr2; expr3)
    <programlisting role="php">
 <![CDATA[
 <?php
-/* example 1 */
-
+echo "Example 1:\n";
 for ($i = 1; $i <= 10; $i++) {
-    echo $i;
+    echo $i . " ";
 }
 
-/* example 2 */
-
+echo "\nExample 2:\n";
 for ($i = 1; ; $i++) {
     if ($i > 10) {
         break;
     }
-    echo $i;
+    echo $i . " ";
 }
 
-/* example 3 */
-
+echo "\nExample 3:\n";
 $i = 1;
 for (; ; ) {
     if ($i > 10) {
         break;
     }
-    echo $i;
+    echo $i . " ";
     $i++;
 }
 
-/* example 4 */
-
-for ($i = 1, $j = 0; $i <= 10; $j += $i, print $i, $i++);
-?>
+echo "\nExample 4:\n";
+for ($i = 1, $j = 0; $i <= 10; $j += $i, print $i . " ", $i++);
 ]]>
    </programlisting>
   </informalexample>
@@ -127,9 +122,9 @@ $people = array(
 );
 
 for($i = 0; $i < count($people); ++$i) {
-    $people[$i]['salt'] = mt_rand(000000, 999999);
+    $people[$i]['salt'] = random_int(100000, 999999);
 }
-?>
+var_dump($people);
 ]]>
    </programlisting>
   </informalexample>
@@ -151,9 +146,9 @@ $people = array(
 );
 
 for($i = 0, $size = count($people); $i < $size; ++$i) {
-    $people[$i]['salt'] = mt_rand(000000, 999999);
+    $people[$i]['salt'] = random_int(100000, 999999);
 }
-?>
+var_dump($people);
 ]]>
    </programlisting>
   </informalexample>