Add test-pus

tests/regression/test-pus/Makefile

+include ../shared.mk
+
+all: test-ada test-llvm
+
+edit:
+	$(OPENGEODE) flight.pr system_structure.pr
+
+test-parse:
+	$(OPENGEODE) flight.pr system_structure.pr --check
+
+test-ada: flight.ali
+
+test-c: flight.c
+	$(CC) -include missing.h -c flight.c
+
+test-llvm: flight.o
+
+coverage:
+	coverage run -p $(OPENGEODE) flight.pr system_structure.pr --toAda
+
+.PHONY: all edit test-parse test-ada test-llvm coverage

tests/regression/test-pus/dataview-uniq.asn

+-- Generic PUS Constructs
+PUS-Implicit-Knowledge DEFINITIONS ::=
+BEGIN
+
+Secondary-Header {APID} ::= SEQUENCE {
+    ack-successful-completion BOOLEAN,
+    ack-successful-progress   BOOLEAN,
+    ack-successful-start      BOOLEAN,
+    ack-successful-acceptance BOOLEAN,
+    source-id                 APID
+}
+
+Telecommand-ty {APID, SEQ-COUNT-OR-NAME, PROJECT-TC} ::= SEQUENCE {
+    dest-apid        APID,
+    packet-seq-count SEQ-COUNT-OR-NAME,
+    secondary-header Secondary-Header {APID},
+    packet-data      PROJECT-TC
+}
+
+Telemetry-ty {APID, PROJECT-TM} ::= SEQUENCE {
+    from-apid    APID,
+    content      PROJECT-TM
+}
+
+END
+
+
+-- Service type device commanding
+-- Subservice type CPDU
+-- Message types
+-- TC 2-4
+-- This module contains the generic definition of the telecommand (2,4)
+-- from the PUS-C standard.
+Distribute-CPDU-Commands-Generic DEFINITIONS ::=
+BEGIN
+
+Pulse-Instruction {CPDU-OUTPUT-IDENTIFIER} ::= SEQUENCE {
+    output-line-id CPDU-OUTPUT-IDENTIFIER,
+    duration-value INTEGER (0..7)
+}
+
+Pulse-Instructions {Pulse-Instr, INTEGER: max} ::=
+    SEQUENCE (SIZE (1..max)) OF Pulse-Instr
+
+CPDU-Command {CPDU-Identifier,
+              Pulse-Instrs} ::=
+    SEQUENCE {
+        cpdu-id          CPDU-Identifier OPTIONAL,
+        cmd-pulse-instr  Pulse-Instrs
+}
+
+-- Content of a TC (2,4)
+Distribute-CPDU-Commands { CPDU-Cmd, INTEGER:max-Cpdu-Cmds } ::=
+    SEQUENCE (SIZE (1..max-Cpdu-Cmds)) OF CPDU-Cmd
+END
+
+
+
+
+My-Project DEFINITIONS ::=
+BEGIN
+IMPORTS Pulse-Instruction,
+        Pulse-Instructions,
+        CPDU-Command,
+        Distribute-CPDU-Commands
+FROM Distribute-CPDU-Commands-Generic
+        Telecommand-ty,
+        Telemetry-ty
+FROM PUS-Implicit-Knowledge;
+
+-- Need support for TC Type/Subtype in secondary header
+TYPE-ID ::= INTEGER (0..255)
+
+-- Packet sequence count or name (defined in 7.4.1) - project-specific type
+SEQ-COUNT-OR-NAME ::= INTEGER  (0..16383)
+
+-- APID: use an ENUMERATED, and let ACN manage the "11 bits" constraint
+APID ::= ENUMERATED {
+    ground(2047),
+    flight(2046)
+}
+
+-- CPDU output Identifier defined in 9.2.1d
+CPDU-OUTPUT-ID ::= INTEGER { output-1 (42), output-2 (4090) } (0..4095)
+
+-- The CPDU identifier is mentioned in 6.2.6.2c.1 and then in 9.2.2b but the associated type
+-- is not specified (enumerated? bounds?) - contrary to the CPDU output identifier
+CPDU-Identifiers    ::= ENUMERATED { cpdu-id-1, cpdu-id-2 }
+PULSE-INST          ::= Pulse-Instruction { CPDU-OUTPUT-ID }
+
+-- 9.2.1.g Maximum number of command pulse instructions (project specific)
+max-Instr INTEGER (12 .. 504) ::= 12
+Seq-Pulse-Inst      ::= Pulse-Instructions {PULSE-INST, max-Instr}
+
+-- Max nb of CPDU commands (bounds constraints not found in PUS-C)
+max-Cpdu-Cmds INTEGER (1..128) ::= 2
+CPDU-Index ::= INTEGER (0..1)
+
+CPDU-Cmd ::= CPDU-Command {CPDU-Identifiers, Seq-Pulse-Inst}
+                 (WITH COMPONENTS {..., cpdu-id PRESENT})
+
+
+-- Instantiate the TC-2-4 for my project:
+TC-2-4 ::= Distribute-CPDU-Commands {CPDU-Cmd, max-Cpdu-Cmds}
+
+-- Create the full list of TCs used in my project
+TCs ::= CHOICE {
+   tc2-4 TC-2-4
+}
+
+-- Finally instantiate the Telecommand type
+Telecommand ::= Telecommand-ty { APID, SEQ-COUNT-OR-NAME, TCs }
+
+END
+TASTE-BasicTypes DEFINITIONS ::=
+BEGIN
+
+-- Set of TASTE predefined basic types
+
+T-Int32 ::=  INTEGER (-2147483648 .. 2147483647)
+
+T-UInt32 ::= INTEGER (0 .. 4294967295)
+
+T-Int8 ::= INTEGER (-128 .. 127)
+
+T-UInt8 ::= INTEGER (0 .. 255)
+
+T-Boolean ::= BOOLEAN
+
+END
+

tests/regression/test-pus/flight.pr

+/* CIF PROCESS (250, 150), (150, 75) */
+PROCESS flight;
+    /* CIF TEXT (572, 40), (290, 140) */
+    dcl myAPID APID := flight;
+dcl mytc Telecommand;
+    /* CIF ENDTEXT */
+    /* CIF START (389, 12), (70, 35) */
+    START;
+        /* CIF NEXTSTATE (389, 62), (70, 35) */
+        NEXTSTATE Wait;
+    /* CIF STATE (389, 62), (70, 35) */
+    STATE Wait;
+        /* CIF INPUT (345, 117), (156, 35) */
+        INPUT telecommand(mytc);
+            /* CIF DECISION (323, 172), (200, 50) */
+            DECISION present(mytc!packet_data);
+                /* CIF ANSWER (324, 242), (109, 24) */
+                (tc2_4):
+                    /* CIF OUTPUT (190, 286), (377, 35) */
+                    OUTPUT Distribute_CPDU_Commands(mytc!packet_data!tc2_4);
+                /* CIF ANSWER (582, 242), (70, 24) */
+                else:
+            ENDDECISION;
+            /* CIF NEXTSTATE (388, 336), (70, 35) */
+            NEXTSTATE wait;
+    ENDSTATE;
+ENDPROCESS flight;
\ No newline at end of file

tests/regression/test-pus/system_structure.pr

+/* CIF Keep Specific Geode ASNFilename 'dataview-uniq.asn' */
+USE Datamodel;
+SYSTEM flight;
+
+	/* CIF Keep Specific Geode PARAMNAMES tcdata */
+	SIGNAL telecommand (Telecommand);
+
+	/* CIF Keep Specific Geode PARAMNAMES instr */
+	SIGNAL Distribute_CPDU_Commands (TC_2_4);
+
+	CHANNEL c
+		FROM ENV TO flight WITH telecommand;
+		FROM flight TO ENV WITH Distribute_CPDU_Commands;
+	ENDCHANNEL;
+
+	BLOCK flight;
+
+		SIGNALROUTE r
+			FROM ENV TO flight WITH telecommand;
+			FROM flight TO ENV WITH Distribute_CPDU_Commands;
+
+		CONNECT c and r;
+
+		PROCESS flight REFERENCED;
+
+	ENDBLOCK;
+
+ENDSYSTEM;
\ No newline at end of file

tests/regression/test-recursion/og.pr

@@ -27,19 +27,19 @@ dcl res path;
             /* CIF ENDTEXT */
             /* CIF PROCEDURE (460, 209), (75, 35) */
             PROCEDURE findpath;
-                /* CIF TEXT (129, 18), (183, 98) */
-                fpar
-    in startnode letter,
-    in endnode letter,
-    in my_tree Tree,
-    in/out best_path Path;
-                /* CIF ENDTEXT */
                 /* CIF TEXT (0, 131), (272, 140) */
                 dcl result Path := { cost 0, elem {} };
 
 dcl elem Path_elem := {};
 
 dcl single Letter;
+                /* CIF ENDTEXT */
+                /* CIF TEXT (129, 18), (183, 98) */
+                fpar
+    in startnode letter,
+    in endnode letter,
+    in my_tree Tree,
+    in/out best_path Path;
                 /* CIF ENDTEXT */
                 /* CIF START (521, 64), (70, 35) */
                 START;
@@ -94,7 +94,7 @@ my_tree(d) := {{cost 1, son h}},
 my_tree(e) := {{cost 7, son h}},
 my_tree(f) := {{cost 1, son g}},
 my_tree(g) := {},
-my_tree(h) := {{cost 3, son g}};
+my_tree(h) := {{cost 5, son g}};
                 /* CIF PROCEDURECALL (97, 419), (186, 35) */
                 CALL findpath(a, g, my_tree, res);
                 /* CIF PROCEDURECALL (89, 474), (201, 35) */