Merge pull request #867 from fesch/bugfix

Bugfixes -> version 3.30-09 candidate

buildapp.xml

@@ -15,8 +15,8 @@
 	        name="Structorizer"
 	        displayname="Structorizer"
 	        identifier="lu.fisch.Structorizer"
-	        shortversion="3.30-08"
-	        version="3.30-08"
+	        shortversion="3.30-09"
+	        version="3.30-09"
 	        icon="icons/Structorizer.icns"
 	        mainclassname="Structorizer"
 	        copyright="Bob Fisch"

samples/export/Oberon/ComputeSum.Mod

@@ -1,23 +1,23 @@
-MODULE ComputeSum;
-(* Generated by Structorizer 3.30-08 *)
-IMPORT In,Out;
 (*
- * Computes the sum and average of the numbers read from a user-specified
- * text file (which might have been created via generateRandomNumberFile(4)).
- * 
- * This program is part of an arrangement used to test group code export (issue
- * #828) with FileAPI dependency.
- * The input check loop has been disabled (replaced by a simple unchecked input
- * instruction) in order to test the effect of indirect FileAPI dependency (only the
- * called subroutine directly requires FileAPI now).
+  Computes the sum and average of the numbers read from a user-specified
+  text file (which might have been created via generateRandomNumberFile(4)).
+  
+  This program is part of an arrangement used to test group code export (issue
+  #828) with FileAPI dependency.
+  The input check loop has been disabled (replaced by a simple unchecked input
+  instruction) in order to test the effect of indirect FileAPI dependency (only the
+  called subroutine directly requires FileAPI now).
  *)
+MODULE ComputeSum;
+(* Generated by Structorizer 3.30-09 *)
+IMPORT In,Out;
 
 (* Copyright (C) 2020-03-21 Kay Gürtzig *)
 (* License: GPLv3-link *)
 (*
- * GNU General Public License (V 3)
- * https://www.gnu.org/licenses/gpl.html
- * http://www.gnu.de/documents/gpl.de.html
+  GNU General Public License (V 3)
+  https://www.gnu.org/licenses/gpl.html
+  http://www.gnu.de/documents/gpl.de.html
  *)
 
 VAR
@@ -31,12 +31,12 @@ VAR
   fileNo: INTEGER;
   failure: Exception;
 
-PROCEDURE readNumbers(fileName: ARRAY 128 OF CHAR; VAR numbers: ARRAY 50 OF INTEGER; maxNumbers: INTEGER): INTEGER;
 (*
- * Tries to read as many integer values as possible upto maxNumbers
- * from file fileName into the given array numbers.
- * Returns the number of the actually read numbers. May cause an exception.
+  Tries to read as many integer values as possible upto maxNumbers
+  from file fileName into the given array numbers.
+  Returns the number of the actually read numbers. May cause an exception.
  *)
+PROCEDURE readNumbers(fileName: ARRAY 128 OF CHAR; VAR numbers: ARRAY 50 OF INTEGER; maxNumbers: INTEGER): INTEGER;
 VAR
   (* TODO: check and accomplish variable declarations *)
   number: INTEGER;
@@ -73,8 +73,8 @@ BEGIN
   (* TODO: Replace "TYPE" by the the actual In procedure name for this type! *)
   Out.String("Name/path of the number file"); In.TYPE(file_name);
   (*
-   * If you enable this loop, then the preceding input instruction is to be disabled
-   * and the fileClose instruction in the alternative below is to be enabled.
+    If you enable this loop, then the preceding input instruction is to be disabled
+    and the fileClose instruction in the alternative below is to be enabled.
    *)
 (*   REPEAT *)
     (* TODO: Replace "TYPE" by the the actual In procedure name for this type! *)

samples/export/Oberon/DrawRandomHistogram.Mod

@@ -1,17 +1,17 @@
-MODULE DrawRandomHistogram;
-(* Generated by Structorizer 3.30-08 *)
-IMPORT In,Out;
 (*
- * Reads a random number file and draws a histogram accotrding to the
- * user specifications
+  Reads a random number file and draws a histogram accotrding to the
+  user specifications
  *)
+MODULE DrawRandomHistogram;
+(* Generated by Structorizer 3.30-09 *)
+IMPORT In,Out;
 
 (* Copyright (C) 2020-03-21 Kay Gürtzig *)
 (* License: GPLv3-link *)
 (*
- * GNU General Public License (V 3)
- * https://www.gnu.org/licenses/gpl.html
- * http://www.gnu.de/documents/gpl.de.html
+  GNU General Public License (V 3)
+  https://www.gnu.org/licenses/gpl.html
+  http://www.gnu.de/documents/gpl.de.html
  *)
 
 VAR
@@ -32,13 +32,13 @@ VAR
   count: ARRAY 50 OF INTEGER;
   failure: Exception;
 
-PROCEDURE drawBarChart(values: ARRAY 50 OF LONGREAL; nValues: ???);
 (*
- * Draws a bar chart from the array "values" of size nValues.
- * Turtleizer must be activated and will scale the chart into a square of
- * 500 x 500 pixels
- * Note: The function is not robust against empty array or totally equal values.
+  Draws a bar chart from the array "values" of size nValues.
+  Turtleizer must be activated and will scale the chart into a square of
+  500 x 500 pixels
+  Note: The function is not robust against empty array or totally equal values.
  *)
+PROCEDURE drawBarChart(values: ARRAY 50 OF LONGREAL; nValues: ???);
 CONST
   (* Used range of the Turtleizer screen *)
   xSize = 500;
@@ -120,12 +120,12 @@ BEGIN
   END;
 END drawBarChart;
 
-PROCEDURE readNumbers(fileName: ARRAY 128 OF CHAR; VAR numbers: ARRAY 50 OF INTEGER; maxNumbers: INTEGER): INTEGER;
 (*
- * Tries to read as many integer values as possible upto maxNumbers
- * from file fileName into the given array numbers.
- * Returns the number of the actually read numbers. May cause an exception.
+  Tries to read as many integer values as possible upto maxNumbers
+  from file fileName into the given array numbers.
+  Returns the number of the actually read numbers. May cause an exception.
  *)
+PROCEDURE readNumbers(fileName: ARRAY 128 OF CHAR; VAR numbers: ARRAY 50 OF INTEGER; maxNumbers: INTEGER): INTEGER;
 VAR
   (* TODO: check and accomplish variable declarations *)
   number: INTEGER;