Merge pull request #1185 from fesch/bugfix

Version 3.32-25 candidate

Author: fesch

buildapp.xml

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

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

@@ -312,7 +312,7 @@ public String toString()
 	public static final long E_HELP_FILE_SIZE = 12300000;
 	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-24";
+	public static final String E_VERSION = "3.32-25";
 	public static final String E_THANKS =
 	"Developed and maintained by\n"+
 	" - Robert Fisch <robert.fisch@education.lu>\n"+
@@ -1566,12 +1566,12 @@ public static boolean isSwitchTextCommentMode()
 	{
 //		Root root = getRoot(this);
 //		return (root != null && root.isSwitchTextAndComments());
-    	// START KGU#227 2016-07-31: Enh. #128 - Mode "comments and text" overrides "switch text/comments" 
-    	//return Element.E_TOGGLETC;
-    	return !Element.E_COMMENTSPLUSTEXT && Element.E_TOGGLETC;
-    	// END KGU#227 2016-07-31
+		// START KGU#227 2016-07-31: Enh. #128 - Mode "comments and text" overrides "switch text/comments" 
+		//return Element.E_TOGGLETC;
+		return !Element.E_COMMENTSPLUSTEXT && Element.E_TOGGLETC;
+		// END KGU#227 2016-07-31
 	}
