From e8ef7f71ce4c27e47394cd816156fd5741d2fc6c Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Mon, 2 Dec 2024 15:43:50 +0100
Subject: [PATCH] update Avatar SysML Library
---
.../tosysmlv2/static/AvatarBlockTypes.sysml | 6 +++---
.../avatartranslator/tosysmlv2/static/AvatarGeneral.sysml | 2 +-
.../tosysmlv2/static/AvatarTransitionServer.sysml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml b/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml
index a0666e16ea..65683b2053 100644
--- a/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml
+++ b/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml
@@ -6,13 +6,13 @@ package AvatarBlockTypes {
abstract attribute def '#AvatarDataType';
part def '#AvatarBlock'{
- item localClock : Clock redefines localClock = systemClock ;
+ item localClock : Clock redefines localClock = '#systemClock' ;
}
abstract action def '#AvatarMethod';
action def '#AvatarVoidMethod' :> '#AvatarMethod';
calc def '#AvatarCalcMethod' :> '#AvatarMethod';
state def '#AvatarStateMachine'{
- item localClock : Clock redefines localClock = systemClock ;
+ item localClock : Clock redefines localClock = '#systemClock' ;
}
action def '#ReceiveAction';
action def '#TransitionAction';
@@ -24,7 +24,7 @@ package AvatarBlockTypes {
protected calc '@pool' : '#PoolGen' default { '#immediate_request' };
protected action '@state_action' default '#nop';
- item localClock : Clock redefines localClock = systemClock ;
+ item localClock : Clock redefines localClock = '#systemClock' ;
// the request '@pool'
private state the_state : '#AvatarState' = self;
private part request_pool : '#RequestPool'{
diff --git a/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml b/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml
index 6124eac4b7..c293ae31b5 100644
--- a/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml
+++ b/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml
@@ -167,7 +167,7 @@ package AvatarGeneral {
// SYSTEM SHARED CLOCK FOR DISCRETE TIME ================================
- item systemClock : Clock {
+ item '#systemClock' : Clock {
doc /* a system level discrete clock to handle delays */
currentTime : Integer redefines currentTime;
}
diff --git a/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml b/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml
index ae41944900..d0c3ab9277 100644
--- a/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml
+++ b/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml
@@ -44,7 +44,7 @@ package AvatarTransitionServer {
* the system discrete clock.
*/
- item localClock : Clock redefines localClock = systemClock ;
+ item localClock : Clock redefines localClock = '#systemClock' ;
readonly attribute '@delay' : Positive default 0;
derived attribute trigger_at = TimeOf(clock=localClock, o=self) + '@delay';
@@ -173,7 +173,7 @@ package AvatarTransitionServer {
* ends (which pools and which responses depends on channel types).
*/
- item localClock : Clock redefines localClock = systemClock ;
+ item localClock : Clock redefines localClock = '#systemClock' ;
private individual item def Kill { doc /* type of the local kill signal */ }
private individual item kill : Kill {
doc /* The local kill signal to be sent to '@delay'ed requests when
--
GitLab