@@ -172,25 +172,36 @@ proc module-sc {command args} {
172172 show_mtime show_filter search_filter search_match dump_state\
173173 addpath_pos not_req tag_list args
174174 set modspeclist [parseModuleSpecification 0 0 0 0 {*}$args ]
175+
176+ # no require/incompat extra specifier alias if --not-req option is set
177+ if {$not_req } {
178+ set xtaliasinc {}
179+ set xtaliasreq {}
180+ } else {
181+ set xtaliasinc [list incompat]
182+ set xtaliasreq [list require]
183+ }
184+
175185 if {$command eq {switch }} {
176186 # distinguish switched-off module spec from switched-on
177187 # ignore command without or with too much argument
178188 switch -- [llength $modspeclist ] {
179189 {1} {
180190 # no switched-off module with one-arg form
181- recordScanModuleElt $modspeclist switch switch-on require
191+ recordScanModuleElt $modspeclist switch switch-on\
192+ {*}$xtaliasreq
182193 }
183194 {2} {
184195 lassign $modspeclist swoffarg swonarg
185- recordScanModuleElt $swoffarg switch switch-off incompat
186- recordScanModuleElt $swonarg switch switch-on require
196+ recordScanModuleElt $swoffarg switch switch-off {*} $xtaliasinc
197+ recordScanModuleElt $swonarg switch switch-on {*} $xtaliasreq
187198 }
188199 }
189200 } else {
190- set xtalias [expr {$command eq {unload} ? {incompat} : {require} }]
201+ set xtalias [expr {$command eq {unload} ? $xtaliasinc : $xtaliasreq }]
191202 # record each module spec
192203 foreach modspec $modspeclist {
193- recordScanModuleElt $modspec $command $xtalias
204+ recordScanModuleElt $modspec $command {*} $xtalias
194205 }
195206 }
196207 }
0 commit comments