Merge pull request #998 from fesch/issue967

Version 3.32-02 candidate

.gitignore

@@ -1 +1,2 @@
 /bin
+/dist/

LIC-NOTE-libraries

@@ -23,9 +23,6 @@ http://www.beanshell.org/license.html
 Copyright 2016 jjYBdx4IL (https://github.com/jjYBdx4IL)
 http://www.apache.org/licenses/LICENSE-2.0
 
-* FlatLaf > Apache License
-http://www.apache.org/licenses/LICENSE-2.0
-
 --------------------------------------------------------------------------------
 AppleJavaExtensions
 v 1.2

Structorizer.1

@@ -180,6 +180,8 @@ Accepted names (case-insensitive) of generators are:
 .br
 .B BASH
 .br
+.B ARM
+.br
 .B StrucTeX
 .br
 .B LaTeX

buildapp.xml

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

nbproject/private/private.properties

@@ -1,7 +1,10 @@
 compile.on.save=false
 do.depend=false
 do.jar=true
+do.jlink=false
+file.reference.bsh-2.0b4.jar-1=/Users/ale/NetBeansProjects/Structorizer.Desktop/lib/bsh-2.0b6.jar
 javac.debug=true
 javadoc.preview=true
 jaxbwiz.endorsed.dirs=/Applications/NetBeans/NetBeans 6.8.app/Contents/Resources/NetBeans/ide12/modules/ext/jaxb/api
-user.properties.file=/Users/robertfisch/Library/Application Support/NetBeans/8.0.1/build.properties
+jlink.strip=false
+user.properties.file=/Users/ale/Library/Application Support/NetBeans/12.2/build.properties

nbproject/private/private.xml

@@ -4,8 +4,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/Users/robertfisch/Programs/Structorizer/buildapp.xml</file>
-            <file>file:/Users/robertfisch/Programs/Structorizer/build.xml</file>
+            <file>file:/Users/ale/NetBeansProjects/Structorizer.Desktop/src/lu/fisch/structorizer/elements/Element.java</file>
+            <file>file:/Users/ale/NetBeansProjects/Structorizer.Desktop/src/lu/fisch/structorizer/gui/Diagram.java</file>
+            <file>file:/Users/ale/NetBeansProjects/Structorizer.Desktop/src/lu/fisch/structorizer/generators/ArmGenerator.java</file>
+            <file>file:/Users/ale/NetBeansProjects/Structorizer.Desktop/src/lu/fisch/structorizer/locales/it.txt</file>
+            <file>file:/Users/ale/NetBeansProjects/Structorizer.Desktop/src/lu/fisch/utils/StringList.java</file>
         </group>
     </open-files>
 </project-private>

nbproject/project.properties

@@ -21,8 +21,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
 dist.jar=${dist.dir}/Structorizer.jar
@@ -57,16 +61,22 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
+javac.source=11
+javac.target=11
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -76,6 +86,8 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+jlink.launcher=false
+jlink.launcher.name=Structorizer
 main.class=Structorizer
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
@@ -88,8 +100,12 @@ run.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
 run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=src

src/Structorizer.java

@@ -120,11 +120,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
-//import com.formdev.flatlaf.FlatDarculaLaf;
-//import com.formdev.flatlaf.FlatDarkLaf;
-//import com.formdev.flatlaf.FlatIntelliJLaf;
-//import com.formdev.flatlaf.FlatLightLaf;
-
 //import lu.fisch.structorizer.application.ApplicationFactory;
 import lu.fisch.structorizer.archivar.Archivar;
 import lu.fisch.structorizer.archivar.Archivar.ArchiveIndex;
@@ -362,13 +357,6 @@ else if (parser != null)
 		System.setProperty("sun.java2d.noddraw", "true");
 		// END KGU#521 2018-06-12
 
-		// START KGU#966 2021-03-10: Issue #966 Additional L&F (experimental)
-//		FlatLightLaf.installLafInfo();
-//		FlatDarkLaf.installLafInfo();
-//		FlatDarculaLaf.installLafInfo();
-//		FlatIntelliJLaf.installLafInfo();
-		// END KGU#966 2021-03-10
-
 		// try to load the system Look & Feel
 		try
 		{

src/lu/fisch/structorizer/elements/Call.java

@@ -331,7 +331,7 @@ public String getSignatureString()
 	 * <li> the referred method declaration (in case this obect represents a method reference),</li>
 	 * <li> the called routine if the text complies to the call syntax described in the user guide,</li>
 	 * <li> {@code null} otherwise.</li>
-	 * <ul>
+	 * </ul>
 	 * @return Function object or {@code null}.
 	 * @see #isFunctionCall(boolean)
 	 * @see #isProcedureCall(boolean)

src/lu/fisch/structorizer/elements/Element.java

@@ -252,6 +252,9 @@
  */
 public abstract class Element {
 
+	// START AS 2021-03-25: Enh. #967 (ARM code variant) - KGU 2021-04-15 disabled
+	//public static boolean ARM_GNU = false;
+	// END AS 2021-03-25
 	/** This enumeration type distinguishes drawing contexts for selection display */
 	// START KGU#906 2021-01-06: Enh. #905 need another context to suppress triangles
 	//public enum DrawingContext {DC_STRUCTORIZER, DC_ARRANGER};
@@ -295,7 +298,7 @@ public String toString()
 	public static final long E_HELP_FILE_SIZE = 11700000;
 	public static final String E_DOWNLOAD_PAGE = "https://www.fisch.lu/Php/download.php";
 	// END KGU#791 2020-01-20
-	public static final String E_VERSION = "3.32-01";
+	public static final String E_VERSION = "3.32-02";
 	public static final String E_THANKS =
 	"Developed and maintained by\n"+
 	" - Robert Fisch <[email protected]>\n"+
@@ -314,6 +317,7 @@ public String toString()
 	" - BASIC: Jacek Dzieniewicz\n" +
 	" - Python: Daniel Spittank <[email protected]>\n"+
 	" - Javascript: Kay Gürtzig <[email protected]>\n"+
+	" - ARM code: Alessandro Simonetta <[email protected]>\n"+
 	" - PapDesigner: Kay Gürtzig <[email protected]>\n"+
 	"Import grammars and parsers written and maintained by\n"+
 	" - ANSI-C: Kay Gürtzig <[email protected]>\n"+

src/lu/fisch/structorizer/elements/For.java

@@ -69,6 +69,7 @@
  *      Kay Gürtzig     2019-11-21      Enh. #739 Enum types considered in type compatibility check for FOR-IN lists
  *      Kay Gürtzig     2021-01-22      Result value for setStepConst(String) introduced
  *      Kay Gürtzig     2021-02-01      Bugfix #923: Type retrieval for value lists was too weak
+ *      Kay Gürtzig     2021-10-09      Bugfix #997: Inconsistent blank handling between forms and text
  *
  ******************************************************************************************************
  *
@@ -1010,17 +1011,23 @@ public static String composeForClause(String _counter, String _start, String _en
 		{
 			asgnmtOpr = " := ";
 		}
-		String forClause = CodeParser.getKeyword("preFor").trim() + " " +
-				_counter + asgnmtOpr + _start + " " +
-				CodeParser.getKeyword("postFor").trim() + " " + _end;
+		String forClause = CodeParser.getKeyword("preFor").trim() + " "
+				// START KGU#998 2021-10-09: Bugfix #997 redundant spaces tended to spoil comparison
+				//+ _counter + asgnmtOpr + _start + " "
+				//+ CodeParser.getKeyword("postFor").trim() + " " + _end;
+				+ _counter.trim() + asgnmtOpr + _start.trim() + " "
+				+ CodeParser.getKeyword("postFor").trim() + " " + _end.trim();
+				// END KGU#998 2021-10-09
 		if (_step != 1 || _forceStep)
 		{
 			forClause = forClause + " " + CodeParser.getKeyword("stepFor").trim() + " " +
 					Integer.toString(_step);
 		}
+		// START KGU#998 2021-10-09: Bugfix #997 This compromised expressions like length("a   b  c")
 		// Now get rid of multiple blanks
-		forClause = forClause.replace("  ", " ");
-		forClause = forClause.replace("  ", " ");
+		//forClause = forClause.replace("  ", " ");
+		//forClause = forClause.replace("  ", " ");
+		// END KGU#998 2021-10-09
 		return forClause;
 	}
 
@@ -1070,12 +1077,13 @@ public static String composeForInClause(String _iterator, String _valueList)
 
 	/**
 	 * Classifies the loop style based only on the congruence of the stored
-	 * text with the generated textes of the styles COUNTER and TRAVERSAL
-	 * (the latter being the code for FOR-IN loops).
-	 * You might also consider testing this.style (which just returns a cached
-	 * earlier classification) and this.isForInLoop(), which first checks the
-	 * cached classification and if this is FREETEXT also calls this method
-	 * in order to find out whether this complies with FOR-IN syntax.
+	 * text with the generated texts of the styles COUNTER and TRAVERSAL
+	 * (the latter being the code for FOR-IN loops).<br/>
+	 * You might also consider testing this.{@link #style} (which just returns
+	 * a cached earlier classification) and this.isForInLoop(), which first
+	 * checks the cached classification and if this is FREETEXT also calls
+	 * this method in order to find out whether this complies with FOR-IN
+	 * syntax.<br/>
 	 * Note that assignment operator differences will be tolerated.
 	 * @return One of the style codes COUNTER, TRAVERSAL, and FREETEXT
 	 */