Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename PARAM_SET/SAVE to PRM_SET/SAVE #562

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Rename PARAM_SET/SAVE to PRM_SET/SAVE #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb9403e
rename PARAM_SET/SAVE to PRM_SET/SAVE, regenerate tests
jwest115 Jan 8, 2025
9061c51
update param set/save command names in fpp-check test
jwest115 Jan 8, 2025
010e46f
Merge remote-tracking branch 'upstream/main' into issue-561
bocchino Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/lib/src/main/scala/analysis/Semantics/Command.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-check/test/command/duplicate_name_param_save.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ active component C {

param P: U32

async command P_PARAM_SAVE
async command P_PRM_SAVE

}
4 changes: 2 additions & 2 deletions compiler/tools/fpp-check/test/command/duplicate_name_param_save.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-check/test/command/duplicate_name_param_set.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ active component C {

param P: U32

async command P_PARAM_SET
async command P_PRM_SET

}
4 changes: 2 additions & 2 deletions compiler/tools/fpp-check/test/command/duplicate_name_param_set.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 10 additions & 10 deletions compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : [
Expand All @@ -238,31 +238,31 @@
"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" : [
],
"annotation" : "Parameter of type enum"
},
{
"name" : "Module1.myFirstC1.PARAM3_PARAM_SAVE",
"name" : "Module1.myFirstC1.PARAM3_PRM_SAVE",
"commandKind" : "save",
"opcode" : 901,
"formalParams" : [
],
"annotation" : "Parameter of type string"
},
{
"name" : "Module1.myFirstC1.PARAM1_PARAM_SAVE",
"name" : "Module1.myFirstC1.PARAM1_PRM_SAVE",
"commandKind" : "save",
"opcode" : 773,
"formalParams" : [
],
"annotation" : "Parameter (struct)"
},
{
"name" : "Module1.myFirstC1.PARAM3_PARAM_SET",
"name" : "Module1.myFirstC1.PARAM3_PRM_SET",
"commandKind" : "set",
"opcode" : 900,
"formalParams" : [
Expand Down Expand Up @@ -353,15 +353,15 @@
"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" : [
],
"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" : [
Expand Down Expand Up @@ -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" : [
Expand All @@ -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" : [
Expand All @@ -438,7 +438,7 @@
"annotation" : "Parameter (struct)"
},
{
"name" : "Module1.myFirstC1.PARAM4_PARAM_SAVE",
"name" : "Module1.myFirstC1.PARAM4_PRM_SAVE",
"commandKind" : "save",
"opcode" : 903,
"formalParams" : [
Expand Down
4 changes: 2 additions & 2 deletions compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
],
"commands" : [
{
"name" : "M.I1.P_PARAM_SET",
"name" : "M.I1.P_PRM_SET",
"commandKind" : "set",
"opcode" : 256,
"formalParams" : [
Expand All @@ -53,7 +53,7 @@
]
},
{
"name" : "M.I1.P_PARAM_SAVE",
"name" : "M.I1.P_PRM_SAVE",
"commandKind" : "save",
"opcode" : 257,
"formalParams" : [
Expand Down
20 changes: 10 additions & 10 deletions compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
],
"commands" : [
{
"name" : "Module1.mySecondC1.PARAM2_PARAM_SAVE",
"name" : "Module1.mySecondC1.PARAM2_PRM_SAVE",
"commandKind" : "save",
"opcode" : 1411,
"formalParams" : [
Expand All @@ -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" : [
Expand Down Expand Up @@ -276,23 +276,23 @@
"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" : [
],
"annotation" : "Parameter of type string"
},
{
"name" : "Module1.mySecondC1.PARAM1_PARAM_SAVE",
"name" : "Module1.mySecondC1.PARAM1_PRM_SAVE",
"commandKind" : "save",
"opcode" : 1285,
"formalParams" : [
],
"annotation" : "Parameter (struct)"
},
{
"name" : "Module1.mySecondC1.PARAM3_PARAM_SET",
"name" : "Module1.mySecondC1.PARAM3_PRM_SET",
"commandKind" : "set",
"opcode" : 1412,
"formalParams" : [
Expand Down Expand Up @@ -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" : [
Expand Down Expand Up @@ -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" : [
Expand Down Expand Up @@ -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" : [
Expand All @@ -430,7 +430,7 @@
"annotation" : "Parameter (struct)"
},
{
"name" : "Module1.mySecondC1.PARAM5_PARAM_SET",
"name" : "Module1.mySecondC1.PARAM5_PRM_SET",
"commandKind" : "set",
"opcode" : 1416,
"formalParams" : [
Expand All @@ -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" : [
Expand Down
4 changes: 2 additions & 2 deletions compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
],
"commands" : [
{
"name" : "I2.P_PARAM_SET",
"name" : "I2.P_PRM_SET",
"commandKind" : "set",
"opcode" : 768,
"formalParams" : [
Expand All @@ -53,7 +53,7 @@
]
},
{
"name" : "I2.P_PARAM_SAVE",
"name" : "I2.P_PRM_SAVE",
"commandKind" : "save",
"opcode" : 769,
"formalParams" : [
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-dict/test/top/dataProducts.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ module FppTest {
}

}
}
}
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-dict/test/top/duplicate.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ module M {
}

topology Duplicate {
}
}
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-dict/test/top/multipleTops.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,4 +269,4 @@ module Module1 {

}

}
}
Empty file added compiler/tools/fpp-to-dict/test/top/unqualifiedComponentInstances.ref.txt
View file
Open in desktop
Empty file.