-	/* END KGU#172 2916-04-01 */
+	/* END KGU#172 2016-04-01 */
 
 	/**
 	 * Returns whether this element appears as selected in the standard {@link DrawingContext}.

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

@@ -81,6 +81,8 @@
  *      Kay Gürtzig     2024-04-02      Bugfix #1156: getAssignedVarName used to return null on typed constant definitions
  *      Kay Gürtzig     2024-04-16      Bugfix #1160: Drawing of rotated elements fixed,
  *                                      issues #161, #1161: Method mayPassControl() overridden
+ *      Kay Gürtzig     2025-01-17      Bugfix #1183: updateTypeMap was caught in an eternal loop by assignment
+ *                                      lines like "m[i][j] <- something"
  *
  ******************************************************************************************************
  *
@@ -1597,7 +1599,11 @@ else if (posAsgnmt > 0 && !token0.equals("var") && !token0.equals("dim")) {
 						// Don't mistake an index as a size, so better don't specify size
 						while ((pos = declZone.indexOf("[")) == 1) {
 							// There might be more than one index in the bracket
-							StringList indices = Element.splitExpressionList(declZone.subSequence(2, declZone.count()), ",", true);
+							// START KGU#1168 2025-10-17: Bugfix #1183 endless loop in case of "[i][j]"
+							//StringList indices = Element.splitExpressionList(declZone.subSequence(2, declZone.count()), ",", true);
+							declZone = declZone.subSequence(2, declZone.count());
+							StringList indices = Element.splitExpressionList(declZone, ",", true);
+							// END KGU#1168 2025-01-17
 							if (indices.get(indices.count()-1).startsWith("]")) {
 								declZone.remove(0, declZone.indexOf("]"));
 							}

src/lu/fisch/structorizer/executor/Executor.java

@@ -227,6 +227,7 @@
  *                                      (where Arranger will already have been registered if instantiated).
  *      Kay Gürtzig     2024-11-27      Bugfix #1181: Execution highlighting in the code preview was compromised
  *                                      after Calls and within multi-line Calls
+ *      Kay Gürtzig     2025-01-21      Enh. #1184: Lazy multi-dimensional array creation on first element assignment
  *
  ******************************************************************************************************
  *
@@ -4389,16 +4390,27 @@ else if (isConstant && content instanceof HashMap<?,?>) {
 			// Adjust the basic level - find the variable or object or create it
 			int level = 0;
 			boolean arrayWanted = false;
-			if ((targetObject == null) && accessPath.count() < 3) {
+			// START KGU#1169 2025-01-17: Issue #1184 Allow creation of multidimensional arrays
+			//if ((targetObject == null) && accessPath.count() < 3) {
+			int nPathItems = accessPath.count();
+			boolean onlyIndices = accessPath.get(1).startsWith("[");
+			for (int i = 2; onlyIndices && i < nPathItems; i++) {
+				onlyIndices = accessPath.get(i).startsWith("[");
+			}
+			if ((targetObject == null) && (onlyIndices || nPathItems < 3)) {
+			// END KGU#1169 2025-01-17
 				// We may generously create it, in particular if  the type is declared
 				String access = accessPath.get(1);
 				if ((arrayWanted = access.startsWith("["))
 						&& (targetType == null || targetType.isArray())) {
-					int index = Integer.parseInt(access = access.substring(1));
-					targetObject = objectArray = new ArrayList<Object>(index+1);
-					for (int i = 0; i <= index; i++) {
-						objectArray.add(0);
-					}
+					// START KGU#1169 2025-01-21: Issue #1184
+					//int index = Integer.parseInt(access = access.substring(1));
+					//targetObject = objectArray = new ArrayList<Object>(index+1);
+					//for (int i = 0; i <= index; i++) {
+					//	objectArray.add(0);
+					//}
+					targetObject = objectArray = createArrayForIndexList(accessPath.subSequence(1, nPathItems), true);
+					// END KGU#1169 2025-01-21
 					if (typeStr == null) {
 						typeStr = "@???";
 					}
@@ -4685,6 +4697,37 @@ else if (compObject != null){
 		return target;	// Base name of the assigned variable or constant
 		// END KGU#580 2018-09-24
 	}
+	
+	// START KGU#1169 2025-01-21: Issue #1184
+	/**
+	 * Recursive routine to construct a mult-dimensional array structure containing
+	 * at least the index path symbolized by {@code indexPath}.
+	 * 
+	 * @param indexPath - a StringList expected to contain strings of form {@code "[<int>"}
+	 *     where {@code <int>} is meant to be an unsigned integer literal
+	 * @param fill TODO
+	 * @return An ArrayList containing as many elements as the integer literal in
+	 *     the first element of {@code indexPath}. If {@code indexPath} has length
+	 *     1 then the ArrayList element will be 0, otherwise they will be ArrayLists
+	 *     themselves
+	 */
+	private ArrayList<Object> createArrayForIndexList(StringList indexPath, boolean fill)
+	{
+		String access = indexPath.get(0);
+		boolean interLevel = indexPath.count() > 1;
+		int index = Integer.parseInt(access = access.substring(1));
+		ArrayList<Object> targetArray = new ArrayList<Object>(index+1);
+		for (int i = 0; i <= index; i++) {
+			if (interLevel) {
+				targetArray.add(createArrayForIndexList(indexPath.subSequence(1, indexPath.count()), fill && i == index));
+			}
+			else if (fill) {
+				targetArray.add(0);
+			}
+		}
+		return targetArray;
+	}
+	// END KGU#1169 2025-01-21
 
 	/**
 	 * Checks compatibility of types between {@code target} (i.e. {@code targetType}

src/lu/fisch/structorizer/generators/CGenerator.java

@@ -125,6 +125,8 @@
  *      Kay Gürtzig             2023-12-14      Bugfix #1118: The comment of Instructions without a line wasn't exported
  *      Kay Gürtzig             2023-12-26      Issue #1123: Translation of built-in function random() added.
  *      Kay Gürtzig             2024-03-19      Issue #1148: Special indentation for "if else if" chains
+ *      Kay Gürtzig             2024-12-19      Issue #423: Recursive record definitions via array components weren't
+ *                                              correctly translated (pointer insertion failed)
  *
  ******************************************************************************************************
  *
@@ -1001,10 +1003,20 @@ protected String transformTypeFromEntry(TypeMapEntry typeInfo, TypeMapEntry defi
 		// END KGU#1082 2023-09-28
 		int nLevels = canonType.lastIndexOf('@')+1;
 		String elType = (canonType.substring(nLevels)).trim();
+		// START KGU#1167 2024-12-19: Bugfix #423 With a missing backlink it didn't work
+		//if (nLevels > 0 && typeInfo.getTypeMap() != null && typeInfo.getTypeMap().containsKey(":"+elType)) {
+		//	elTypeInfo = typeInfo.getTypeMap().get(":" + elType);
+		//}
 		TypeMapEntry elTypeInfo = typeInfo;
-		if (nLevels > 0 && typeInfo.getTypeMap() != null && typeInfo.getTypeMap().containsKey(":"+elType)) {
-			elTypeInfo = typeInfo.getTypeMap().get(":" + elType);
+		HashMap<String, TypeMapEntry> myTypeMap = typeInfo.getTypeMap();
+		if (myTypeMap == null) {
+			myTypeMap = typeMap;
+		}
+		if (nLevels > 0 && myTypeMap != null && myTypeMap.containsKey(":"+elType)) {
+			elTypeInfo = myTypeMap.get(":" + elType);
 		}
+		// END KGU#1167 2024-12-19
+		// FIXME KGU#1167 This might still fail with alias types...
 		if (elTypeInfo.isRecord() && elType.equals(elTypeInfo.typeName)) {
 			elType = transformRecordTypeRef(elType, elTypeInfo == definingWithin);
 		}

src/lu/fisch/structorizer/generators/JsGenerator.java

@@ -321,7 +321,7 @@ protected String transformRecordInit(String constValue, TypeMapEntry typeInfo) {
 				else {
 					recordInit.append(", ");
 				}
-				recordInit.append(compName + ":");
+				recordInit.append(compName + ": ");
 				if (compType != null && compType.isRecord()) {
 					recordInit.append(transformRecordInit(compVal, compType));
 				}

src/lu/fisch/structorizer/generators/PasGenerator.java

@@ -102,6 +102,7 @@
  *      Kay Gürtzig         2023-11-08      Bugfix #1109: generateCode(Jump) revised for throw
  *      Kay Gürtzig         2024-04-02      Bugfix #1155: Risk of stack overflow on type conversion averted
  *      Kay Gürtzig         2024-04-03      Issue #1148: Optimised code generation for "if else if" chains
+ *      Kay Gürtzig         2024-12-18      Issue #423: Force pointer symbols in directly recursive record definitions
  *
  ******************************************************************************************************
  *
@@ -529,6 +530,12 @@ protected String transformTypeFromEntry(TypeMapEntry typeInfo, TypeMapEntry defi
 		int nLevels = canonType.lastIndexOf('@')+1;
 		String elType = (canonType.substring(nLevels)).trim();
 		elType = transformType(elType, "(*???*)");
+		// START KGU#1025 2024-12-18: Issue #423 Add pointer symbol for recursive records
+		if (definingWithin != null && definingWithin.isRecord() &&
+				(typeInfo == definingWithin || elType.equals(definingWithin.typeName))) {
+			elType = "^" + elType;
+		}
+		// END KGU#1025 2024-12-18
 		_typeDescr = "";
 		for (int i = 0; i < nLevels; i++) {
 			_typeDescr += "array ";
@@ -2195,7 +2202,10 @@ private boolean generateTypeDef(Root _root, String _typeName, TypeMapEntry _type
 		if (_type.isRecord()) {
 			code.add(indentPlus1 + _typeName + " = RECORD");
 			for (Entry<String, TypeMapEntry> compEntry: _type.getComponentInfo(false).entrySet()) {
-				code.add(indentPlus3 + compEntry.getKey() + ":\t" + transformTypeFromEntry(compEntry.getValue(), null, true) + ";");
+				// START KGU#1025 2024-12-18: Issue #423 Special treatment for recursive record defs
+				//code.add(indentPlus3 + compEntry.getKey() + ":\t" + transformTypeFromEntry(compEntry.getValue(), null, true) + ";");
+				code.add(indentPlus3 + compEntry.getKey() + ":\t" + transformTypeFromEntry(compEntry.getValue(), _type, true) + ";");
+				// END#1025 2024-12-18
 			}
 			code.add(indentPlus2 + "END;");
 		}

src/lu/fisch/structorizer/gui/changelog.txt

@@ -25,7 +25,7 @@ Known issues (also see https://github.com/fesch/Structorizer.Desktop/issues):
 - ARM export is still experimental and relies on a specific and very restricted
   syntax for the element contents in order to produce meaningful results.
 
-Current development version 3.32-24 (2024-11-27)
+Current development version 3.32-25 (2025-01-21)
 - 01: Bugfix #987: Duplicate subroutine comment export by Pascal generator <2>
 - 01: Bugfix #988: Syntax error in Structorizer.bat and Arranger.bat fixed <2>
 - 01: Bugfix #989: Expressions in EXIT elements (e.g. return) were forgotten
@@ -260,6 +260,12 @@ Current development version 3.32-24 (2024-11-27)
 - 24: Redundant routine pool reference compromised Executor efficiency <2>
 - 24: Bugfix #1181 Code preview highlighting wasn't always consistent with
       execution progress (particularly around Calls) <2>
+- 25: Issue #423: Code generation deficiencies on recursive record types
+      fixed for Pascal, C, and C++ <2>
+- 25: Bugfix #1183: Structorizer got stuck with multi-dimensional array
+      assignments like "field[i][j] <- expr" <2>
+- 25: Enh. #1184: Executor now manages to establish even multi-dimensional
+      arrays on first element assignment (though lazily filled) <2>
 
 Version 3.32 (2021-09-19) requiring Java 11 or newer
 - 01: Bugfix #851/2: SPECIAL-NAMES sections caused COBOL parser abort <2>