diff --git a/compiler/lib/src/main/scala/analysis/Semantics/Command.scala b/compiler/lib/src/main/scala/analysis/Semantics/Command.scala index 4c9fa1cd3..b292ca1d4 100644 --- a/compiler/lib/src/main/scala/analysis/Semantics/Command.scala +++ b/compiler/lib/src/main/scala/analysis/Semantics/Command.scala @@ -48,8 +48,8 @@ object Command { override def getName = { val paramName = aNode._2.data.name.toUpperCase kind match { - case Param.Save => s"${paramName}_PARAM_SAVE" - case Param.Set => s"${paramName}_PARAM_SET" + case Param.Save => s"${paramName}_PRM_SAVE" + case Param.Set => s"${paramName}_PRM_SET" } } } diff --git a/compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp b/compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp index 808ed7747..8bfd77582 100644 --- a/compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp +++ b/compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp @@ -2,6 +2,6 @@ active component C { param P: U32 - async command P_PARAM_SAVE + async command P_PRM_SAVE } diff --git a/compiler/tools/fpp-check/test/command/duplicate_name_param_save.ref.txt b/compiler/tools/fpp-check/test/command/duplicate_name_param_save.ref.txt index 18da5938d..d9aabcc63 100644 --- a/compiler/tools/fpp-check/test/command/duplicate_name_param_save.ref.txt +++ b/compiler/tools/fpp-check/test/command/duplicate_name_param_save.ref.txt @@ -1,8 +1,8 @@ fpp-check [ local path prefix ]/compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp:5.3 - async command P_PARAM_SAVE + async command P_PRM_SAVE ^ -error: duplicate command name P_PARAM_SAVE +error: duplicate command name P_PRM_SAVE previous occurrence is here: [ local path prefix ]/compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp:3.3 param P: U32 diff --git a/compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp b/compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp index 42003767a..a194ca5c3 100644 --- a/compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp +++ b/compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp @@ -2,6 +2,6 @@ active component C { param P: U32 - async command P_PARAM_SET + async command P_PRM_SET } diff --git a/compiler/tools/fpp-check/test/command/duplicate_name_param_set.ref.txt b/compiler/tools/fpp-check/test/command/duplicate_name_param_set.ref.txt index 719ebf51a..72698e2ea 100644 --- a/compiler/tools/fpp-check/test/command/duplicate_name_param_set.ref.txt +++ b/compiler/tools/fpp-check/test/command/duplicate_name_param_set.ref.txt @@ -1,8 +1,8 @@ fpp-check [ local path prefix ]/compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp:5.3 - async command P_PARAM_SET + async command P_PRM_SET ^ -error: duplicate command name P_PARAM_SET +error: duplicate command name P_PRM_SET previous occurrence is here: [ local path prefix ]/compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp:3.3 param P: U32 diff --git a/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json index 35e044681..df93cdfc5 100644 --- a/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json @@ -222,7 +222,7 @@ "annotation" : "Command with 1 arg (of type struct)" }, { - "name" : "Module1.myFirstC1.PARAM2_PARAM_SET", + "name" : "Module1.myFirstC1.PARAM2_PRM_SET", "commandKind" : "set", "opcode" : 898, "formalParams" : [ @@ -238,7 +238,7 @@ "annotation" : "Parameter of type array (with 4 U32 values)" }, { - "name" : "Module1.myFirstC1.PARAM5_PARAM_SAVE", + "name" : "Module1.myFirstC1.PARAM5_PRM_SAVE", "commandKind" : "save", "opcode" : 905, "formalParams" : [ @@ -246,7 +246,7 @@ "annotation" : "Parameter of type enum" }, { - "name" : "Module1.myFirstC1.PARAM3_PARAM_SAVE", + "name" : "Module1.myFirstC1.PARAM3_PRM_SAVE", "commandKind" : "save", "opcode" : 901, "formalParams" : [ @@ -254,7 +254,7 @@ "annotation" : "Parameter of type string" }, { - "name" : "Module1.myFirstC1.PARAM1_PARAM_SAVE", + "name" : "Module1.myFirstC1.PARAM1_PRM_SAVE", "commandKind" : "save", "opcode" : 773, "formalParams" : [ @@ -262,7 +262,7 @@ "annotation" : "Parameter (struct)" }, { - "name" : "Module1.myFirstC1.PARAM3_PARAM_SET", + "name" : "Module1.myFirstC1.PARAM3_PRM_SET", "commandKind" : "set", "opcode" : 900, "formalParams" : [ @@ -353,7 +353,7 @@ "annotation" : "Command with 3 args (of types string, I32, and bool)" }, { - "name" : "Module1.myFirstC1.PARAM2_PARAM_SAVE", + "name" : "Module1.myFirstC1.PARAM2_PRM_SAVE", "commandKind" : "save", "opcode" : 899, "formalParams" : [ @@ -361,7 +361,7 @@ "annotation" : "Parameter of type array (with 4 U32 values)" }, { - "name" : "Module1.myFirstC1.PARAM4_PARAM_SET", + "name" : "Module1.myFirstC1.PARAM4_PRM_SET", "commandKind" : "set", "opcode" : 902, "formalParams" : [ @@ -406,7 +406,7 @@ "annotation" : "Command with 2 args (array of strings and U32)" }, { - "name" : "Module1.myFirstC1.PARAM5_PARAM_SET", + "name" : "Module1.myFirstC1.PARAM5_PRM_SET", "commandKind" : "set", "opcode" : 904, "formalParams" : [ @@ -422,7 +422,7 @@ "annotation" : "Parameter of type enum" }, { - "name" : "Module1.myFirstC1.PARAM1_PARAM_SET", + "name" : "Module1.myFirstC1.PARAM1_PRM_SET", "commandKind" : "set", "opcode" : 772, "formalParams" : [ @@ -438,7 +438,7 @@ "annotation" : "Parameter (struct)" }, { - "name" : "Module1.myFirstC1.PARAM4_PARAM_SAVE", + "name" : "Module1.myFirstC1.PARAM4_PRM_SAVE", "commandKind" : "save", "opcode" : 903, "formalParams" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json index 8e64ae12d..d28a68af7 100644 --- a/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json @@ -38,7 +38,7 @@ ], "commands" : [ { - "name" : "M.I1.P_PARAM_SET", + "name" : "M.I1.P_PRM_SET", "commandKind" : "set", "opcode" : 256, "formalParams" : [ @@ -53,7 +53,7 @@ ] }, { - "name" : "M.I1.P_PARAM_SAVE", + "name" : "M.I1.P_PRM_SAVE", "commandKind" : "save", "opcode" : 257, "formalParams" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json index a5637c339..98c35e03e 100644 --- a/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json @@ -206,7 +206,7 @@ ], "commands" : [ { - "name" : "Module1.mySecondC1.PARAM2_PARAM_SAVE", + "name" : "Module1.mySecondC1.PARAM2_PRM_SAVE", "commandKind" : "save", "opcode" : 1411, "formalParams" : [ @@ -231,7 +231,7 @@ "annotation" : "Command with string arg" }, { - "name" : "Module1.mySecondC1.PARAM4_PARAM_SET", + "name" : "Module1.mySecondC1.PARAM4_PRM_SET", "commandKind" : "set", "opcode" : 1414, "formalParams" : [ @@ -276,7 +276,7 @@ "annotation" : "Command with 2 args (array of strings and U32)" }, { - "name" : "Module1.mySecondC1.PARAM3_PARAM_SAVE", + "name" : "Module1.mySecondC1.PARAM3_PRM_SAVE", "commandKind" : "save", "opcode" : 1413, "formalParams" : [ @@ -284,7 +284,7 @@ "annotation" : "Parameter of type string" }, { - "name" : "Module1.mySecondC1.PARAM1_PARAM_SAVE", + "name" : "Module1.mySecondC1.PARAM1_PRM_SAVE", "commandKind" : "save", "opcode" : 1285, "formalParams" : [ @@ -292,7 +292,7 @@ "annotation" : "Parameter (struct)" }, { - "name" : "Module1.mySecondC1.PARAM3_PARAM_SET", + "name" : "Module1.mySecondC1.PARAM3_PRM_SET", "commandKind" : "set", "opcode" : 1412, "formalParams" : [ @@ -330,7 +330,7 @@ "annotation" : "Command with I32 arg" }, { - "name" : "Module1.mySecondC1.PARAM2_PARAM_SET", + "name" : "Module1.mySecondC1.PARAM2_PRM_SET", "commandKind" : "set", "opcode" : 1410, "formalParams" : [ @@ -382,7 +382,7 @@ "annotation" : "Command with 3 args (of types string, I32, and bool)" }, { - "name" : "Module1.mySecondC1.PARAM4_PARAM_SAVE", + "name" : "Module1.mySecondC1.PARAM4_PRM_SAVE", "commandKind" : "save", "opcode" : 1415, "formalParams" : [ @@ -414,7 +414,7 @@ "annotation" : "Command with 1 arg (of type struct)" }, { - "name" : "Module1.mySecondC1.PARAM1_PARAM_SET", + "name" : "Module1.mySecondC1.PARAM1_PRM_SET", "commandKind" : "set", "opcode" : 1284, "formalParams" : [ @@ -430,7 +430,7 @@ "annotation" : "Parameter (struct)" }, { - "name" : "Module1.mySecondC1.PARAM5_PARAM_SET", + "name" : "Module1.mySecondC1.PARAM5_PRM_SET", "commandKind" : "set", "opcode" : 1416, "formalParams" : [ @@ -446,7 +446,7 @@ "annotation" : "Parameter of type enum" }, { - "name" : "Module1.mySecondC1.PARAM5_PARAM_SAVE", + "name" : "Module1.mySecondC1.PARAM5_PRM_SAVE", "commandKind" : "save", "opcode" : 1417, "formalParams" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json index 4cfebfd39..004c05a86 100644 --- a/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json @@ -38,7 +38,7 @@ ], "commands" : [ { - "name" : "I2.P_PARAM_SET", + "name" : "I2.P_PRM_SET", "commandKind" : "set", "opcode" : 768, "formalParams" : [ @@ -53,7 +53,7 @@ ] }, { - "name" : "I2.P_PARAM_SAVE", + "name" : "I2.P_PRM_SAVE", "commandKind" : "save", "opcode" : 769, "formalParams" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/dataProducts.fpp b/compiler/tools/fpp-to-dict/test/top/dataProducts.fpp index d9d38021d..0d4cf5d52 100644 --- a/compiler/tools/fpp-to-dict/test/top/dataProducts.fpp +++ b/compiler/tools/fpp-to-dict/test/top/dataProducts.fpp @@ -108,4 +108,4 @@ module FppTest { } } -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-dict/test/top/duplicate.fpp b/compiler/tools/fpp-to-dict/test/top/duplicate.fpp index 927eb70c3..7b4fa3445 100644 --- a/compiler/tools/fpp-to-dict/test/top/duplicate.fpp +++ b/compiler/tools/fpp-to-dict/test/top/duplicate.fpp @@ -5,4 +5,4 @@ module M { } topology Duplicate { -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-dict/test/top/multipleTops.fpp b/compiler/tools/fpp-to-dict/test/top/multipleTops.fpp index f709918b7..8d440ab91 100644 --- a/compiler/tools/fpp-to-dict/test/top/multipleTops.fpp +++ b/compiler/tools/fpp-to-dict/test/top/multipleTops.fpp @@ -269,4 +269,4 @@ module Module1 { } -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-dict/test/top/unqualifiedComponentInstances.ref.txt b/compiler/tools/fpp-to-dict/test/top/unqualifiedComponentInstances.ref.txt new file mode 100644 index 000000000..e69de29bb