jn
/
punkshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix pipe = commands

master
Julian Noble 1 year ago
parent
39160bf742
commit
2796eb5563
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/modules/punk-0.1.tm
  2. 4
      src/modules/punk/ns-999999.0a1.0.tm

28
src/modules/punk-0.1.tm
Unescape View File

@ -436,7 +436,7 @@ namespace eval punk {
scan $s %${p}s%s scan $s %${p}s%s
} }
proc _split_patterns {varspecs} { proc _split_patterns {varspecs} {
set name_mapped [pipecmd_rhsmapping $varspecs] set name_mapped [pipecmd_namemapping $varspecs]
set cmdname ::punk::pipecmds::split_patterns_$name_mapped set cmdname ::punk::pipecmds::split_patterns_$name_mapped
if {$cmdname in [info commands $cmdname]} { if {$cmdname in [info commands $cmdname]} {
return [$cmdname] return [$cmdname]
@ -1876,7 +1876,7 @@ namespace eval punk {
proc _var_classify {multivar} { proc _var_classify {multivar} {
set cmdname ::punk::pipecmds::var_classify_$multivar set cmdname ::punk::pipecmds::var_classify_[pipecmd_namemapping $multivar]
if {$cmdname in [info commands $cmdname]} { if {$cmdname in [info commands $cmdname]} {
return [$cmdname] return [$cmdname]
} }
@ -2848,8 +2848,10 @@ namespace eval punk {
#map rhs to names suitable to use in pipemcd proc name (whitespace mapping) #map rhs to names suitable to use in pipemcd proc name (whitespace mapping)
# (for .= and = pipecmds) # (for .= and = pipecmds)
proc pipecmd_rhsmapping {rhs} { proc pipecmd_namemapping {rhs} {
return [string map [list " " "<sp>" \t "<tab>"] $rhs] set rhs [string trim $rhs];#ignore all leading & trailing whitespace
set rhs [regsub -all {\s{1,}} $rhs {<sp>}] ;#collapse all internal whitespace to a single <sp> token
return $rhs
} }
#same as used in unknown func for initial launch #same as used in unknown func for initial launch
@ -2865,16 +2867,16 @@ namespace eval punk {
} }
#puts stderr ">> match_assign '$scopepattern=$equalsrhs' $args" #puts stderr ">> match_assign '$scopepattern=$equalsrhs' $args"
set fulltail $args set fulltail $args
set homens ::punk::pipecmds set cmdns ::punk::pipecmds
set rhsmapping [pipecmd_rhsmapping $equalsrhs] set namemapping [pipecmd_namemapping $equalsrhs]
set pipecmd ${homens}::$scopepattern=$rhsmapping set pipecmd ${cmdns}::$scopepattern=$namemapping
#pipecmd could have glob chars - test $pipcmd in the list - not just that info commands returns results. #pipecmd could have glob chars - test $pipcmd in the list - not just that info commands returns results.
if {$pipecmd in [info commands $pipecmd]} { if {$pipecmd in [info commands $pipecmd]} {
#puts "==nscaller: '[uplevel 1 [list namespace current]]'" #puts "==nscaller: '[uplevel 1 [list namespace current]]'"
#uplevel 1 [list ::namespace import $pipecmd] #uplevel 1 [list ::namespace import $pipecmd]
set existing_path [uplevel 1 [list ::namespace path]] set existing_path [uplevel 1 [list ::namespace path]]
if {$homens ni $existing_path} { if {$cmdns ni $existing_path} {
uplevel 1 [list ::namespace path [concat $existing_path $homens]] uplevel 1 [list ::namespace path [concat $existing_path $cmdns]]
} }
tailcall $pipecmd {*}$args tailcall $pipecmd {*}$args
} }
@ -3037,8 +3039,8 @@ namespace eval punk {
debug.punk.pipe.compile {match_assign creating proc $pipecmd} 2 debug.punk.pipe.compile {match_assign creating proc $pipecmd} 2
uplevel 1 [list ::proc $pipecmd args $script] uplevel 1 [list ::proc $pipecmd args $script]
set existing_path [uplevel 1 [list ::namespace path]] set existing_path [uplevel 1 [list ::namespace path]]
if {$homens ni $existing_path} { if {$cmdns ni $existing_path} {
uplevel 1 [list ::namespace path [concat $existing_path $homens]] uplevel 1 [list ::namespace path [concat $existing_path $cmdns]]
} }
tailcall $pipecmd {*}$args tailcall $pipecmd {*}$args
} }
@ -3683,7 +3685,7 @@ namespace eval punk {
set segment_members_filled [list] set segment_members_filled [list]
set segmenttail $segment_members ;# todo - change to segment_members here to match punk::match_assign set segmenttail $segment_members ;# todo - change to segment_members here to match punk::match_assign
set rhsmapped [pipecmd_rhsmapping $rhs] set rhsmapped [pipecmd_namemapping $rhs]
set cmdname "::punk::pipecmds::insertion_$rhsmapped" set cmdname "::punk::pipecmds::insertion_$rhsmapped"
#commandname can contain glob chars - must search for exact membership in 'info commands' result. #commandname can contain glob chars - must search for exact membership in 'info commands' result.
if {$cmdname ni [info commands $cmdname]} { if {$cmdname ni [info commands $cmdname]} {
@ -4227,7 +4229,7 @@ namespace eval punk {
} else { } else {
set nscaller [uplevel 1 [list ::namespace current]] set nscaller [uplevel 1 [list ::namespace current]]
#jmn #jmn
set rhsmapped [pipecmd_rhsmapping $equalsrhs] set rhsmapped [pipecmd_namemapping $equalsrhs]
set commands [uplevel 1 [list ::info commands $pattern=$rhsmapped]] ;#uplevel - or else we are checking from perspective of this namespace ::punk set commands [uplevel 1 [list ::info commands $pattern=$rhsmapped]] ;#uplevel - or else we are checking from perspective of this namespace ::punk
#we must check for exact match of the command in the list - because command could have glob chars. #we must check for exact match of the command in the list - because command could have glob chars.
if {"$pattern=$rhsmapped" in $commands} { if {"$pattern=$rhsmapped" in $commands} {

4
src/modules/punk/ns-999999.0a1.0.tm
Unescape View File

@ -1124,6 +1124,7 @@ namespace eval punk::ns {
set nsdict [dict create\ set nsdict [dict create\
location $location\
children [lsort $childtailmatches]\ children [lsort $childtailmatches]\
commands $commands\ commands $commands\
procs $procs\ procs $procs\
@ -1135,7 +1136,6 @@ namespace eval punk::ns {
ooclasses $ooclasses\ ooclasses $ooclasses\
namespacexport $exportpatterns\ namespacexport $exportpatterns\
undetermined $undetermined\ undetermined $undetermined\
location $location\
namespacepath $nspathdict\ namespacepath $nspathdict\
glob $glob\ glob $glob\
itemcount $itemcount\ itemcount $itemcount\
@ -1143,8 +1143,6 @@ namespace eval punk::ns {
lappend nsdict_list $nsdict lappend nsdict_list $nsdict
} }
return $nsdict_list return $nsdict_list
#return [list children [lsort $tailmatches] commands $commands procs $procs exported $exported imported $imported aliases $aliases ensembles $ensembles ooobjects $ooobjects ooclasses $ooclasses namespacexport $exportpatterns location $location glob $glob]
} }
#Must be no ansi when only single arg used. #Must be no ansi when only single arg used.
#review - ansi codes will be very confusing in some scenarios! #review - ansi codes will be very confusing in some scenarios!

Write Preview
Loading…
Cancel
Save