Adapt to new SPDS version

CROSSINGTUD · Feb 4, 2025 · 4bb9b5c · 4bb9b5c
1 parent d427da0
commit 4bb9b5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CryptoAnalysis/src/main/java/crypto/analysis/AnalysisSeedWithSpecification.java b/CryptoAnalysis/src/main/java/crypto/analysis/AnalysisSeedWithSpecification.java
@@ -143,14 +143,14 @@ private Optional<CrySLForbiddenMethod> isForbiddenMethod(DeclaredMethod declared
     private void evaluateTypestateOrder() {
         Collection<ControlFlowGraph.Edge> allTypestateChangeStatements = new HashSet<>();
         for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> cell :
-                analysisResults.asStatementValWeightTable().cellSet()) {
+                analysisResults.asEdgeValWeightTable().cellSet()) {
             Collection<ControlFlowGraph.Edge> edges =
                     cell.getValue().getLastStateChangeStatements();
             allTypestateChangeStatements.addAll(edges);
         }
 
         for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> c :
-                analysisResults.asStatementValWeightTable().cellSet()) {
+                analysisResults.asEdgeValWeightTable().cellSet()) {
             ControlFlowGraph.Edge curr = c.getRowKey();
 
             // The initial statement is always the start of the CFG edge, all other statements are

diff --git a/CryptoAnalysis/src/main/java/crypto/analysis/IAnalysisSeed.java b/CryptoAnalysis/src/main/java/crypto/analysis/IAnalysisSeed.java
@@ -53,7 +53,7 @@ public IAnalysisSeed(
 
         this.statementValWeightTable = HashBasedTable.create();
         for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> cell :
-                results.asStatementValWeightTable().cellSet()) {
+                results.asEdgeValWeightTable().cellSet()) {
             statementValWeightTable.put(
                     cell.getRowKey().getStart(), cell.getColumnKey(), cell.getValue());
         }

diff --git a/CryptoAnalysis/src/test/java/test/UsagePatternResultsListener.java b/CryptoAnalysis/src/test/java/test/UsagePatternResultsListener.java
@@ -55,7 +55,7 @@ public void typestateAnalysisResults(
 
         for (Map.Entry<Statement, StateResult> entry : expectedTypestateResults.entries()) {
             for (Table.Cell<ControlFlowGraph.Edge, Val, TransitionFunction> cell :
-                    results.asStatementValWeightTable().cellSet()) {
+                    results.asEdgeValWeightTable().cellSet()) {
                 Statement expectedStatement = entry.getKey();
                 Collection<Val> expectedVal = entry.getValue().getVal();
 

diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
         <java.version>17</java.version>
         <skipTests>true</skipTests>
 
-        <spdsVersion>3.2.2</spdsVersion>
+        <spdsVersion>3.2.3</spdsVersion>
         <sootVersion>4.6.0</sootVersion>
         <cryslVersion>4.0.1</cryslVersion>
     </properties>