Commit 0ce8400e authored by Daniela Genius's avatar Daniela Genius

Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool into new-lip6

parents 19d1d6de 4600ed7c
13210
\ No newline at end of file
13214
\ No newline at end of file
......@@ -593,6 +593,37 @@ Safety pragmas can be inserted in the model. These pragmas follow the following
<leadsto> ::= `-->'
<property> ::= <stateproperty>
\alt <intproperty>
\alt <boolproperty>
\alt <property> <binaryop> <property>
<stateproperty> ::= `BlockName.stateName'
<intproperty> ::= <intexpr> <intcomparator> <intexpr>
<boolproperty> ::= <boolexpr> <boolcomparator> <boolexpr>
\alt <boolexpr>
<intexpr> ::= `BlockName.integerattribute'
\alt <intvalue>
<intexpr> ::= `BlockName.booleanattribute'
\alt <booleanvalue>
<binaryop> ::= `&&' | `||'
<intvalue> :: <integer>
<booleanvalue> :: `true' | `false'
<intcomparator> ::= `<' | `>' | `==' | `!='
<boolcomparator> ::= `==' | `!='
\end{grammar}
\subsection{Latency Analysis}
......
This diff is collapsed.
......@@ -59,7 +59,7 @@ import java.util.Vector;
public class Interpreter implements Runnable, TerminalProviderInterface {
public final static Command[] commands = {new Action(), new Help(), new History(), new Print(), new Quit(),
new TestSpecific(), new TML(), new Set(), new Wait()};
new TestSpecific(), new TML(), new Set(), new Wait(), new Robot()};
// Errors
public final static String UNKNOWN = "Unknown command";
......@@ -71,6 +71,7 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
public final static String TTOOL_NOT_STARTED = "TTool is not yet started. Cannot execute command.";
public final static String TTOOL_ALREADY_STARTED = "TTool is already started. Cannot execute command.";
public final static String BAD_COMMAND_NAME = "The provided command is invalid";
public final static String ROBOT_EXCEPTION = "Robot could not be started";
private String script;
......@@ -108,7 +109,9 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
String line;
currentLine = 0;
while ((line = term.getNextCommand()) != null) {
executeLine(line, currentLine, false);
for(String subCommand: line.split(";")) {
executeLine(subCommand, currentLine, false);
}
currentLine++;
}
}
......@@ -142,7 +145,10 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
currentLine++;
executeLine(line, currentLine, true);
for(String subCommand: line.split(";")) {
executeLine(subCommand, currentLine, true);
}
}
scanner.close();
......
This diff is collapsed.
......@@ -50,8 +50,8 @@ package ui.util;
*/
public class DefaultText {
public static String BUILD = "13209";
public static String DATE = "2019/10/29 03:04:32 CET";
public static String BUILD = "13213";
public static String DATE = "2019/10/30 03:07:26 CET";
public static StringBuffer sbAbout = makeAbout();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment