From e3f48ad947ee57baf7a731c31ec2435ddfad609b Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 4 Dec 2024 10:15:08 -0800 Subject: [PATCH 1/2] Revise fpp-depend tests --- compiler/tools/fpp-depend/test/def_state_machine.fpp | 11 +++++++++++ .../tools/fpp-depend/test/def_state_machine.ref.txt | 3 +++ compiler/tools/fpp-depend/test/tests.sh | 1 + compiler/tools/fpp-depend/test/update-ref | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 compiler/tools/fpp-depend/test/def_state_machine.fpp create mode 100644 compiler/tools/fpp-depend/test/def_state_machine.ref.txt diff --git a/compiler/tools/fpp-depend/test/def_state_machine.fpp b/compiler/tools/fpp-depend/test/def_state_machine.fpp new file mode 100644 index 000000000..420e99250 --- /dev/null +++ b/compiler/tools/fpp-depend/test/def_state_machine.fpp @@ -0,0 +1,11 @@ +locate type A at "A.fpp" +locate type G at "G.fpp" +locate constant s at "s.fpp" + +state machine M { + + action a: A + guard g: G + signal s: string size s + +} diff --git a/compiler/tools/fpp-depend/test/def_state_machine.ref.txt b/compiler/tools/fpp-depend/test/def_state_machine.ref.txt new file mode 100644 index 000000000..0261047c2 --- /dev/null +++ b/compiler/tools/fpp-depend/test/def_state_machine.ref.txt @@ -0,0 +1,3 @@ +[ local path prefix ]/compiler/tools/fpp-depend/test/A.fpp +[ local path prefix ]/compiler/tools/fpp-depend/test/G.fpp +[ local path prefix ]/compiler/tools/fpp-depend/test/s.fpp diff --git a/compiler/tools/fpp-depend/test/tests.sh b/compiler/tools/fpp-depend/test/tests.sh index c28d9d3c9..72ef558b1 100644 --- a/compiler/tools/fpp-depend/test/tests.sh +++ b/compiler/tools/fpp-depend/test/tests.sh @@ -4,6 +4,7 @@ def_component_instance def_constant def_enum def_port +def_state_machine def_struct direct enum_constant diff --git a/compiler/tools/fpp-depend/test/update-ref b/compiler/tools/fpp-depend/test/update-ref index efde8bae9..f4890a884 100755 --- a/compiler/tools/fpp-depend/test/update-ref +++ b/compiler/tools/fpp-depend/test/update-ref @@ -44,22 +44,22 @@ direct() { filenames() { update '-g filenames_generated_output.ref.txt -u filenames_ut_output.ref.txt' \ - filenames + ../../fpp-filenames/test/ok filenames } filenames_auto() { update '-a -g filenames_auto_generated_output.ref.txt -u filenames_auto_ut_output.ref.txt' \ - filenames + ../../fpp-filenames/test/ok filenames } filenames_include() { update '-g filenames_include_generated_output.ref.txt -u filenames_include_ut_output.ref.txt' \ - filenames_include + ../../fpp-filenames/test/include filenames_include } filenames_include_auto() { update '-a -g filenames_include_auto_generated_output.ref.txt -u filenames_include_auto_ut_output.ref.txt' \ - filenames_include + ../../fpp-filenames/test/include filenames_include } framework() { From 846aa09b07d8ad1bcb9cefd0410fdc267c6bb79b Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 4 Dec 2024 11:16:54 -0800 Subject: [PATCH 2/2] Revise tests for fpp-locate-uses --- compiler/tools/fpp-locate-uses/test/defs.fpp | 5 +++++ compiler/tools/fpp-locate-uses/test/stdin.ref.txt | 4 ++++ compiler/tools/fpp-locate-uses/test/uses.ref.txt | 4 ++++ compiler/tools/fpp-locate-uses/test/uses/uses.fpp | 13 +++++++++++++ .../tools/fpp-locate-uses/test/uses_dir.ref.txt | 4 ++++ 5 files changed, 30 insertions(+) diff --git a/compiler/tools/fpp-locate-uses/test/defs.fpp b/compiler/tools/fpp-locate-uses/test/defs.fpp index ef59aa0d2..0209c1ab2 100644 --- a/compiler/tools/fpp-locate-uses/test/defs.fpp +++ b/compiler/tools/fpp-locate-uses/test/defs.fpp @@ -83,3 +83,8 @@ constant record_id = 0 constant container_id = 0 constant container_priority = 0 constant product_recv_priority = 0 + +type ActionType +type GuardType +type SignalType +constant SignalConstant = 10 diff --git a/compiler/tools/fpp-locate-uses/test/stdin.ref.txt b/compiler/tools/fpp-locate-uses/test/stdin.ref.txt index 2451bd406..149dfcb35 100644 --- a/compiler/tools/fpp-locate-uses/test/stdin.ref.txt +++ b/compiler/tools/fpp-locate-uses/test/stdin.ref.txt @@ -2,6 +2,7 @@ locate component C1 at "defs.fpp" locate component M.C1 at "defs.fpp" locate constant C1.a at "defs.fpp" locate constant M.a at "defs.fpp" +locate constant SignalConstant at "defs.fpp" locate constant a at "defs.fpp" locate constant base_id_def at "defs.fpp" locate constant container_id at "defs.fpp" @@ -34,11 +35,13 @@ locate state machine S at "defs.fpp" locate topology M.T1 at "defs.fpp" locate topology T1 at "defs.fpp" locate type A at "defs.fpp" +locate type ActionType at "defs.fpp" locate type C1.A at "defs.fpp" locate type C1.E at "defs.fpp" locate type C1.S at "defs.fpp" locate type C1.T at "defs.fpp" locate type E at "defs.fpp" +locate type GuardType at "defs.fpp" locate type M.A at "defs.fpp" locate type M.E at "defs.fpp" locate type M.S at "defs.fpp" @@ -46,4 +49,5 @@ locate type M.T at "defs.fpp" locate type Phases at "defs.fpp" locate type RecordType at "defs.fpp" locate type S at "defs.fpp" +locate type SignalType at "defs.fpp" locate type T at "defs.fpp" diff --git a/compiler/tools/fpp-locate-uses/test/uses.ref.txt b/compiler/tools/fpp-locate-uses/test/uses.ref.txt index 2451bd406..149dfcb35 100644 --- a/compiler/tools/fpp-locate-uses/test/uses.ref.txt +++ b/compiler/tools/fpp-locate-uses/test/uses.ref.txt @@ -2,6 +2,7 @@ locate component C1 at "defs.fpp" locate component M.C1 at "defs.fpp" locate constant C1.a at "defs.fpp" locate constant M.a at "defs.fpp" +locate constant SignalConstant at "defs.fpp" locate constant a at "defs.fpp" locate constant base_id_def at "defs.fpp" locate constant container_id at "defs.fpp" @@ -34,11 +35,13 @@ locate state machine S at "defs.fpp" locate topology M.T1 at "defs.fpp" locate topology T1 at "defs.fpp" locate type A at "defs.fpp" +locate type ActionType at "defs.fpp" locate type C1.A at "defs.fpp" locate type C1.E at "defs.fpp" locate type C1.S at "defs.fpp" locate type C1.T at "defs.fpp" locate type E at "defs.fpp" +locate type GuardType at "defs.fpp" locate type M.A at "defs.fpp" locate type M.E at "defs.fpp" locate type M.S at "defs.fpp" @@ -46,4 +49,5 @@ locate type M.T at "defs.fpp" locate type Phases at "defs.fpp" locate type RecordType at "defs.fpp" locate type S at "defs.fpp" +locate type SignalType at "defs.fpp" locate type T at "defs.fpp" diff --git a/compiler/tools/fpp-locate-uses/test/uses/uses.fpp b/compiler/tools/fpp-locate-uses/test/uses/uses.fpp index 6e9042eea..65184f19b 100644 --- a/compiler/tools/fpp-locate-uses/test/uses/uses.fpp +++ b/compiler/tools/fpp-locate-uses/test/uses/uses.fpp @@ -74,3 +74,16 @@ module M { } } + +state machine SM { + + action a: ActionType + guard g: GuardType + signal s1: SignalType + signal s2: string size SignalConstant + + initial enter S + + state S + +} diff --git a/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt b/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt index cd2325353..14b783f7c 100644 --- a/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt +++ b/compiler/tools/fpp-locate-uses/test/uses_dir.ref.txt @@ -2,6 +2,7 @@ locate component C1 at "../defs.fpp" locate component M.C1 at "../defs.fpp" locate constant C1.a at "../defs.fpp" locate constant M.a at "../defs.fpp" +locate constant SignalConstant at "../defs.fpp" locate constant a at "../defs.fpp" locate constant base_id_def at "../defs.fpp" locate constant container_id at "../defs.fpp" @@ -34,11 +35,13 @@ locate state machine S at "../defs.fpp" locate topology M.T1 at "../defs.fpp" locate topology T1 at "../defs.fpp" locate type A at "../defs.fpp" +locate type ActionType at "../defs.fpp" locate type C1.A at "../defs.fpp" locate type C1.E at "../defs.fpp" locate type C1.S at "../defs.fpp" locate type C1.T at "../defs.fpp" locate type E at "../defs.fpp" +locate type GuardType at "../defs.fpp" locate type M.A at "../defs.fpp" locate type M.E at "../defs.fpp" locate type M.S at "../defs.fpp" @@ -46,4 +49,5 @@ locate type M.T at "../defs.fpp" locate type Phases at "../defs.fpp" locate type RecordType at "../defs.fpp" locate type S at "../defs.fpp" +locate type SignalType at "../defs.fpp" locate type T at "../defs.fpp"