From b9796910024b392dc4617b03f623451f46b673ae Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sat, 14 Sep 2024 10:56:27 -0500 Subject: [PATCH] Issue #690: change --hidden-load to --hidden-loaded; change Lmod to use hidden_loaded instead of hidden_load --- rt/modulerc/err.txt | 6 +-- rt/modulerc/mfB/Core/ABC/.modulerc.lua | 2 +- rt/modulerc/mfB/Core/C/.modulerc.lua | 2 +- rt/modulerc/mfB/Core/E/.modulerc.lua | 2 +- rt/modulerc/modulerc.tdesc | 2 +- rt/modulerc/out.txt | 26 ++++++------- src/MName.lua | 6 +-- src/MRC.lua | 52 +++++++++++++------------- src/RC2lua.tcl | 4 +- src/cmdfuncs.lua | 2 +- src/mrc_funcs.lua | 20 +++++----- src/utils.lua | 2 +- 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt index d4e8533ba..8c9746f28 100644 --- a/rt/modulerc/err.txt +++ b/rt/modulerc/err.txt @@ -733,7 +733,7 @@ _ModuleTable_ = { fullName = "ABC/2.5", loadOrder = 1, moduleKindT = { - hidden_load = true, + hidden_loaded = true, kind = "soft", }, propT = {}, @@ -747,7 +747,7 @@ _ModuleTable_ = { fullName = "C/3.0", loadOrder = 2, moduleKindT = { - hidden_load = true, + hidden_loaded = true, kind = "soft", }, propT = {}, @@ -771,7 +771,7 @@ _ModuleTable_ = { fullName = "E/3.0", loadOrder = 4, moduleKindT = { - hidden_load = true, + hidden_loaded = true, kind = "soft", }, propT = {}, diff --git a/rt/modulerc/mfB/Core/ABC/.modulerc.lua b/rt/modulerc/mfB/Core/ABC/.modulerc.lua index 931251681..fe8d4428b 100644 --- a/rt/modulerc/mfB/Core/ABC/.modulerc.lua +++ b/rt/modulerc/mfB/Core/ABC/.modulerc.lua @@ -1,5 +1,5 @@ hide{name="ABC/0.5", kind="hard"} -hide{name="ABC/2.5", kind="soft",hidden_load=true} +hide{name="ABC/2.5", kind="soft",hidden_loaded=true} hide{name="ABC/3.0", kind="soft"} hide{name="ABC/4.0", kind="hidden"} hide{name="ABC/5.0", kind="hard"} diff --git a/rt/modulerc/mfB/Core/C/.modulerc.lua b/rt/modulerc/mfB/Core/C/.modulerc.lua index 535b24ff7..88793bd29 100644 --- a/rt/modulerc/mfB/Core/C/.modulerc.lua +++ b/rt/modulerc/mfB/Core/C/.modulerc.lua @@ -1 +1 @@ -hide{name="C",kind="soft",hidden_load=true} +hide{name="C",kind="soft",hidden_loaded=true} diff --git a/rt/modulerc/mfB/Core/E/.modulerc.lua b/rt/modulerc/mfB/Core/E/.modulerc.lua index d49a3e8b4..e92350d2f 100644 --- a/rt/modulerc/mfB/Core/E/.modulerc.lua +++ b/rt/modulerc/mfB/Core/E/.modulerc.lua @@ -1 +1 @@ -hide{name="E",kind="soft",hidden_load=true} +hide{name="E",kind="soft",hidden_loaded=true} diff --git a/rt/modulerc/modulerc.tdesc b/rt/modulerc/modulerc.tdesc index 3d8fb5a92..171f9bd7b 100644 --- a/rt/modulerc/modulerc.tdesc +++ b/rt/modulerc/modulerc.tdesc @@ -163,7 +163,7 @@ EOF runBase runSpiderCmd -o spiderT $MODULEPATH #60 runBase runSpiderCmd -o dbT $MODULEPATH #61 - # Test hidden_load feature + # Test hidden_loaded feature runLmod load C D E F #62 runLmod --mt #63 runLmod list #64 diff --git a/rt/modulerc/out.txt b/rt/modulerc/out.txt index 882cbfb25..22a1dedb7 100644 --- a/rt/modulerc/out.txt +++ b/rt/modulerc/out.txt @@ -1413,7 +1413,7 @@ MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 56 @@ -1421,7 +1421,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 57 @@ -1429,7 +1429,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A list =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 58 @@ -1437,7 +1437,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden avail =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 59 @@ -1445,7 +1445,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing avail =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 60 @@ -1469,7 +1469,7 @@ mrcMpathT = { }, ["ABC/2.5"] = { action = "hide", - hidden_load = true, + hidden_loaded = true, kind = "soft", name = "ABC/2.5", }, @@ -1510,13 +1510,13 @@ mrcMpathT = { }, C = { action = "hide", - hidden_load = true, + hidden_loaded = true, kind = "soft", name = "C", }, E = { action = "hide", - hidden_load = true, + hidden_loaded = true, kind = "soft", name = "E", }, @@ -2017,7 +2017,7 @@ MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; _LMFILES_=ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua:ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua:ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua:ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua:ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua; export _LMFILES_; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 63 @@ -2029,7 +2029,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 65 @@ -2037,7 +2037,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden list =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 66 @@ -2045,7 +2045,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing spider =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 67 @@ -2053,7 +2053,7 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing -A spider =========================== MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_load=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/2.5.lua",fullName="ABC/2.5",loadOrder=1,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="ABC/2.5",wV="000000002.000000005.*zfinal",},C={fn="ProjectDIR/rt/modulerc/mfB/Core/C/3.0.lua",fullName="C/3.0",loadOrder=2,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="C",wV="000000003.*zfinal",},D={fn="ProjectDIR/rt/modulerc/mfB/Core/D/1.1.lua",fullName="D/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="D",wV="000000001.000000001.*zfinal",},E={fn="ProjectDIR/rt/modulerc/mfB/Core/E/3.0.lua",fullName="E/3.0",loadOrder=4,moduleKindT={hidden_loaded=true,kind="soft",},propT={},stackDepth=0,status="active",userName="E",wV="000000003.*zfinal",},F={fn="ProjectDIR/rt/modulerc/mfB/Core/F/2.1.lua",fullName="F/2.1",loadOrder=5,propT={},stackDepth=0,status="active",userName="F",wV="000000002.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; export _ModuleTable_; =========================== step 68 diff --git a/src/MName.lua b/src/MName.lua index ab60bc77b..b297d251a 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -298,11 +298,11 @@ function M.moduleKindT(self) if (not self.__moduleKindT) then return nil end - local moduleKindT = self.__moduleKindT - local hidden_load = moduleKindT.hidden_load or nil + local moduleKindT = self.__moduleKindT + local hidden_loaded = moduleKindT.hidden_loaded or nil local t = nil if (moduleKindT.kind ~= "normal") then - t = {kind = moduleKindT.kind, hidden_load = hidden_load} + t = {kind = moduleKindT.kind, hidden_loaded = hidden_loaded} end return t end diff --git a/src/MRC.lua b/src/MRC.lua index a6533d224..8ebacff9d 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -634,9 +634,9 @@ local function l_check_hidden_modifiers(fullName, resultT, visibleT, show_hidden l_check_user_groups(resultT)) if (not hide_active) then - -- isVisible, hidden_load, kind, count + -- isVisible, hidden_loaded, kind, count dbg.fini("l_check_hidden_modifiers") - return true, false, "normal", true + return true, false, "normal", true end local isVisible if (show_hidden) then @@ -649,32 +649,32 @@ local function l_check_hidden_modifiers(fullName, resultT, visibleT, show_hidden dbg.print{"fullName: ",fullName,", resultT.kind: ", resultT.kind, ", count: ",count,"\n"} dbg.fini("l_check_hidden_modifiers") - return isVisible, resultT.hidden_load, resultT.kind, count + return isVisible, resultT.hidden_loaded, resultT.kind, count end -- modT is a table with: sn, fullName and fn function M.isVisible(self, modT) dbg.start{"MRC:isVisible(modT}"} - local frameStk = require("FrameStk"):singleton() - local mname = frameStk:mname() - local mt = frameStk:mt() - local mpathA = modT.mpathA or mt:modulePathA() - local fullName = modT.fullName - local fn = modT.fn - local sn = modT.sn - local show_hidden = modT.show_hidden - local isVisible = true - local visibleT = modT.visibleT or {} - local kind = "normal" - local hidden_load = false - local count = false - local my_resultT = nil + local frameStk = require("FrameStk"):singleton() + local mname = frameStk:mname() + local mt = frameStk:mt() + local mpathA = modT.mpathA or mt:modulePathA() + local fullName = modT.fullName + local fn = modT.fn + local sn = modT.sn + local show_hidden = modT.show_hidden + local isVisible = true + local visibleT = modT.visibleT or {} + local kind = "normal" + local hidden_loaded = false + local count = false + local my_resultT = nil ------------------------------------------------------------ -- resultT is nil if the modulefile is normal or -- {kind="hidden|soft|hard" -- before="