Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Ocarina
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
TASTE
Ocarina
Commits
b26ec36a
Commit
b26ec36a
authored
Feb 01, 2017
by
yoogx
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ocarina_svn_enis'
parents
9f89dde3
c0aa7c2d
Changes
283
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
283 changed files
with
52155 additions
and
3508 deletions
+52155
-3508
autotest.sh
autotest.sh
+3
-3
examples/real/security/all.aadl.out
examples/real/security/all.aadl.out
+75
-75
projects/Makefile.am
projects/Makefile.am
+3
-0
projects/ocarina-frontends.gpr
projects/ocarina-frontends.gpr
+3
-1
resources/AADLv2/errorlibrary.aadl
resources/AADLv2/errorlibrary.aadl
+109
-0
resources/AADLv2/replication_properties.aadl
resources/AADLv2/replication_properties.aadl
+36
-0
resources/Makefile.am
resources/Makefile.am
+2
-0
resources/ocarina_config.aadl
resources/ocarina_config.aadl
+14
-0
src/backends/ocarina-backends-expander.adb
src/backends/ocarina-backends-expander.adb
+5
-5
src/backends/ocarina-backends-lnt-components.adb
src/backends/ocarina-backends-lnt-components.adb
+917
-0
src/backends/ocarina-backends-lnt-components.ads
src/backends/ocarina-backends-lnt-components.ads
+295
-0
src/backends/ocarina-backends-lnt-debug.adb
src/backends/ocarina-backends-lnt-debug.adb
+240
-0
src/backends/ocarina-backends-lnt-debug.ads
src/backends/ocarina-backends-lnt-debug.ads
+70
-0
src/backends/ocarina-backends-lnt-nodes.idl
src/backends/ocarina-backends-lnt-nodes.idl
+591
-0
src/backends/ocarina-backends-lnt-nutils.adb
src/backends/ocarina-backends-lnt-nutils.adb
+452
-0
src/backends/ocarina-backends-lnt-nutils.ads
src/backends/ocarina-backends-lnt-nutils.ads
+198
-0
src/backends/ocarina-backends-lnt-printer.adb
src/backends/ocarina-backends-lnt-printer.adb
+1638
-0
src/backends/ocarina-backends-lnt-printer.ads
src/backends/ocarina-backends-lnt-printer.ads
+36
-0
src/backends/ocarina-backends-lnt-svl_generator.adb
src/backends/ocarina-backends-lnt-svl_generator.adb
+110
-0
src/backends/ocarina-backends-lnt-svl_generator.ads
src/backends/ocarina-backends-lnt-svl_generator.ads
+36
-0
src/backends/ocarina-backends-lnt-tree_generator.adb
src/backends/ocarina-backends-lnt-tree_generator.adb
+93
-0
src/backends/ocarina-backends-lnt-tree_generator.ads
src/backends/ocarina-backends-lnt-tree_generator.ads
+38
-0
src/backends/ocarina-backends-lnt-tree_generator_main.adb
src/backends/ocarina-backends-lnt-tree_generator_main.adb
+717
-0
src/backends/ocarina-backends-lnt-tree_generator_main.ads
src/backends/ocarina-backends-lnt-tree_generator_main.ads
+37
-0
src/backends/ocarina-backends-lnt-tree_generator_port.adb
src/backends/ocarina-backends-lnt-tree_generator_port.adb
+289
-0
src/backends/ocarina-backends-lnt-tree_generator_port.ads
src/backends/ocarina-backends-lnt-tree_generator_port.ads
+36
-0
src/backends/ocarina-backends-lnt-tree_generator_processor.adb
...ackends/ocarina-backends-lnt-tree_generator_processor.adb
+1372
-0
src/backends/ocarina-backends-lnt-tree_generator_processor.ads
...ackends/ocarina-backends-lnt-tree_generator_processor.ads
+37
-0
src/backends/ocarina-backends-lnt-tree_generator_thread.adb
src/backends/ocarina-backends-lnt-tree_generator_thread.adb
+382
-0
src/backends/ocarina-backends-lnt-tree_generator_thread.ads
src/backends/ocarina-backends-lnt-tree_generator_thread.ads
+37
-0
src/backends/ocarina-backends-lnt-tree_generator_types.adb
src/backends/ocarina-backends-lnt-tree_generator_types.adb
+374
-0
src/backends/ocarina-backends-lnt-tree_generator_types.ads
src/backends/ocarina-backends-lnt-tree_generator_types.ads
+37
-0
src/backends/ocarina-backends-lnt.adb
src/backends/ocarina-backends-lnt.adb
+177
-0
src/backends/ocarina-backends-lnt.ads
src/backends/ocarina-backends-lnt.ads
+70
-0
src/backends/ocarina-backends-replication_expander.adb
src/backends/ocarina-backends-replication_expander.adb
+2327
-0
src/backends/ocarina-backends-replication_expander.ads
src/backends/ocarina-backends-replication_expander.ads
+59
-0
src/backends/ocarina-backends-replication_properties.adb
src/backends/ocarina-backends-replication_properties.adb
+499
-0
src/backends/ocarina-backends-replication_properties.ads
src/backends/ocarina-backends-replication_properties.ads
+128
-0
src/backends/ocarina-backends.adb
src/backends/ocarina-backends.adb
+35
-14
src/backends/ocarina-backends.ads
src/backends/ocarina-backends.ads
+6
-0
src/backends/ocarina-be_aadl-annexes.adb
src/backends/ocarina-be_aadl-annexes.adb
+13
-3
src/backends/ocarina-be_aadl-components-modes.adb
src/backends/ocarina-be_aadl-components-modes.adb
+34
-20
src/backends/ocarina-be_aadl-namespaces.adb
src/backends/ocarina-be_aadl-namespaces.adb
+11
-9
src/backends/ocarina-be_aadl.adb
src/backends/ocarina-be_aadl.adb
+22
-10
src/backends/ocarina-be_aadl.ads
src/backends/ocarina-be_aadl.ads
+9
-1
src/backends/ocarina-be_aadl_ba-actions.adb
src/backends/ocarina-be_aadl_ba-actions.adb
+292
-154
src/backends/ocarina-be_aadl_ba-actions.ads
src/backends/ocarina-be_aadl_ba-actions.ads
+3
-3
src/backends/ocarina-be_aadl_ba-expressions.adb
src/backends/ocarina-be_aadl_ba-expressions.adb
+202
-132
src/backends/ocarina-be_aadl_ba-expressions.ads
src/backends/ocarina-be_aadl_ba-expressions.ads
+14
-8
src/backends/ocarina-be_aadl_ba-identifiers.adb
src/backends/ocarina-be_aadl_ba-identifiers.adb
+10
-12
src/backends/ocarina-be_aadl_ba-identifiers.ads
src/backends/ocarina-be_aadl_ba-identifiers.ads
+1
-1
src/backends/ocarina-be_aadl_ba-specifications.adb
src/backends/ocarina-be_aadl_ba-specifications.adb
+143
-38
src/backends/ocarina-be_aadl_ba-specifications.ads
src/backends/ocarina-be_aadl_ba-specifications.ads
+1
-1
src/backends/ocarina-be_aadl_ba-thread_dispatch.adb
src/backends/ocarina-be_aadl_ba-thread_dispatch.adb
+60
-95
src/backends/ocarina-be_aadl_ba-thread_dispatch.ads
src/backends/ocarina-be_aadl_ba-thread_dispatch.ads
+1
-1
src/backends/ocarina-be_aadl_ba.adb
src/backends/ocarina-be_aadl_ba.adb
+8
-7
src/backends/ocarina-be_aadl_ba.ads
src/backends/ocarina-be_aadl_ba.ads
+3
-3
src/config/ocarina-configuration.adb.in
src/config/ocarina-configuration.adb.in
+7
-1
src/core/common_files/ocarina-output.adb
src/core/common_files/ocarina-output.adb
+9
-0
src/core/common_files/ocarina-output.ads
src/core/common_files/ocarina-output.ads
+4
-1
src/core/instance/ocarina-instances-annexes.adb
src/core/instance/ocarina-instances-annexes.adb
+130
-0
src/core/instance/ocarina-instances-annexes.ads
src/core/instance/ocarina-instances-annexes.ads
+52
-0
src/core/instance/ocarina-instances-components.adb
src/core/instance/ocarina-instances-components.adb
+21
-2
src/core/instance/ocarina-instances-processor-properties.adb
src/core/instance/ocarina-instances-processor-properties.adb
+19
-2
src/core/mgmt/ocarina-options.adb
src/core/mgmt/ocarina-options.adb
+20
-1
src/core/mgmt/ocarina-options.ads
src/core/mgmt/ocarina-options.ads
+19
-1
src/core/mgmt/ocarina-parser.adb
src/core/mgmt/ocarina-parser.adb
+3
-2
src/core/mgmt/ocarina-parser.ads
src/core/mgmt/ocarina-parser.ads
+4
-2
src/core/model/ocarina-analyzer-aadl-annexes.adb
src/core/model/ocarina-analyzer-aadl-annexes.adb
+198
-0
src/core/model/ocarina-analyzer-aadl-annexes.ads
src/core/model/ocarina-analyzer-aadl-annexes.ads
+36
-0
src/core/model/ocarina-analyzer-aadl.adb
src/core/model/ocarina-analyzer-aadl.adb
+5
-0
src/core/model/ocarina-analyzer-aadl_ba.adb
src/core/model/ocarina-analyzer-aadl_ba.adb
+1393
-0
src/core/model/ocarina-analyzer-aadl_ba.ads
src/core/model/ocarina-analyzer-aadl_ba.ads
+41
-0
src/core/model/ocarina-analyzer-aadl_ema-finder.adb
src/core/model/ocarina-analyzer-aadl_ema-finder.adb
+1144
-0
src/core/model/ocarina-analyzer-aadl_ema-finder.ads
src/core/model/ocarina-analyzer-aadl_ema-finder.ads
+108
-0
src/core/model/ocarina-analyzer-aadl_ema-links.adb
src/core/model/ocarina-analyzer-aadl_ema-links.adb
+90
-0
src/core/model/ocarina-analyzer-aadl_ema-links.ads
src/core/model/ocarina-analyzer-aadl_ema-links.ads
+50
-0
src/core/model/ocarina-analyzer-aadl_ema-naming_rules.adb
src/core/model/ocarina-analyzer-aadl_ema-naming_rules.adb
+1765
-0
src/core/model/ocarina-analyzer-aadl_ema-naming_rules.ads
src/core/model/ocarina-analyzer-aadl_ema-naming_rules.ads
+52
-0
src/core/model/ocarina-analyzer-aadl_ema.adb
src/core/model/ocarina-analyzer-aadl_ema.adb
+118
-0
src/core/model/ocarina-analyzer-aadl_ema.ads
src/core/model/ocarina-analyzer-aadl_ema.ads
+43
-0
src/core/model/ocarina-analyzer.adb
src/core/model/ocarina-analyzer.adb
+6
-0
src/core/model/ocarina-builder-aadl-annexes.adb
src/core/model/ocarina-builder-aadl-annexes.adb
+3
-4
src/core/model/ocarina-builder-aadl-annexes.ads
src/core/model/ocarina-builder-aadl-annexes.ads
+4
-4
src/core/model/ocarina-builder-aadl-components-subcomponents.adb
...e/model/ocarina-builder-aadl-components-subcomponents.adb
+4
-2
src/core/model/ocarina-builder-aadl-components-subcomponents.ads
...e/model/ocarina-builder-aadl-components-subcomponents.ads
+5
-2
src/core/model/ocarina-builder-aadl_ba-actions.adb
src/core/model/ocarina-builder-aadl_ba-actions.adb
+323
-141
src/core/model/ocarina-builder-aadl_ba-actions.ads
src/core/model/ocarina-builder-aadl_ba-actions.ads
+83
-33
src/core/model/ocarina-builder-aadl_ba-expressions.adb
src/core/model/ocarina-builder-aadl_ba-expressions.adb
+237
-106
src/core/model/ocarina-builder-aadl_ba-expressions.ads
src/core/model/ocarina-builder-aadl_ba-expressions.ads
+60
-20
src/core/model/ocarina-builder-aadl_ba-specifications.adb
src/core/model/ocarina-builder-aadl_ba-specifications.adb
+223
-59
src/core/model/ocarina-builder-aadl_ba-specifications.ads
src/core/model/ocarina-builder-aadl_ba-specifications.ads
+57
-18
src/core/model/ocarina-builder-aadl_ba-thread_dispatch.adb
src/core/model/ocarina-builder-aadl_ba-thread_dispatch.adb
+90
-101
src/core/model/ocarina-builder-aadl_ba-thread_dispatch.ads
src/core/model/ocarina-builder-aadl_ba-thread_dispatch.ads
+26
-27
src/core/tree/ocarina-ao4aadl_values.adb
src/core/tree/ocarina-ao4aadl_values.adb
+1149
-0
src/core/tree/ocarina-ao4aadl_values.ads
src/core/tree/ocarina-ao4aadl_values.ads
+184
-0
src/core/tree/ocarina-ema_values.adb
src/core/tree/ocarina-ema_values.adb
+650
-0
src/core/tree/ocarina-ema_values.ads
src/core/tree/ocarina-ema_values.ads
+170
-0
src/core/tree/ocarina-me_aadl-aadl_instances-debug.adb
src/core/tree/ocarina-me_aadl-aadl_instances-debug.adb
+2
-1
src/core/tree/ocarina-me_aadl-aadl_instances-nodes.idl
src/core/tree/ocarina-me_aadl-aadl_instances-nodes.idl
+11
-3
src/core/tree/ocarina-me_aadl-aadl_tree-debug.adb
src/core/tree/ocarina-me_aadl-aadl_tree-debug.adb
+3
-1
src/core/tree/ocarina-me_aadl-aadl_tree-nodes.idl
src/core/tree/ocarina-me_aadl-aadl_tree-nodes.idl
+5
-1
src/core/tree/ocarina-me_aadl-aadl_tree-nutils.adb
src/core/tree/ocarina-me_aadl-aadl_tree-nutils.adb
+16
-1
src/core/tree/ocarina-me_aadl-aadl_tree-nutils.ads
src/core/tree/ocarina-me_aadl-aadl_tree-nutils.ads
+2
-1
src/core/tree/ocarina-me_aadl_ba-ba_tree-nodes.idl
src/core/tree/ocarina-me_aadl_ba-ba_tree-nodes.idl
+265
-127
src/core/tree/ocarina-me_aadl_ba-ba_tree-nutils.adb
src/core/tree/ocarina-me_aadl_ba-ba_tree-nutils.adb
+30
-10
src/core/tree/ocarina-me_aadl_ba-ba_tree-nutils.ads
src/core/tree/ocarina-me_aadl_ba-ba_tree-nutils.ads
+11
-3
src/core/tree/ocarina-me_aadl_ba-tokens.adb
src/core/tree/ocarina-me_aadl_ba-tokens.adb
+15
-7
src/core/tree/ocarina-me_aadl_ba-tokens.ads
src/core/tree/ocarina-me_aadl_ba-tokens.ads
+58
-38
src/core/tree/ocarina-me_aadl_ba.ads
src/core/tree/ocarina-me_aadl_ba.ads
+34
-21
src/core/tree/ocarina-me_aadl_ema-ema_tokens.adb
src/core/tree/ocarina-me_aadl_ema-ema_tokens.adb
+205
-0
src/core/tree/ocarina-me_aadl_ema-ema_tokens.ads
src/core/tree/ocarina-me_aadl_ema-ema_tokens.ads
+252
-0
src/core/tree/ocarina-me_aadl_ema-ema_tree-debug.adb
src/core/tree/ocarina-me_aadl_ema-ema_tree-debug.adb
+200
-0
src/core/tree/ocarina-me_aadl_ema-ema_tree-debug.ads
src/core/tree/ocarina-me_aadl_ema-ema_tree-debug.ads
+71
-0
src/core/tree/ocarina-me_aadl_ema-ema_tree-nodes.idl
src/core/tree/ocarina-me_aadl_ema-ema_tree-nodes.idl
+986
-0
src/core/tree/ocarina-me_aadl_ema-ema_tree-nutils.adb
src/core/tree/ocarina-me_aadl_ema-ema_tree-nutils.adb
+361
-0
src/core/tree/ocarina-me_aadl_ema-ema_tree-nutils.ads
src/core/tree/ocarina-me_aadl_ema-ema_tree-nutils.ads
+109
-0
src/core/tree/ocarina-me_aadl_ema-ema_tree.ads
src/core/tree/ocarina-me_aadl_ema-ema_tree.ads
+34
-0
src/core/tree/ocarina-me_aadl_ema.ads
src/core/tree/ocarina-me_aadl_ema.ads
+59
-0
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-debug.adb
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-debug.adb
+200
-0
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-debug.ads
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-debug.ads
+72
-0
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nodes.idl
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nodes.idl
+600
-0
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nutils.adb
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nutils.adb
+136
-0
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nutils.ads
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nutils.ads
+67
-0
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree.ads
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree.ads
+34
-0
src/core/tree/ocarina-me_ao4aadl-tokens.adb
src/core/tree/ocarina-me_ao4aadl-tokens.adb
+185
-0
src/core/tree/ocarina-me_ao4aadl-tokens.ads
src/core/tree/ocarina-me_ao4aadl-tokens.ads
+243
-0
src/core/tree/ocarina-me_ao4aadl.ads
src/core/tree/ocarina-me_ao4aadl.ads
+111
-0
src/core/tree/ocarina-property_sets.adb
src/core/tree/ocarina-property_sets.adb
+3
-2
src/core/tree/ocarina-property_sets.ads
src/core/tree/ocarina-property_sets.ads
+3
-2
src/frontends/aadl/ocarina-fe_aadl-lexer.adb
src/frontends/aadl/ocarina-fe_aadl-lexer.adb
+95
-53
src/frontends/aadl/ocarina-fe_aadl-lexer.ads
src/frontends/aadl/ocarina-fe_aadl-lexer.ads
+7
-2
src/frontends/aadl/ocarina-fe_aadl-parser-annexes.adb
src/frontends/aadl/ocarina-fe_aadl-parser-annexes.adb
+16
-14
src/frontends/aadl/ocarina-fe_aadl-parser-namespaces.adb
src/frontends/aadl/ocarina-fe_aadl-parser-namespaces.adb
+5
-1
src/frontends/aadl/ocarina-fe_aadl-parser.adb
src/frontends/aadl/ocarina-fe_aadl-parser.adb
+4
-1
src/frontends/aadl/ocarina-fe_aadl-parser.ads
src/frontends/aadl/ocarina-fe_aadl-parser.ads
+2
-1
src/frontends/aadl/ocarina-fe_aadl-parser_errors.adb
src/frontends/aadl/ocarina-fe_aadl-parser_errors.adb
+3
-0
src/frontends/aadl/ocarina-fe_aadl-parser_errors.ads
src/frontends/aadl/ocarina-fe_aadl-parser_errors.ads
+1
-0
src/frontends/aadl_ba/ocarina-fe_aadl_ba-lexer.adb
src/frontends/aadl_ba/ocarina-fe_aadl_ba-lexer.adb
+103
-108
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-actions.adb
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-actions.adb
+744
-321
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-actions.ads
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-actions.ads
+9
-8
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-expressions.adb
...ontends/aadl_ba/ocarina-fe_aadl_ba-parser-expressions.adb
+503
-207
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-expressions.ads
...ontends/aadl_ba/ocarina-fe_aadl_ba-parser-expressions.ads
+26
-17
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-identifiers.adb
...ontends/aadl_ba/ocarina-fe_aadl_ba-parser-identifiers.adb
+59
-54
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-specifications.adb
...ends/aadl_ba/ocarina-fe_aadl_ba-parser-specifications.adb
+498
-155
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser-thread_dispatch.adb
...nds/aadl_ba/ocarina-fe_aadl_ba-parser-thread_dispatch.adb
+103
-293
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser.adb
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser.adb
+28
-22
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser.ads
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser.ads
+19
-12
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser_errors.ads
src/frontends/aadl_ba/ocarina-fe_aadl_ba-parser_errors.ads
+44
-28
src/frontends/aadl_ema/ocarina-fe_aadl_ema-lexer.adb
src/frontends/aadl_ema/ocarina-fe_aadl_ema-lexer.adb
+1182
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema-lexer.ads
src/frontends/aadl_ema/ocarina-fe_aadl_ema-lexer.ads
+100
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser.adb
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser.adb
+8759
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser.ads
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser.ads
+52
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser_errors.adb
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser_errors.adb
+464
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser_errors.ads
src/frontends/aadl_ema/ocarina-fe_aadl_ema-parser_errors.ads
+296
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema.adb
src/frontends/aadl_ema/ocarina-fe_aadl_ema.adb
+57
-0
src/frontends/aadl_ema/ocarina-fe_aadl_ema.ads
src/frontends/aadl_ema/ocarina-fe_aadl_ema.ads
+42
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl-lexer.adb
src/frontends/ao4aadl/ocarina-fe_ao4aadl-lexer.adb
+997
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl-lexer.ads
src/frontends/ao4aadl/ocarina-fe_ao4aadl-lexer.ads
+81
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser.adb
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser.adb
+2545
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser.ads
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser.ads
+52
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser_errors.adb
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser_errors.adb
+218
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser_errors.ads
src/frontends/ao4aadl/ocarina-fe_ao4aadl-parser_errors.ads
+153
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl.adb
src/frontends/ao4aadl/ocarina-fe_ao4aadl.adb
+70
-0
src/frontends/ao4aadl/ocarina-fe_ao4aadl.ads
src/frontends/ao4aadl/ocarina-fe_ao4aadl.ads
+44
-0
src/frontends/real/ocarina-fe_real-parser.adb
src/frontends/real/ocarina-fe_real-parser.adb
+3
-1
src/frontends/real/ocarina-fe_real-parser.ads
src/frontends/real/ocarina-fe_real-parser.ads
+2
-1
src/main/ocarina_cmd.adb
src/main/ocarina_cmd.adb
+55
-0
tests/LNT/FCS/FCS.aadl
tests/LNT/FCS/FCS.aadl
+188
-0
tests/LNT/FCS/FCS.aadl.out
tests/LNT/FCS/FCS.aadl.out
+734
-0
tests/LNT/FCS/MANIFEST
tests/LNT/FCS/MANIFEST
+3
-0
tests/LNT/PC/MANIFEST
tests/LNT/PC/MANIFEST
+3
-0
tests/LNT/PC/producer_consumer.aadl
tests/LNT/PC/producer_consumer.aadl
+140
-0
tests/LNT/PC/producer_consumer.aadl.out
tests/LNT/PC/producer_consumer.aadl.out
+441
-0
tests/LNT/RADAR/MANIFEST
tests/LNT/RADAR/MANIFEST
+3
-0
tests/LNT/RADAR/radar.aadl
tests/LNT/RADAR/radar.aadl
+203
-0
tests/LNT/RADAR/radar.aadl.out
tests/LNT/RADAR/radar.aadl.out
+611
-0
tests/LNT/ROBOT/MANIFEST
tests/LNT/ROBOT/MANIFEST
+3
-0
tests/LNT/ROBOT/robot.aadl
tests/LNT/ROBOT/robot.aadl
+199
-0
tests/LNT/ROBOT/robot.aadl.out
tests/LNT/ROBOT/robot.aadl.out
+529
-0
tests/MANIFEST
tests/MANIFEST
+29
-0
tests/SAE-behaviour_annex-04202009/ba_example_001.aadl.out
tests/SAE-behaviour_annex-04202009/ba_example_001.aadl.out
+3
-42
tests/SAE-behaviour_annex-04202009/ba_example_002.aadl.out
tests/SAE-behaviour_annex-04202009/ba_example_002.aadl.out
+2
-200
tests/SAE-behaviour_annex-04202009/ba_example_003.aadl.out
tests/SAE-behaviour_annex-04202009/ba_example_003.aadl.out
+3
-256
tests/SAE-behaviour_annex-04202009/ba_example_005.aadl.out
tests/SAE-behaviour_annex-04202009/ba_example_005.aadl.out
+4
-4
tests/SAE-behaviour_annex-04202009/ba_example_007.aadl.out
tests/SAE-behaviour_annex-04202009/ba_example_007.aadl.out
+2
-242
tests/SAE-standard-examples-01192009/example_002.aadl.out
tests/SAE-standard-examples-01192009/example_002.aadl.out
+1
-0
tests/SAE-standard-examples-01192009/example_007.aadl.out
tests/SAE-standard-examples-01192009/example_007.aadl.out
+1
-0
tests/SAE-standard-examples-01192009/example_008.aadl.out
tests/SAE-standard-examples-01192009/example_008.aadl.out
+0
-1
tests/SAE-standard-examples-01192009/example_014.aadl.out
tests/SAE-standard-examples-01192009/example_014.aadl.out
+1
-0
tests/SAE-standard-examples-01192009/example_018.aadl
tests/SAE-standard-examples-01192009/example_018.aadl
+1
-1
tests/SAE-standard-examples-01192009/example_018.aadl.out
tests/SAE-standard-examples-01192009/example_018.aadl.out
+1
-3
tests/SAE-standard-examples-01192009/example_023.aadl.out
tests/SAE-standard-examples-01192009/example_023.aadl.out
+1
-0
tests/SAE-test-examples-09152005/TestAccessAssociations.aadl.out
...AE-test-examples-09152005/TestAccessAssociations.aadl.out
+1
-0
tests/SAE-test-examples-09152005/TestAppliesTo.aadl.out
tests/SAE-test-examples-09152005/TestAppliesTo.aadl.out
+2
-0
tests/TestList.mk
tests/TestList.mk
+5
-3
tests/ao4aadl/ATM.aadl
tests/ao4aadl/ATM.aadl
+385
-0
tests/ao4aadl/Test.aadl
tests/ao4aadl/Test.aadl
+240
-0
tests/ao4aadl/Test_Aspect1.aadl
tests/ao4aadl/Test_Aspect1.aadl
+199
-0
tests/ao4aadl/Test_Aspect2.aadl
tests/ao4aadl/Test_Aspect2.aadl
+205
-0
tests/ao4aadl/Test_Example.aadl
tests/ao4aadl/Test_Example.aadl
+295
-0
tests/ao4aadl/Test_Example1.aadl
tests/ao4aadl/Test_Example1.aadl
+246
-0
tests/ao4aadl/bank.aadl
tests/ao4aadl/bank.aadl
+213
-0
tests/real-annexes-execution-environment/test_real_exec_env_01.aadl.out
...exes-execution-environment/test_real_exec_env_01.aadl.out
+4
-4
tests/real-annexes-execution/test_real_exec_02.aadl.out
tests/real-annexes-execution/test_real_exec_02.aadl.out
+72
-72
tests/real-annexes-execution/test_real_exec_04.aadl.out
tests/real-annexes-execution/test_real_exec_04.aadl.out
+7
-7
tests/real-annexes-execution/test_real_exec_05.aadl.out
tests/real-annexes-execution/test_real_exec_05.aadl.out
+20
-20
tests/real-annexes-parsing/test_real_parse_01.aadl.out
tests/real-annexes-parsing/test_real_parse_01.aadl.out
+35
-0
tests/real-annexes-parsing/test_real_parse_02.aadl.out
tests/real-annexes-parsing/test_real_parse_02.aadl.out
+35
-0
tests/real-annexes-parsing/test_real_parse_03.aadl.out
tests/real-annexes-parsing/test_real_parse_03.aadl.out
+35
-0
tests/real-annexes-parsing/test_real_parse_04.aadl.out
tests/real-annexes-parsing/test_real_parse_04.aadl.out
+35
-0
tests/real-annexes-parsing/test_real_parse_05.aadl.out
tests/real-annexes-parsing/test_real_parse_05.aadl.out
+35
-0
tests/real_units/validation.aadl.out
tests/real_units/validation.aadl.out
+9
-9
tests/test039/test.aadl.out
tests/test039/test.aadl.out
+0
-1
tests/test041/test.aadl.out
tests/test041/test.aadl.out
+1
-0
tests/test042/test.aadl.out
tests/test042/test.aadl.out
+35
-0
tests/test_ao4aadl_lexer/test_000.adb
tests/test_ao4aadl_lexer/test_000.adb
+137
-0
tests/test_ao4aadl_lexer/test_000.gpr
tests/test_ao4aadl_lexer/test_000.gpr
+69
-0
tests/test_ao4aadl_lexer/test_111.adb
tests/test_ao4aadl_lexer/test_111.adb
+137
-0
tests/test_ao4aadl_lexer/test_222.adb
tests/test_ao4aadl_lexer/test_222.adb
+138
-0
tests/test_ao4aadl_parser/test_000.adb
tests/test_ao4aadl_parser/test_000.adb
+139
-0
tests/test_ao4aadl_parser/test_111.adb
tests/test_ao4aadl_parser/test_111.adb
+139
-0
tests/test_ao4aadl_parser/test_222.adb
tests/test_ao4aadl_parser/test_222.adb
+138
-0
tests/test_behavior_annex/test_ba_analyzer/MANIFEST
tests/test_behavior_annex/test_ba_analyzer/MANIFEST
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test1.aadl
tests/test_behavior_annex/test_ba_analyzer/test1.aadl
+48
-0
tests/test_behavior_annex/test_ba_analyzer/test1.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test1.aadl.out
+4
-0
tests/test_behavior_annex/test_ba_analyzer/test10.aadl
tests/test_behavior_annex/test_ba_analyzer/test10.aadl
+48
-0
tests/test_behavior_annex/test_ba_analyzer/test10.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test10.aadl.out
+3
-0
tests/test_behavior_annex/test_ba_analyzer/test11.aadl
tests/test_behavior_annex/test_ba_analyzer/test11.aadl
+27
-0
tests/test_behavior_annex/test_ba_analyzer/test11.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test11.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test12.aadl
tests/test_behavior_annex/test_ba_analyzer/test12.aadl
+40
-0
tests/test_behavior_annex/test_ba_analyzer/test12.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test12.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test13.aadl
tests/test_behavior_annex/test_ba_analyzer/test13.aadl
+41
-0
tests/test_behavior_annex/test_ba_analyzer/test13.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test13.aadl.out
+3
-0
tests/test_behavior_annex/test_ba_analyzer/test14.aadl
tests/test_behavior_annex/test_ba_analyzer/test14.aadl
+25
-0
tests/test_behavior_annex/test_ba_analyzer/test14.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test14.aadl.out
+3
-0
tests/test_behavior_annex/test_ba_analyzer/test15.aadl
tests/test_behavior_annex/test_ba_analyzer/test15.aadl
+28
-0
tests/test_behavior_annex/test_ba_analyzer/test15.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test15.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test16.aadl
tests/test_behavior_annex/test_ba_analyzer/test16.aadl
+26
-0
tests/test_behavior_annex/test_ba_analyzer/test16.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test16.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test17.aadl
tests/test_behavior_annex/test_ba_analyzer/test17.aadl
+29
-0
tests/test_behavior_annex/test_ba_analyzer/test17.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test17.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test18.aadl
tests/test_behavior_annex/test_ba_analyzer/test18.aadl
+27
-0
tests/test_behavior_annex/test_ba_analyzer/test18.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test18.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test19.aadl
tests/test_behavior_annex/test_ba_analyzer/test19.aadl
+26
-0
tests/test_behavior_annex/test_ba_analyzer/test19.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test19.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test2.aadl
tests/test_behavior_annex/test_ba_analyzer/test2.aadl
+36
-0
tests/test_behavior_annex/test_ba_analyzer/test2.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test2.aadl.out
+4
-0
tests/test_behavior_annex/test_ba_analyzer/test20.aadl
tests/test_behavior_annex/test_ba_analyzer/test20.aadl
+26
-0
tests/test_behavior_annex/test_ba_analyzer/test20.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test20.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test3.aadl
tests/test_behavior_annex/test_ba_analyzer/test3.aadl
+34
-0
tests/test_behavior_annex/test_ba_analyzer/test3.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test3.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test4.aadl
tests/test_behavior_annex/test_ba_analyzer/test4.aadl
+39
-0
tests/test_behavior_annex/test_ba_analyzer/test4.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test4.aadl.out
+1
-0
tests/test_behavior_annex/test_ba_analyzer/test5.aadl
tests/test_behavior_annex/test_ba_analyzer/test5.aadl
+34
-0
tests/test_behavior_annex/test_ba_analyzer/test5.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test5.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test6.aadl
tests/test_behavior_annex/test_ba_analyzer/test6.aadl
+38
-0
tests/test_behavior_annex/test_ba_analyzer/test6.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test6.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test7.aadl
tests/test_behavior_annex/test_ba_analyzer/test7.aadl
+53
-0
tests/test_behavior_annex/test_ba_analyzer/test7.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test7.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test8.aadl
tests/test_behavior_annex/test_ba_analyzer/test8.aadl
+37
-0
tests/test_behavior_annex/test_ba_analyzer/test8.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test8.aadl.out
+2
-0
tests/test_behavior_annex/test_ba_analyzer/test9.aadl
tests/test_behavior_annex/test_ba_analyzer/test9.aadl
+40
-0
tests/test_behavior_annex/test_ba_analyzer/test9.aadl.out
tests/test_behavior_annex/test_ba_analyzer/test9.aadl.out
+3
-0
tests/test_behavior_annex/test_ba_parser/MANIFEST
tests/test_behavior_annex/test_ba_parser/MANIFEST
+2
-0
tests/test_behavior_annex/test_ba_parser/ba_example_sub_1.aadl
.../test_behavior_annex/test_ba_parser/ba_example_sub_1.aadl
+25
-0
tests/test_behavior_annex/test_ba_parser/ba_example_sub_1.aadl.out
...t_behavior_annex/test_ba_parser/ba_example_sub_1.aadl.out
+203
-0
tests/test_behavior_annex/test_ba_parser/ba_example_sub_2.aadl
.../test_behavior_annex/test_ba_parser/ba_example_sub_2.aadl
+58
-0
tests/test_behavior_annex/test_ba_parser/ba_example_sub_2.aadl.out
...t_behavior_annex/test_ba_parser/ba_example_sub_2.aadl.out
+239
-0
tests/test_behavior_annex/test_ba_parser/ba_example_sub_3.aadl
.../test_behavior_annex/test_ba_parser/ba_example_sub_3.aadl
+48
-0
tests/test_behavior_annex/test_ba_parser/ba_example_sub_3.aadl.out
...t_behavior_annex/test_ba_parser/ba_example_sub_3.aadl.out
+225
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_1.aadl
...s/test_behavior_annex/test_ba_parser/ba_example_th_1.aadl
+56
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_1.aadl.out
...st_behavior_annex/test_ba_parser/ba_example_th_1.aadl.out
+237
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_2.aadl
...s/test_behavior_annex/test_ba_parser/ba_example_th_2.aadl
+58
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_2.aadl.out
...st_behavior_annex/test_ba_parser/ba_example_th_2.aadl.out
+238
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_3.aadl
...s/test_behavior_annex/test_ba_parser/ba_example_th_3.aadl
+98
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_3.aadl.out
...st_behavior_annex/test_ba_parser/ba_example_th_3.aadl.out
+285
-0
tests/test_behavior_annex/test_ba_parser/ba_example_th_4.aadl
...s/test_behavior_annex/test_ba_parser/ba_example_th_4.aadl
+52
-0
tests/test_behavior_annex/test_ba_parser/test_ba.aadl
tests/test_behavior_annex/test_ba_parser/test_ba.aadl
+201
-0
tests/test_behavior_annex/test_ba_parser/test_ba.aadl.out
tests/test_behavior_annex/test_ba_parser/test_ba.aadl.out
+420
-0
tests/test_identifier/t.aadl.out
tests/test_identifier/t.aadl.out
+1
-0
tests/test_tree_i/test.aadl.out
tests/test_tree_i/test.aadl.out
+1
-1
tests/ticket_48/test.aadl.out
tests/ticket_48/test.aadl.out
+1
-0
No files found.
autotest.sh
View file @
b26ec36a
...
...
@@ -470,9 +470,9 @@ if test ${dotests} = "true" ; then
# failures=`expr ${failures} + 1`
else
./
`
basename
${
file
}
.adb
`
>
${
actual_output
}
2>&1
command
=
"./
`
basename
${
file
}
.adb
`
"
result
=
$?
OCARINA_PATH
=
"
`
which ocarina
`
"
./
`
basename
${
file
}
.adb
`
>
${
actual_output
}
2>&1
command
=
"./
`
basename
${
file
}
.adb
`
"
result
=
$?
if
test
-r
${
expected_output
}
;
then
${
scriptdir
}
/tools/compare.py
\
...
...
examples/real/security/all.aadl.out
View file @
b26ec36a
...
...
@@ -146,48 +146,48 @@ Evaluating theorem bell_lapadula
* Iterate for variable: main.i_node1_partition_topsecret
Content of set vp1 (lib.real:27:14) is
main.i_node1_runtime_topsecret:
48
component instance all.aadl:156:04
main.i_node1_runtime_topsecret:
53
component instance all.aadl:156:04
Content of set b_src (lib.real:29:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set p_dest (lib.real:31:17) is
main.i_node2_partition_topsecret: 4
16
component instance all.aadl:138:04
main.i_node2_partition_topsecret: 4
65
component instance all.aadl:138:04
Content of set vp2 (lib.real:33:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_dst (lib.real:35:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
=> Result: TRUE
* Iterate for variable: main.i_node1_partition_secret
Content of set vp1 (lib.real:27:14) is
main.i_node1_runtime_secret:
28
component instance all.aadl:156:04
main.i_node1_runtime_secret:
30
component instance all.aadl:156:04
Content of set b_src (lib.real:29:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set p_dest (lib.real:31:17) is
main.i_node2_partition_secret:
483
component instance all.aadl:138:04
main.i_node2_partition_secret:
537
component instance all.aadl:138:04
Content of set vp2 (lib.real:33:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_dst (lib.real:35:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
=> Result: TRUE
* Iterate for variable: main.i_node1_partition_unclassified
Content of set vp1 (lib.real:27:14) is
main.i_node1_runtime_unclassified:
64
component instance all.aadl:156:04
main.i_node1_runtime_unclassified:
72
component instance all.aadl:156:04
Content of set b_src (lib.real:29:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set p_dest (lib.real:31:17) is
main.i_node2_partition_unclassified:
547
component instance all.aadl:138:04
main.i_node2_partition_unclassified:
606
component instance all.aadl:138:04
Content of set vp2 (lib.real:33:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_dst (lib.real:35:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
=> Result: TRUE
* Iterate for variable: main.i_node2_partition_topsecret
Content of set vp1 (lib.real:27:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_src (lib.real:29:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set p_dest (lib.real:31:17) is
Content of set vp2 (lib.real:33:14) is
Content of set b_dst (lib.real:35:16) is
...
...
@@ -195,9 +195,9 @@ Content of set b_dst (lib.real:35:16) is
* Iterate for variable: main.i_node2_partition_secret
Content of set vp1 (lib.real:27:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_src (lib.real:29:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set p_dest (lib.real:31:17) is
Content of set vp2 (lib.real:33:14) is
Content of set b_dst (lib.real:35:16) is
...
...
@@ -205,9 +205,9 @@ Content of set b_dst (lib.real:35:16) is
* Iterate for variable: main.i_node2_partition_unclassified
Content of set vp1 (lib.real:27:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_src (lib.real:29:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set p_dest (lib.real:31:17) is
Content of set vp2 (lib.real:33:14) is
Content of set b_dst (lib.real:35:16) is
...
...
@@ -221,48 +221,48 @@ Evaluating theorem biba
* Iterate for variable: main.i_node1_partition_topsecret
Content of set vp1 (lib.real:51:14) is
main.i_node1_runtime_topsecret:
48
component instance all.aadl:156:04
main.i_node1_runtime_topsecret:
53
component instance all.aadl:156:04
Content of set b_src (lib.real:53:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set p_dest (lib.real:55:17) is
main.i_node2_partition_topsecret: 4
16
component instance all.aadl:138:04
main.i_node2_partition_topsecret: 4
65
component instance all.aadl:138:04
Content of set vp2 (lib.real:57:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_dst (lib.real:59:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
=> Result: TRUE
* Iterate for variable: main.i_node1_partition_secret
Content of set vp1 (lib.real:51:14) is
main.i_node1_runtime_secret:
28
component instance all.aadl:156:04
main.i_node1_runtime_secret:
30
component instance all.aadl:156:04
Content of set b_src (lib.real:53:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set p_dest (lib.real:55:17) is
main.i_node2_partition_secret:
483
component instance all.aadl:138:04
main.i_node2_partition_secret:
537
component instance all.aadl:138:04
Content of set vp2 (lib.real:57:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_dst (lib.real:59:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
=> Result: TRUE
* Iterate for variable: main.i_node1_partition_unclassified
Content of set vp1 (lib.real:51:14) is
main.i_node1_runtime_unclassified:
64
component instance all.aadl:156:04
main.i_node1_runtime_unclassified:
72
component instance all.aadl:156:04
Content of set b_src (lib.real:53:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set p_dest (lib.real:55:17) is
main.i_node2_partition_unclassified:
547
component instance all.aadl:138:04
main.i_node2_partition_unclassified:
606
component instance all.aadl:138:04
Content of set vp2 (lib.real:57:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_dst (lib.real:59:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
=> Result: TRUE
* Iterate for variable: main.i_node2_partition_topsecret
Content of set vp1 (lib.real:51:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_src (lib.real:53:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set p_dest (lib.real:55:17) is
Content of set vp2 (lib.real:57:14) is
Content of set b_dst (lib.real:59:16) is
...
...
@@ -270,9 +270,9 @@ Content of set b_dst (lib.real:59:16) is
* Iterate for variable: main.i_node2_partition_secret
Content of set vp1 (lib.real:51:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_src (lib.real:53:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set p_dest (lib.real:55:17) is
Content of set vp2 (lib.real:57:14) is
Content of set b_dst (lib.real:59:16) is
...
...
@@ -280,9 +280,9 @@ Content of set b_dst (lib.real:59:16) is
* Iterate for variable: main.i_node2_partition_unclassified
Content of set vp1 (lib.real:51:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_src (lib.real:53:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set p_dest (lib.real:55:17) is
Content of set vp2 (lib.real:57:14) is
Content of set b_dst (lib.real:59:16) is
...
...
@@ -296,48 +296,48 @@ Evaluating theorem mils_1
* Iterate for variable: main.i_node1_partition_topsecret
Content of set vp1 (lib.real:73:14) is
main.i_node1_runtime_topsecret:
48
component instance all.aadl:156:04
main.i_node1_runtime_topsecret:
53
component instance all.aadl:156:04
Content of set b_src (lib.real:75:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set p_dest (lib.real:77:17) is
main.i_node2_partition_topsecret: 4
16
component instance all.aadl:138:04
main.i_node2_partition_topsecret: 4
65
component instance all.aadl:138:04
Content of set vp2 (lib.real:79:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_dst (lib.real:81:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
=> Result: TRUE
* Iterate for variable: main.i_node1_partition_secret
Content of set vp1 (lib.real:73:14) is
main.i_node1_runtime_secret:
28
component instance all.aadl:156:04
main.i_node1_runtime_secret:
30
component instance all.aadl:156:04
Content of set b_src (lib.real:75:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set p_dest (lib.real:77:17) is
main.i_node2_partition_secret:
483
component instance all.aadl:138:04
main.i_node2_partition_secret:
537
component instance all.aadl:138:04
Content of set vp2 (lib.real:79:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_dst (lib.real:81:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
=> Result: TRUE
* Iterate for variable: main.i_node1_partition_unclassified
Content of set vp1 (lib.real:73:14) is
main.i_node1_runtime_unclassified:
64
component instance all.aadl:156:04
main.i_node1_runtime_unclassified:
72
component instance all.aadl:156:04
Content of set b_src (lib.real:75:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set p_dest (lib.real:77:17) is
main.i_node2_partition_unclassified:
547
component instance all.aadl:138:04
main.i_node2_partition_unclassified:
606
component instance all.aadl:138:04
Content of set vp2 (lib.real:79:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_dst (lib.real:81:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
=> Result: TRUE
* Iterate for variable: main.i_node2_partition_topsecret
Content of set vp1 (lib.real:73:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_src (lib.real:75:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set p_dest (lib.real:77:17) is
Content of set vp2 (lib.real:79:14) is
Content of set b_dst (lib.real:81:16) is
...
...
@@ -345,9 +345,9 @@ Content of set b_dst (lib.real:81:16) is
* Iterate for variable: main.i_node2_partition_secret
Content of set vp1 (lib.real:73:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_src (lib.real:75:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set p_dest (lib.real:77:17) is
Content of set vp2 (lib.real:79:14) is
Content of set b_dst (lib.real:81:16) is
...
...
@@ -355,9 +355,9 @@ Content of set b_dst (lib.real:81:16) is
* Iterate for variable: main.i_node2_partition_unclassified
Content of set vp1 (lib.real:73:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_src (lib.real:75:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set p_dest (lib.real:77:17) is
Content of set vp2 (lib.real:79:14) is
Content of set b_dst (lib.real:81:16) is
...
...
@@ -371,9 +371,9 @@ Evaluating theorem mils_2
* Iterate for variable: main.i_node1_partition_topsecret
Content of set vp1 (lib.real:98:14) is
main.i_node1_runtime_topsecret:
48
component instance all.aadl:156:04
main.i_node1_runtime_topsecret:
53
component instance all.aadl:156:04
Content of set b_src (lib.real:100:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set cnx (lib.real:102:14) is
Content of set p_dest (lib.real:104:17) is
Content of set vp2 (lib.real:106:14) is
...
...
@@ -383,9 +383,9 @@ Content of set b_cnx (lib.real:110:16) is
* Iterate for variable: main.i_node1_partition_secret
Content of set vp1 (lib.real:98:14) is
main.i_node1_runtime_secret:
28
component instance all.aadl:156:04
main.i_node1_runtime_secret:
30
component instance all.aadl:156:04
Content of set b_src (lib.real:100:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set cnx (lib.real:102:14) is
Content of set p_dest (lib.real:104:17) is
Content of set vp2 (lib.real:106:14) is
...
...
@@ -395,9 +395,9 @@ Content of set b_cnx (lib.real:110:16) is
* Iterate for variable: main.i_node1_partition_unclassified
Content of set vp1 (lib.real:98:14) is
main.i_node1_runtime_unclassified:
64
component instance all.aadl:156:04
main.i_node1_runtime_unclassified:
72
component instance all.aadl:156:04
Content of set b_src (lib.real:100:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set cnx (lib.real:102:14) is
Content of set p_dest (lib.real:104:17) is
Content of set vp2 (lib.real:106:14) is
...
...
@@ -407,9 +407,9 @@ Content of set b_cnx (lib.real:110:16) is
* Iterate for variable: main.i_node2_partition_topsecret
Content of set vp1 (lib.real:98:14) is
main.i_node2_runtime_topsecret: 1
39
component instance all.aadl:156:04
main.i_node2_runtime_topsecret: 1
60
component instance all.aadl:156:04
Content of set b_src (lib.real:100:16) is
main.i_rtbus_layer_topsecret:
727
component instance all.aadl:15:04
main.i_rtbus_layer_topsecret:
821
component instance all.aadl:15:04
Content of set cnx (lib.real:102:14) is
Content of set p_dest (lib.real:104:17) is
Content of set vp2 (lib.real:106:14) is
...
...
@@ -419,9 +419,9 @@ Content of set b_cnx (lib.real:110:16) is
* Iterate for variable: main.i_node2_partition_secret
Content of set vp1 (lib.real:98:14) is
main.i_node2_runtime_secret: 1
24
component instance all.aadl:156:04
main.i_node2_runtime_secret: 1
42
component instance all.aadl:156:04
Content of set b_src (lib.real:100:16) is
main.i_rtbus_layer_secret:
735
component instance all.aadl:10:04
main.i_rtbus_layer_secret:
830
component instance all.aadl:10:04
Content of set cnx (lib.real:102:14) is
Content of set p_dest (lib.real:104:17) is
Content of set vp2 (lib.real:106:14) is
...
...
@@ -431,9 +431,9 @@ Content of set b_cnx (lib.real:110:16) is
* Iterate for variable: main.i_node2_partition_unclassified
Content of set vp1 (lib.real:98:14) is
main.i_node2_runtime_unclassified: 1
54
component instance all.aadl:156:04
main.i_node2_runtime_unclassified: 1
78
component instance all.aadl:156:04
Content of set b_src (lib.real:100:16) is
main.i_rtbus_layer_unclassified:
743
component instance all.aadl:5:04
main.i_rtbus_layer_unclassified:
839
component instance all.aadl:5:04
Content of set cnx (lib.real:102:14) is
Content of set p_dest (lib.real:104:17) is
Content of set vp2 (lib.real:106:14) is
...
...
projects/Makefile.am
View file @
b26ec36a
...
...
@@ -57,11 +57,14 @@ TREE_PIDL_SPECS = src/core/tree/ocarina-me_aadl-aadl_tree-nodes.idl \
src/core/tree/ocarina-me_aadl-aadl_instances-nodes.idl
\
src/core/tree/ocarina-me_aadl_ba-ba_tree-nodes.idl
\
src/core/tree/ocarina-me_real-real_tree-nodes.idl
\
src/core/tree/ocarina-me_ao4aadl-ao4aadl_tree-nodes.idl
\
src/core/tree/ocarina-me_aadl_ema-ema_tree-nodes.idl
\
src/backends/ocarina-backends-ada_tree-nodes.idl
\
src/backends/ocarina-backends-c_tree-nodes.idl
\
src/backends/ocarina-backends-asn1_tree-nodes.idl
\
src/backends/ocarina-backends-xml_tree-nodes.idl
\
src/backends/ocarina-backends-pn-nodes.idl
\
src/backends/ocarina-backends-lnt-nodes.idl
\
src/backends/ocarina-backends-mast_tree-nodes.idl
TREE_ADA_SPECS
=
${
addprefix
$(top_builddir)
/,
$(TREE_PIDL_SPECS:.idl=.ads)
}
...
...
projects/ocarina-frontends.gpr
View file @
b26ec36a
...
...
@@ -6,7 +6,7 @@
-- --
-- P r o j e c t --
-- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-201
5
ESA & ISAE. --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-201
6
ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify under --
-- terms of the GNU General Public License as published by the Free Soft- --
...
...
@@ -39,6 +39,8 @@ project Ocarina.Frontends is
for
Source_Dirs
use
(
Src_Dir
&
"/aadl"
,
Src_Dir
&
"/aadl_ba"
,
Src_Dir
&
"/aadl_ema"
,
Src_Dir
&
"/ao4aadl"
,
Src_Dir
&
"/real"
);
for
Object_Dir
use
Build_Dir
&
"/objects"
;
for
Library_Dir
use
Build_Dir
&
"/libs"
;
...
...
resources/AADLv2/errorlibrary.aadl
0 → 100644
View file @
b26ec36a
package
ErrorLibrary
public
annex
EMV2
{**
error
types
CommonErrors
:
type
set
{
ServiceError
,
TimingRelatedError
,
ValueRelatedError
,
ReplicationError
,
ConcurrencyError
};
--
service
related
errors
ServiceError
:
type
;
ItemOmission
:
type
extends
ServiceError
;
ServiceOmission
:
type
extends
ServiceError
;
SequenceOmission
:
type
extends
ServiceError
;
TransientServiceOmission
:
type
extends
SequenceOmission
;
LateServiceStart
:
type
extends
SequenceOmission
;
EarlyServiceTermination
:
type
extends
SequenceOmission
;
BoundedOmissionInterval
:
type
extends
SequenceOmission
;
ItemComission
:
type
extends
ServiceError
;
ServiceCommission
:
type
extends
ServiceError
;
SequenceCommission
:
type
extends
ServiceError
;
EarlyServiceStart
:
type
extends
SequenceCommission
;
LateServiceTermination
:
type
extends
SequenceCommission
;
--
timing
related
errors
TimingRelatedError
:
type
set
{
ItemTimingError
,
SequenceTimingError
,
ServiceTimingError
};
--
Item
timing
errors
ItemTimingError
:
type
;
EarlyDelivery
:
type
extends
ItemTimingError
;
LateDelivery
:
type
extends
ItemTimingError
;
--
Rate
/
sequence
timing
errors
SequenceTimingError
:
type
;
HighRate
:
type
extends
SequenceTimingError
;
LowRate
:
type
extends
SequenceTimingError
;
RateJitter
:
type
extends
SequenceTimingError
;
--
Service
timing
error
ServiceTimingError
:
type
;
DelayedService
:
type
extends
ServiceTimingError
;
EarlyService
:
type
extends
ServiceTimingError
;
--
aliases
for
timing
errors
TimingError
renames
type
ItemTimingError
;
--
legacy
RateError
renames
type
SequenceTimingError
;
EarlyData
renames
type
HighRate
;
LateData
renames
type
LowRate
;
ServiceTimeShift
renames
type
ServiceTimingError
;
--
value
related
errors
ValueRelatedError
:
type
set
{
ItemValueError
,
SequenceValueError
,
ServiceValueError
};
--
item
value
errors
ItemValueError
:
type
;
UndetectableValueError
:
type
extends
ItemValueError
;
DetectableValueError
:
type
extends
ItemValueError
;
OutOfRange
:
type
extends
DetectableValueError
;
BelowRange
:
type
extends
OutOfRange
;
AboveRange
:
type
extends
OutOfRange
;
OutOfBounds
:
type
extends
DetectableValueError
;
--
sequence
errors
SequenceValueError
:
type
;
BoundedValueChange
:
type
extends
SequenceError
;
StuckValue
:
type
extends
SequenceError
;
OutOfOrder
:
type
extends
SequenceError
;
ServiceValueError
:
type
;
OutOfCalibration
:
type
extends
ServiceValueError
;
--
Common
aliases
for
value
related
errors
ValueError
renames
type
ItemValueError
;
IncorrectValue
renames
type
ItemValueError
;
ValueCorruption
renames
type
ItemValueError
;
BadValue
renames
type
ItemValueError
;
SequenceError
renames
type
SequenceValueError
;
SubtleValueError
renames
type
UndetectableValueError
;
BenignValueError
renames
type
DetectableValueError
;
SubtleValueCorruption
renames
type
DetectableValueError
;
--
Detectability
(
Benign
/
Subtle
)
represent
a
characteristic
of
error
types
--
replication
errors
ReplicationError
:
type
;
AsymmetricReplicatesError
:
type
extends
ReplicationError
;
AsymmetricValue
:
type
extends
AsymmetricReplicatesError
;
AsymmetricApproximateValue
:
type
extends
AsymmetricValue
;
AsymmetricExactValue
:
type
extends
AsymmetricValue
;
AsymmetricTiming
:
type
extends
AsymmetricReplicatesError
;
AsymmetricOmission
:
type
extends
AsymmetricReplicatesError
;
AsymmetricItemOmission
:
type
extends
AsymmetricOmission
;
AsymmetricServiceOmission
:
type
extends
AsymmetricOmission
;
SymmetricReplicatesError
:
type
extends
ReplicationError
;
SymmetricValue
:
type
extends
SymmetricReplicatesError
;
SymmetricApproximateValue
:
type
extends
SymmetricValue
;
SymmetricExactValue
:
type
extends
SymmetricValue
;
SymmetricTiming
:
type
extends
SymmetricReplicatesError
;
SymmetricOmission
:
type
extends
SymmetricReplicatesError
;
SymmetricItemOmission
:
type
extends
SymmetricOmission
;
SymmetricServiceOmission
:
type
extends
SymmetricOmission
;
--
aliases
for
replication
InconsistentValue
renames
type
AsymmetricValue
;
InconsistentTiming
renames
type
AsymmetricTiming
;
InconsistentOmission
renames
type
AsymmetricOmission
;
InconsistentItemOmission
renames
type
AsymmetricItemOmission
;
InconsistentServiceOmission
renames
type
AsymmetricServiceOmission
;
AsymmetricTransmissive
renames
type
AsymmetricValue
;
--
concurrency
errors
ConcurrencyError
:
type
;
RaceCondition
:
type
extends
ConcurrencyError
;
ReadWriteRace
:
type
extends
RaceCondition
;
WriteWriteRace
:
type
extends
RaceCondition
;
MutExError
:
type
extends
ConcurrencyError
;
Deadlock
:
type
extends
MutExError
;
Starvation
:
type
extends
MutExError
;
--
authorization
and
authentication
errors
AuthorizationError
:
type
;
AuthenticationError
:
type
;
end
types
;
**};
end
ErrorLibrary
;
resources/AADLv2/replication_properties.aadl
0 → 100644
View file @
b26ec36a
property set Replication_Properties is
-- description of the context, requirements and goal of the replication
Description : aadlstring applies to (system, process, thread, processor, device);
-- Specification of the replica number
Replica_Number : aadlinteger applies to ( system, process, thread, processor, device);
-- Min_Nbr_Replica: A constant that represents the minimal number of replica.
Min_Nbr_Replica : constant aadlinteger => 3 ;
-- Max_Nbr_Replica: A constant that represents the maximal number of replica.
Max_Nbr_Replica : constant aadlinteger => 7 ;
-- Identifiers of the different generated replica
Replica_Identifiers : list of aadlstring applies to (system, process, thread, processor, device);
--Replication type
-- Passive Replication: one replica has two behaviors (primary and backup behaviors)
-- Active Replication: all replica have the same behavior and there is a consensus algorithm to vote between them
Replication_Types: type enumeration (ACTIVE , PASSIVE);
Replica_Type : Replication_Properties::Replication_Types applies to (system, process, thread, processor, device);
-- the consensus algorithm source text
Consensus_Algorithm_Source_Text: aadlString applies to (port, data access, system, processor, device);
-- to refer to a subprogram or thread classifier
Consensus_Algorithm_Class : classifier (subprogram) applies to (port, data access, system, processor, device);