Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import liquidjava.fsm.StateMachine;
import liquidjava.fsm.StateMachineParser;

StateMachine stateMachine = StateMachineParser.parse(path.toUri().toString());
// in a file with several classes, or for a verifier error's StateErrorContext#receiverClass
StateMachine named = StateMachineParser.parse(path.toUri().toString(), "example.File");
```

### JSON Output
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>io.github.liquid-java</groupId>
<artifactId>liquidjava-verifier</artifactId>
<version>0.0.35</version>
<version>0.0.36</version>
</dependency>
<dependency>
<groupId>fr.inria.gforge.spoon</groupId>
<artifactId>spoon-core</artifactId>
<version>10.4.2</version>
<version>11.5.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/liquidjava/fsm/StateMachine.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ public record StateMachine(
String className,
List<String> states,
List<StateMachineTransition> transitions,
List<StateMachineInitialTransition> initialTransitions,
StateMachineErrorContext errorContext
List<StateMachineInitialTransition> initialTransitions
) {}
25 changes: 0 additions & 25 deletions src/main/java/liquidjava/fsm/StateMachineErrorContext.java

This file was deleted.

249 changes: 23 additions & 226 deletions src/main/java/liquidjava/fsm/StateMachineParser.java

Large diffs are not rendered by default.

249 changes: 34 additions & 215 deletions src/test/java/liquidjava/fsm/StateMachineParserTests.java

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions src/test/resources/fsm/TwoStateClasses.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package fsm;

import liquidjava.specification.StateRefinement;
import liquidjava.specification.StateSet;

@StateSet({"open", "closed"})
public class TwoStateClasses {

@StateRefinement(from="open(this)", to="closed(this)")
public void close() {}
}

@StateSet({"idle", "busy"})
class Second {

@StateRefinement(from="idle(this)", to="busy(this)")
public void start() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,13 @@ public interface DatagramSocketRefinementsExpert {
void disconnect();

@StateRefinement(from = "connected(this)")
@StateRefinement(from = "closed(this) && connected(old(this))")
InetAddress getInetAddress();

@StateRefinement(from = "connected(this)")
@StateRefinement(from = "closed(this) && connected(old(this))")
@Refinement("Port(_) || _ == -1")
int getPort();

@StateRefinement(from = "connected(this)")
@StateRefinement(from = "closed(this) && connected(old(this))")
SocketAddress getRemoteSocketAddress();

@StateRefinement(from = "bound(this)")
Expand Down
Loading