Fixed parsing procedure with names like ::proc::name or proc_na::me(aa) and parameters {{} {} {}}

This commit is contained in:
Sergey Kalinin
2018-02-15 17:04:11 +03:00
parent 794ea04f2e
commit 1748933767
5 changed files with 14 additions and 9 deletions

View File

@@ -948,7 +948,10 @@ proc EditFile {tree node fileName} {
}
###################
if {[regexp -nocase -all -line -- {proc (.*) \{(.*)\}} $line match procName params]} {
#regexp -nocase -all -line -- {proc (::|)(\w+)(::|)(\w+) \{(.*)\} \{} string match v1 v2 v3 v4 v5
#regexp -nocase -all -line -- {proc (.*) \{(.*)\}} $line match procName params
if {[regexp -nocase -all -line -- {proc (::|)(\w+)(::|)(\w+) \{(.*)\} \{} $line match v1 v2 v3 v4 params]} {
set procName "$v1$v2$v3$v4"
lappend procList($activeProject) [list $procName [string trim $params]]
puts "proc $procName $params"
}
@@ -1281,5 +1284,6 @@ GetOp

View File

@@ -273,12 +273,9 @@ proc TopLevelHelp {} {
entry $frmSrchEnt.entSearch
set lstSearch [listbox $frmSrchList.lstSearch -font $fontNormal\
-yscrollcommand\
{.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhList.scrListY set}\
-xscrollcommand\
{.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhScrollX.scrListX set}\
-selectmode single -selectbackground #55c4d1\
-selectborderwidth 0]
-yscrollcommand {.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhList.scrListY set}\
-xscrollcommand {.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhScrollX.scrListX set}\
-selectmode single -selectbackground #55c4d1 -selectborderwidth 0]
scrollbar $frmSrchList.scrListY -command\
{$frmSrchList.lstSearch yview} -borderwidth {1} -width {10} -takefocus 0
@@ -324,3 +321,4 @@ proc TopLevelHelp {} {
#GetContent $docDir/tcl.toc.html

View File

@@ -1435,5 +1435,3 @@ proc HM::cgiMap {data} {
#}

View File

@@ -308,6 +308,7 @@ proc add_toolbar_button {path icon command helptext} {
}
# Separator for toolbar
set sepIndex 0
proc Separator {} {
global sepIndex editor
set f [frame .frmTool.separator$sepIndex -width 10 -border 1 \
@@ -492,3 +493,4 @@ $tree configure -redraw 1
set activeProject ""
focus -force $tree