Merge pull request #996 from fesch/bugfix

Version 3.32-01 candidate

Arranger.bat

@@ -14,6 +14,7 @@
 ::      Kay Gürtzig                   2018-06-12    Drive and path variables inserted
 ::      Kay Gürtzig                   2018-11-27    Precaution against installation path with blanks
 ::      Kay Gürtzig                   2021-06-13    Issue #944: Java version check (against 11) inserted
+::      Kay Gürtzig                   2021-10-04    Bugfix #988: Syntax error in nested "if" statement mended
 ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
@@ -26,7 +27,7 @@ set JAVAVER=%JAVAVER:"=_%
 for /f "tokens=2 delims=_" %%a in ("%JAVAVER%") do set JAVAVER=%%a
 for /f "tokens=1,2 delims=." %%a in ("%JAVAVER%") do (
 	set VERSION=%%a
-	if %VERSION% equ 1 set VERSION=%%b
+	if %%VERSION%% equ 1 set VERSION=%%b
 )
 if %VERSION% lss %REQVERSION% (
 	echo on

Structorizer.1

@@ -1,4 +1,4 @@
-.TH Structorizer 1 "7 August 2019" "version 3.29-13" "User's Manual"
+.TH Structorizer 1 "7 October 2021" "version 3.32-01" "User's Manual"
 .SH NAME
 Structorizer \- Editor for Nassi-Shneiderman diagrams (NSD)
 and tool for algorithm design and analysis based on them.
@@ -35,7 +35,7 @@ some syntactic rules, the diagrams may even be executed, debugged, and analysed
 (see the home page for a full description of the features and the user interface).
 \fBStructorizer\fP can also export the algorithms as program stubs to different
 programming languages, and it may import source code of some programming languages
-and display the algorithmic conetnt as Nassi-Shneiderman diagram.
+and display the algorithmic content as Nassi-Shneiderman diagram.
 .br
 Used as a command-line tool, \fBStructorizer\fP either converts saved NSD files
 (or ARR or ARRZ files, respecively) to program source in one of several available
@@ -123,6 +123,14 @@ Accepted names (case-insensitive) of parsers are:
 .B COBOL
 .br
 .B COBOLParser
+.br
+.B Java-SE8
+.br
+.B JavaParser
+.br
+.B Processing
+.br
+.B ProcessingParser
 .RE
 .TP
 .BI \-s " setting\-file"
@@ -168,8 +176,6 @@ Accepted names (case-insensitive) of generators are:
 .br
 .B Basic
 .br
-.B COBOL
-.br
 .B KSH
 .br
 .B BASH

Structorizer.bat

@@ -14,6 +14,7 @@
 ::      Kay Gürtzig                   2017-07-04    Drive variable added to path
 ::      Kay Gürtzig                   2018-11-27    Precaution against installation path with blanks
 ::      Kay Gürtzig                   2021-06-13    Issue #944: Java version check (against 11) inserted
+::      Kay Gürtzig                   2021-09-23    Bugfix #988: Syntax error in nested "if" statement mended
 ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
@@ -26,7 +27,7 @@ set JAVAVER=%JAVAVER:"=_%
 for /f "tokens=2 delims=_" %%a in ("%JAVAVER%") do set JAVAVER=%%a
 for /f "tokens=1,2 delims=." %%a in ("%JAVAVER%") do (
 	set VERSION=%%a
-	if %VERSION% equ 1 set VERSION=%%b
+	if %%VERSION%% equ 1 set VERSION=%%b
 )
 if %VERSION% lss %REQVERSION% (
 	echo on

buildapp.xml

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

samples/export/BASIC0/ComputeSum.bas

@@ -6,7 +6,7 @@
 60 REM The input check loop has been disabled (replaced by a simple unchecked input 
 70 REM instruction) in order to test the effect of indirect FileAPI dependency (only the 
 80 REM called subroutine directly requires FileAPI now). 
-90 REM Generated by Structorizer 3.30-11 
+90 REM Generated by Structorizer 3.32-01 
 100 
 110 REM Copyright (C) 2020-03-21 Kay Gürtzig 
 120 REM License: GPLv3-link 
@@ -53,7 +53,7 @@
 530 REM from file fileName into the given array numbers. 
 540 REM Returns the number of the actually read numbers. May cause an exception. 
 550 REM TODO: Add type-specific suffixes where necessary! 
-560 FUNCTION readNumbers(fileName AS String, numbers AS array of integer, maxNumbers AS integer) AS integer
+560 FUNCTION readNumbers(fileName AS String, numbers AS integer(50), maxNumbers AS integer) AS integer
 570   REM TODO: add the respective type suffixes to your variable names if required 
 580   LET nNumbers = 0
 590   LET fileNo = fileOpen(fileName)

samples/export/BASIC0/DrawRandomHistogram.bas

@@ -1,6 +1,6 @@
 10 REM Reads a random number file and draws a histogram accotrding to the 
 20 REM user specifications 
-30 REM Generated by Structorizer 3.30-11 
+30 REM Generated by Structorizer 3.32-01 
 40 
 50 REM Copyright (C) 2020-03-21 Kay Gürtzig 
 60 REM License: GPLv3-link 
@@ -76,7 +76,7 @@
 760 REM 500 x 500 pixels 
 770 REM Note: The function is not robust against empty array or totally equal values. 
 780 REM TODO: Add type-specific suffixes where necessary! 
-790 SUB drawBarChart(values AS array of double, nValues)
+790 SUB drawBarChart(values AS double(50), nValues)
 800   REM TODO: add the respective type suffixes to your variable names if required 
 810   REM Used range of the Turtleizer screen 
 820   LET xSize = 500
@@ -143,7 +143,7 @@
 1430 REM from file fileName into the given array numbers. 
 1440 REM Returns the number of the actually read numbers. May cause an exception. 
 1450 REM TODO: Add type-specific suffixes where necessary! 
-1460 FUNCTION readNumbers(fileName AS String, numbers AS array of integer, maxNumbers AS integer) AS integer
+1460 FUNCTION readNumbers(fileName AS String, numbers AS integer(50), maxNumbers AS integer) AS integer
 1470   REM TODO: add the respective type suffixes to your variable names if required 
 1480   LET nNumbers = 0
 1490   LET fileNo = fileOpen(fileName)