Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mbe-tools
TTool
Commits
bd7a4a6c
Commit
bd7a4a6c
authored
7 years ago
by
Ludovic Apvrille
Browse files
Options
Downloads
Patches
Plain Diff
Resolving bug on no next operator
parent
5ecb8314
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
executablecode/Makefile.src
+1
-1
1 addition, 1 deletion
executablecode/Makefile.src
src/tmltranslator/TMLSyntaxChecking.java
+19
-0
19 additions, 0 deletions
src/tmltranslator/TMLSyntaxChecking.java
with
20 additions
and
1 deletion
executablecode/Makefile.src
+
1
−
1
View file @
bd7a4a6c
SRCS
=
generated_src/main.c generated_src/TestBench.c generated_src/EmergencySimulator.c generated_src/CarPositionSimulator.c generated_src/GPSSensor.c generated_src/RadarSensor.c generated_src/SpeedSensor.c generated_src/Communication.c generated_src/CorrectnessChecking.c generated_src/NeighbourhoodTableManagement.c generated_src/DSRSC_Management.c generated_src/PTC.c generated_src/DrivingPowerReductionStrategy.c generated_src/BCU.c generated_src/BrakeManagement.c generated_src/DangerAvoidanceStrategy.c generated_src/CSCU.c generated_src/VehiculeDynamicsManagement.c generated_src/PlausibilityCheck.c generated_src/ObjectListManagement.c
SRCS
=
generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/tmltranslator/TMLSyntaxChecking.java
+
19
−
0
View file @
bd7a4a6c
...
@@ -66,6 +66,7 @@ public class TMLSyntaxChecking {
...
@@ -66,6 +66,7 @@ public class TMLSyntaxChecking {
private
final
String
UNDECLARED_VARIABLE
=
"unknown variable"
;
private
final
String
UNDECLARED_VARIABLE
=
"unknown variable"
;
private
final
String
SYNTAX_ERROR_VARIABLE_EXPECTED
=
"syntax error (variable expected)"
;
private
final
String
SYNTAX_ERROR_VARIABLE_EXPECTED
=
"syntax error (variable expected)"
;
private
final
String
TIME_UNIT_ERROR
=
"unknown time unit"
;
private
final
String
TIME_UNIT_ERROR
=
"unknown time unit"
;
private
final
String
NO_NEXT_OPERATOR_ERROR
=
"No next operator"
;
private
ArrayList
<
TMLError
>
errors
;
private
ArrayList
<
TMLError
>
errors
;
...
@@ -93,6 +94,8 @@ public class TMLSyntaxChecking {
...
@@ -93,6 +94,8 @@ public class TMLSyntaxChecking {
checkReadAndWriteInChannelsEventsAndRequests
();
checkReadAndWriteInChannelsEventsAndRequests
();
checkActionSyntax
();
checkActionSyntax
();
checkNextActions
();
}
}
public
int
hasErrors
()
{
public
int
hasErrors
()
{
...
@@ -125,6 +128,22 @@ public class TMLSyntaxChecking {
...
@@ -125,6 +128,22 @@ public class TMLSyntaxChecking {
errors
.
add
(
error
);
errors
.
add
(
error
);
}
}
public
void
checkNextActions
()
{
for
(
TMLTask
t:
tmlm
.
getTasks
())
{
TMLActivity
tactivity
=
t
.
getActivityDiagram
();
int
n
=
tactivity
.
nElements
();
for
(
int
i
=
0
;
i
<
n
;
i
++)
{
TMLActivityElement
elt
=
tactivity
.
get
(
i
);
if
(!(
elt
instanceof
TMLStopState
))
{
if
(
elt
.
getNbNext
()
==
0
)
{
addError
(
t
,
elt
,
elt
.
getName
()
+
": "
+
NO_NEXT_OPERATOR_ERROR
,
TMLError
.
ERROR_BEHAVIOR
);
}
}
}
}
}
public
void
checkReadAndWriteInChannelsEventsAndRequests
()
{
public
void
checkReadAndWriteInChannelsEventsAndRequests
()
{
TMLChannel
ch
;
TMLChannel
ch
;
TMLEvent
evt
;
TMLEvent
evt
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment