Fixes #766, adds appropriate export samples

fesch · Dec 3, 2019 · c04ddc4 · c04ddc4
1 parent bde919c
commit c04ddc4
Show file tree

Hide file tree

Showing 17 changed files with 18,158 additions and 4 deletions.
diff --git a/samples/export/BASIC0/TextDemo.bas b/samples/export/BASIC0/TextDemo.bas
diff --git a/samples/export/BASIC1/TextDemo.bas b/samples/export/BASIC1/TextDemo.bas
diff --git a/samples/export/C#/TextDemo.cs b/samples/export/C#/TextDemo.cs
diff --git a/samples/export/C++/TextDemo.cpp b/samples/export/C++/TextDemo.cpp
diff --git a/samples/export/C/TextDemo.c b/samples/export/C/TextDemo.c
diff --git a/samples/export/Java/TextDemo.java b/samples/export/Java/TextDemo.java
diff --git a/samples/export/Js/TextDemo.js b/samples/export/Js/TextDemo.js
diff --git a/samples/export/Oberon/TextDemo.Mod b/samples/export/Oberon/TextDemo.Mod
diff --git a/samples/export/PHP/TextDemo.php b/samples/export/PHP/TextDemo.php
diff --git a/samples/export/Pascal/TextDemo.pas b/samples/export/Pascal/TextDemo.pas
diff --git a/samples/export/Perl/TextDemo.pl b/samples/export/Perl/TextDemo.pl
diff --git a/samples/export/Python/TextDemo.py b/samples/export/Python/TextDemo.py
diff --git a/samples/export/StrukTeX/TextDemo.tex b/samples/export/StrukTeX/TextDemo.tex
diff --git a/samples/export/bash/TextDemo.sh b/samples/export/bash/TextDemo.sh
diff --git a/samples/export/ksh/TextDemo.ksh b/samples/export/ksh/TextDemo.ksh
diff --git a/src/lu/fisch/structorizer/generators/SubTopoSortEntry.java b/src/lu/fisch/structorizer/generators/SubTopoSortEntry.java
@@ -34,15 +34,15 @@
 *      ------          ----            -----------
 *      Kay Gürtzig     2016.07.19      First issue (for enh. #160)
 *      Kay Gürtzig     2016.08.10      Modification for bugfix #228 (KGU#237)
+*      Kay Gürtzig     2019-12-03      Issue #766: Sorted caller set to achieve deterministic routine order
 *
 ******************************************************************************************************
 *
 *      Comment:	
 *      
 ******************************************************************************************************///
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.TreeSet;
 
 import lu.fisch.structorizer.elements.Root;
 
@@ -52,7 +52,10 @@
  * depends on).
  */
 final class SubTopoSortEntry {
-	public Set<Root> callers = new HashSet<Root>();
+	// START KGU#754 2019-12-03: Issue #766 - we want deterministic routine orders
+	//public Set<Root> callers = new HashSet<Root>();
+	public TreeSet<Root> callers = new TreeSet<Root>(Root.SIGNATURE_ORDER);
+	// END KGU#754 2019-12-03
 	public int nReferingTo = 0;	// number of different(!) routines being called
 
 	SubTopoSortEntry(Root _caller)

diff --git a/src/lu/fisch/structorizer/gui/changelog.txt b/src/lu/fisch/structorizer/gui/changelog.txt
@@ -12,7 +12,7 @@ Known issues:
 - The Javascript generator is just a prototype and may be deficient.
 - Shell export does not cope with nested array/record initializers and component access.
 
-Current development version: 3.30-03 (2019-12-03)
+Current development version: 3.30-03 (2019-12-02)
 - 01: Bugfix #759: Another source of stale Mainforms dried up. <2>
 - 01: Bugfix #761: Code preview defect flooded the log stream. <2>
 - 01: Precautions against empty error messages on startup <2>
@@ -31,6 +31,7 @@ Current development version: 3.30-03 (2019-12-03)
 - 03: Enh. #388: Support for constants on Perl export (had been missing) <2>
 - 03: Enh. #423: Support for record types on Perl export (had been missing) <2>
 - 03: Enh. #739: Enum type definitions introduced (incl. C99, Pascal import) <2>
+- 03: Issue #766: Deterministic export order had not worked for deep hierarchies <2>
 - 03: Bugfix #770: Not all CASE selectors were checked to be constant integers <2>
 - 03: Enh. #775: More type-sensitive export of input instructions to OBERON <2>
 - 03: Bugfix #776: Global variables are locally eclipsed on Pascal/Oberon export <2>