Fix where roles are defined

AdaCore · Oct 17, 2023 · 604a50c · 604a50c
1 parent 1e3d09a
commit 604a50c
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 21 deletions.
diff --git a/...t/courses/Guidelines_for_Safe_and_Secure_Ada_SPARK/chapters/01_introduction.rst b/...t/courses/Guidelines_for_Safe_and_Secure_Ada_SPARK/chapters/01_introduction.rst
@@ -2,7 +2,7 @@
 Introduction
 **************
 
-.. include:: ../../global.txt
+.. include:: ../global.txt
 
 Ada is a general purpose, high-level programming language designed to support
 the construction of long-lived, highly-reliable applications.  Like all

diff --git a/...e_Ada_SPARK/chapters/guidelines/concurrency/con01_use_the_ravenscar_profile.rst b/...e_Ada_SPARK/chapters/guidelines/concurrency/con01_use_the_ravenscar_profile.rst
@@ -2,7 +2,7 @@
 Use the Ravenscar Profile (CON01)
 -----------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...cure_Ada_SPARK/chapters/guidelines/concurrency/con02_use_the_jorvik_profile.rst b/...cure_Ada_SPARK/chapters/guidelines/concurrency/con02_use_the_jorvik_profile.rst
@@ -2,7 +2,7 @@
 Use the Jorvik Profile (CON02)
 --------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...lines/concurrency/con03_avoid_shared_variables_for_inter-task_communication.rst b/...lines/concurrency/con03_avoid_shared_variables_for_inter-task_communication.rst
@@ -2,7 +2,7 @@
 Avoid Shared Variables for Inter-task Communication (CON03)
 -------------------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...or_Safe_and_Secure_Ada_SPARK/chapters/guidelines/dynamic_storage_management.rst b/...or_Safe_and_Secure_Ada_SPARK/chapters/guidelines/dynamic_storage_management.rst
@@ -2,7 +2,7 @@
 Dynamic Storage Management (DYN)
 ==================================
 
-.. include:: ../../../global.txt
+.. include:: ../../global.txt
 
 *Goal*
    :Maintainability: :math:`\checkmark`

diff --git a/...uidelines_for_Safe_and_Secure_Ada_SPARK/chapters/guidelines/exception_usage.rst b/...uidelines_for_Safe_and_Secure_Ada_SPARK/chapters/guidelines/exception_usage.rst
@@ -2,7 +2,7 @@
 Exception Usage (EXU)
 =======================
 
-.. include:: ../../../global.txt
+.. include:: ../../global.txt
 
 *Goal*
    :Maintainability: :math:`\checkmark`

diff --git a/...ers/guidelines/exception_usage/exu01_dont_raise_language-defined_exceptions.rst b/...ers/guidelines/exception_usage/exu01_dont_raise_language-defined_exceptions.rst
@@ -2,7 +2,7 @@
 Don't Raise Language-Defined Exceptions (EXU01)
 -------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...uidelines/exception_usage/exu02_no_unhandled_application-defined_exceptions.rst b/...uidelines/exception_usage/exu02_no_unhandled_application-defined_exceptions.rst
@@ -2,7 +2,7 @@
 No Unhandled Application-Defined Exceptions (EXU02)
 -----------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...lines/exception_usage/exu03_no_exception_propagation_beyond_name_visibility.rst b/...lines/exception_usage/exu03_no_exception_propagation_beyond_name_visibility.rst
@@ -2,7 +2,7 @@
 No Exception Propagation Beyond Name Visibility (EXU03)
 ---------------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...delines/object_oriented_programming/oop03_limit_inheritance_hierarchy_depth.rst b/...delines/object_oriented_programming/oop03_limit_inheritance_hierarchy_depth.rst
@@ -2,7 +2,7 @@
 Limit Inheritance Hierarchy Depth (OOP03)
 -------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...programming/oop04_limit_statically-dispatched_calls_to_primitive_operations.rst b/...programming/oop04_limit_statically-dispatched_calls_to_primitive_operations.rst
