Skip to content
GitLab
Commit 78bbc4a4 authored by yoogx's avatar yoogx
Browse files

* Update reference output

parent 9c3eb6a6
Expand all Show whitespace changes
Inline Side-by-side
tests/SAE-behaviour_annex-04202009/MANIFEST
View file @ 78bbc4a4
AADL_VERSION=-aadlv2 data_model.aadl base_types.aadl AADL_VERSION=-aadlv2 -y
\ No newline at end of file \ No newline at end of file
tests/SAE-behaviour_annex-04202009/ba_example_001.aadl.out
View file @ 78bbc4a4
...@@ -6,169 +6,6 @@ ...@@ -6,169 +6,6 @@
property set Data_Model is
Base_Type : list of classifier (
data)
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring
applies to (data, port, parameter);
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
Real_Range : range of aadlreal
applies to (data, port, parameter);
Representation : list of aadlstring
applies to (data);
end Data_Model;
package Base_Types
public
with data_model;
data Boolean
properties
Data_Model::Data_Representation => Boolean;
end Boolean;
data Integer
properties
Data_Model::Data_Representation => Integer;
end Integer;
data Integer_8 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 1 Bytes;
end Integer_8;
data Integer_16 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 2 Bytes;
end Integer_16;
data Integer_32 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 4 Bytes;
end Integer_32;
data Integer_64 extends Integer
properties
Data_Model::Number_Representation => Signed;
Source_Data_Size => 8 Bytes;
end Integer_64;
data Unsigned_8 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 1 Bytes;
end Unsigned_8;
data Unsigned_16 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 2 Bytes;
end Unsigned_16;
data Unsigned_32 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 4 Bytes;
end Unsigned_32;
data Unsigned_64 extends Integer
properties
Data_Model::Number_Representation => Unsigned;
Source_Data_Size => 8 Bytes;
end Unsigned_64;
data Natural extends Integer
properties
Data_Model::Integer_Range => 0 .. Max_Target_Integer;
end Natural;
data Float
properties
Data_Model::Data_Representation => Float;
end Float;
data Float_32 extends Float
properties
Data_Model::IEEE754_Precision => Simple;
Source_Data_Size => 4 Bytes;
end Float_32;
data Float_64 extends Float
properties
Data_Model::IEEE754_Precision => Double;
Source_Data_Size => 8 Bytes;
end Float_64;
data Character
properties
Data_Model::Data_Representation => Character;
end Character;
data String
properties
Data_Model::Data_Representation => String;
end String;
end Base_Types;
package Test package Test
public public
data number data number
......
tests/SAE-behaviour_annex-04202009/ba_example_002.aadl.out
View file @ 78bbc4a4
...@@ -6,56 +6,34 @@ ...@@ -6,56 +6,34 @@
property set Data_Model is package Test
Base_Type : list of classifier ( public
data) with Base_types;
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring thread speed
applies to (data, port, parameter); features
tick : in event port
{Dequeue_Protocol => AllItems;};
sp : out data port Base_types::integer;
Number_Representation : enumeration (Signed, Unsigned) properties
applies to (data); Dispatch_Protocol => periodic;
Period => 1000 Ms;
Real_Range : range of aadlreal end speed;
applies to (data, port, parameter);
Representation : list of aadlstring thread implementation speed.i
applies to (data); annex behavior_specification {**
states
s0 : initial complete state;
transitions
s0 -[]-> s0 {
sp := tick'count
};
**};
end speed.i;
end Data_Model; end Test;
package Base_Types package Base_Types
public public
...@@ -169,32 +147,54 @@ public ...@@ -169,32 +147,54 @@ public
end Base_Types; end Base_Types;
package Test property set Data_Model is
public Base_Type : list of classifier (
with Base_types; data)
applies to (data);
thread speed Code_Set : aadlinteger
features applies to (data);
tick : in event port
{Dequeue_Protocol => AllItems;};
sp : out data port Base_types::integer;
properties Data_Digits : aadlinteger
Dispatch_Protocol => periodic; applies to (data);
Period => 1000 Ms;
end speed; Data_Scale : aadlinteger
applies to (data);
thread implementation speed.i Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
annex behavior_specification {** applies to (data);
states
s0 : initial complete state;
transitions
s0 -[]-> s0 {
sp := tick'count
};
**};
end speed.i;
end Test; Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring
applies to (data, port, parameter);
Integer_Range : range of aadlinteger
applies to (data, port, parameter);
Measurement_Unit : aadlstring
applies to (data, port, parameter);
Number_Representation : enumeration (Signed, Unsigned)
applies to (data);
Real_Range : range of aadlreal
applies to (data, port, parameter);
Representation : list of aadlstring
applies to (data);
end Data_Model;
tests/SAE-behaviour_annex-04202009/ba_example_003.aadl.out
View file @ 78bbc4a4
...@@ -6,56 +6,90 @@ ...@@ -6,56 +6,90 @@
property set Data_Model is package Test
Base_Type : list of classifier ( public
data) with Base_types, Data_Model;
applies to (data);
Code_Set : aadlinteger
applies to (data);
Data_Digits : aadlinteger
applies to (data);
Data_Scale : aadlinteger
applies to (data);
Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
applies to (data);
Dimension : list of aadlinteger
applies to (data);
Indefinite_Dimension : constant aadlinteger => -1;
Infinite_Dimension : constant aadlinteger => -2;
Element_Names : list of aadlstring
applies to (data);
Enumerators : list of aadlstring
applies to (data);
IEEE754_Precision : enumeration (Simple, Double) thread sender
applies to (data); features
d : out event data port Base_Types::Integer;
a : in event data port Base_Types::Integer;
Initial_Value : list of aadlstring properties
applies to (data, port, parameter); Dispatch_Protocol => Timed;
Period => 10 Ms;
Integer_Range : range of aadlinteger end sender;
applies to (data, port, parameter);
Measurement_Unit : aadlstring thread implementation sender.v1
applies to (data, port, parameter); subcomponents
v : data Base_Types::Integer;
Number_Representation : enumeration (Signed, Unsigned) annex behavior_specification {**
applies to (data); states
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
v := 1;
d!(v)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
v := 0;
d!(v)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v1;
Real_Range : range of aadlreal thread implementation sender.v2
applies to (data, port, parameter); annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v2;
Representation : list of aadlstring thread implementation sender.v3
applies to (data); annex behavior_specification {**
states
st : initial complete state;
sf : complete state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a(1)]-> sf;
st -[on dispatch a(others)]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a(0)]-> st;
sf -[on dispatch a(others)]-> sf;
**};
end sender.v3;
end Data_Model; end Test;
package Base_Types package Base_Types
public public
...@@ -169,88 +203,54 @@ public ...@@ -169,88 +203,54 @@ public
end Base_Types; end Base_Types;
package Test property set Data_Model is
public Base_Type : list of classifier (
with Base_types, Data_Model; data)
applies to (data);
thread sender Code_Set : aadlinteger
features applies to (data);
d : out event data port Base_Types::Integer;
a : in event data port Base_Types::Integer;
properties Data_Digits : aadlinteger
Dispatch_Protocol => Timed; applies to (data);
Period => 10 Ms;
end sender; Data_Scale : aadlinteger
applies to (data);
thread implementation sender.v1 Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
subcomponents applies to (data);
v : data Base_Types::Integer;
annex behavior_specification {** Dimension : list of aadlinteger
states applies to (data);
st : initial complete state;
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
v := 1;
d!(v)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
v := 0;
d!(v)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v1;
thread implementation sender.v2 Indefinite_Dimension : constant aadlinteger => -1;
annex behavior_specification {** Infinite_Dimension : constant aadlinteger => -2;
states Element_Names : list of aadlstring
st : initial complete state; applies to (data);
sf : complete state;
s1, s2 : state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a]-> s1;
s1 -[a = 1]-> sf;
s1 -[a = 0]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a]-> s2;
s2 -[a = 0]-> st;
s2 -[a = 1]-> sf;
**};
end sender.v2;
thread implementation sender.v3 Enumerators : list of aadlstring
annex behavior_specification {** applies to (data);
states
st : initial complete state;
sf : complete state;
transitions
st -[on dispatch timeout]-> st {
d!(1)
};
st -[on dispatch a(1)]-> sf;
st -[on dispatch a(others)]-> st;
sf -[on dispatch timeout]-> sf {
d!(0)
};
sf -[on dispatch a(0)]-> st;
sf -[on dispatch a(others)]-> sf;
**};
end sender.v3;
end Test; IEEE754_Precision : enumeration (Simple, Double)
applies to (data);
Initial_Value : list of aadlstring