@@ -2,7 +2,7 @@
 Limit Statically-Dispatched Calls To Primitive Operations (OOP04)
 -------------------------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...lines/object_oriented_programming/oop05_use_explicit_overriding_annotations.rst b/...lines/object_oriented_programming/oop05_use_explicit_overriding_annotations.rst
@@ -2,7 +2,7 @@
 Use Explicit Overriding Annotations (OOP05)
 ---------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...lines/robust_programming_practice/rpp01_no_use_of_others_in_case_constructs.rst b/...lines/robust_programming_practice/rpp01_no_use_of_others_in_case_constructs.rst
@@ -2,7 +2,7 @@
 No Use of "others" in Case Constructs (RPP01)
 -----------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/.../robust_programming_practice/rpp02_no_enumeration_ranges_in_case_constructs.rst b/.../robust_programming_practice/rpp02_no_enumeration_ranges_in_case_constructs.rst
@@ -2,7 +2,7 @@
 No Enumeration Ranges in Case Constructs (RPP02)
 --------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...lines/robust_programming_practice/rpp03_limited_use_of_others_in_aggregates.rst b/...lines/robust_programming_practice/rpp03_limited_use_of_others_in_aggregates.rst
@@ -2,7 +2,7 @@
 Limited Use of "others" In Aggregates (RPP03)
 -----------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...bust_programming_practice/rpp04_no_unassigned_mode-out_procedure_parameters.rst b/...bust_programming_practice/rpp04_no_unassigned_mode-out_procedure_parameters.rst
@@ -2,7 +2,7 @@
 No Unassigned Mode-Out Procedure Parameters (RPP04)
 -----------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...es/robust_programming_practice/rpp05_no_use_of_others_in_exception_handlers.rst b/...es/robust_programming_practice/rpp05_no_use_of_others_in_exception_handlers.rst
@@ -2,7 +2,7 @@
 No Use of "others" in Exception Handlers (RPP05)
 --------------------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...rs/guidelines/robust_programming_practice/rpp07_functions_only_have_mode_in.rst b/...rs/guidelines/robust_programming_practice/rpp07_functions_only_have_mode_in.rst
@@ -2,7 +2,7 @@
 Functions Only Have Mode "in" (RPP07)
 ---------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Required
 

diff --git a/...da_SPARK/chapters/guidelines/robust_programming_practice/rpp12_no_recursion.rst b/...da_SPARK/chapters/guidelines/robust_programming_practice/rpp12_no_recursion.rst
@@ -2,7 +2,7 @@
 No Recursion (RPP12)
 ----------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/...hapters/guidelines/software_engineering/swe04_hide_implementation_artifacts.rst b/...hapters/guidelines/software_engineering/swe04_hide_implementation_artifacts.rst
@@ -2,7 +2,7 @@
 Hide Implementation Artifacts  (SWE04)
 ----------------------------------------
 
-.. include:: ../../../../global.txt
+.. include:: ../../../global.txt
 
 **Level** :math:`\rightarrow` Advisory
 

diff --git a/content/courses/Guidelines_for_Safe_and_Secure_Ada_SPARK/global.txt b/content/courses/Guidelines_for_Safe_and_Secure_Ada_SPARK/global.txt
@@ -0,0 +1,26 @@
+.. role:: ada(code)
+   :language: ada
+   :class: highlight
+
+.. role:: c(code)
+   :language: c
+   :class: highlight
+
+.. role:: cpp(code)
+   :language: c++
+   :class: highlight
+
+.. role:: java(code)
+   :language: java
+   :class: highlight
+
+.. role:: assembly(code)
+
+.. role:: rule(code)
+
+.. role:: switch(code)
+   :language: console
+
+.. include:: <isopub.txt>
+
+.. include:: <isoamsa.txt>
diff --git a/content/courses/Guidelines_for_Safe_and_Secure_Ada_SPARK/index.rst b/content/courses/Guidelines_for_Safe_and_Secure_Ada_SPARK/index.rst
@@ -4,7 +4,7 @@
 Guidelines for Safe and Secure Ada/SPARK
 ==========================================
 
-.. include:: ../global.txt
+.. include:: global.txt
 
 .. only:: builder_epub