--- a/Tools__TagList.st Sat May 10 15:23:19 2014 +0200
+++ b/Tools__TagList.st Sat May 10 19:57:24 2014 +0200
@@ -15,20 +15,8 @@
List subclass:#TagList
instanceVariableNames:'rawList filteredList filter tagsValidForFile sortCriteria groupBy
- showOnly hideStatic hideStructMembers hideClasses hideMethods
- hideDefines hideTypedefs hideVariables hideStructures
- hideFunctions hideFunctionProtoTypes hideJavaClasses
- hideJavaMethods hideJavaInterfaces hideJavaFields
- hideJavaPackages hideDartClasses hideDartMethods
- hideDartInterfaces hideDartFields hideDartPackages hideLispMacros
- hideLispEvaluations hideLispMethods hideLispConstants
- hideLocalLabels hideLocalLabels2 hideDataLabels hideTextLabels
- tagTypesPresent hidePythonClasses hidePythonMethods
- hidePythonFunctions hideOzClasses hideOzMethods hideOzFunctions
- hideHTMLTextArea hideHTMLInput hideHTMLTable hideHTMLScript
- hideHTMLForm hideHTMLHeaders usingDefaultCTags ctagsCommand
- ctagsIsExCtags ctagsIsExCtags5x hideDocumentation remoteTarget
- hideLocalLabels3'
+ showOnly flags tagTypesPresent usingDefaultCTags ctagsCommand
+ ctagsIsExCtags ctagsIsExCtags5x remoteTarget'
classVariableNames:'Sorted CachedTagListsPerFile DefaultSortCriteria DefaultShowOnly
TagsSuffixes DefaultGroupBy'
poolDictionaries:''
@@ -702,6 +690,14 @@
"Modified: / 05-05-2011 / 14:43:04 / cg"
!
+flagNamed:aSymbol
+ ^ flags at:aSymbol ifAbsent:false
+!
+
+flagNamed:aSymbol put:aBoolean
+ flags at:aSymbol put:aBoolean
+!
+
functionsAndVariablesOnly
^ showOnly == #functionsAndVariables
@@ -733,435 +729,443 @@
!
hideClasses
- ^ hideClasses ? false
+ ^ self flagNamed:#hideClasses
!
hideClasses:aBoolean
- hideClasses := aBoolean.
+ self flagNamed:#hideClasses put:aBoolean
"Modified: / 05-05-2011 / 15:22:08 / cg"
!
hideDartClasses
- ^ hideDartClasses ? false
+ ^ self flagNamed:#hideDartClasses
!
hideDartClasses:aBoolean
- hideDartClasses := aBoolean.
+ self flagNamed:#hideDartClasses put:aBoolean
"Modified: / 05-05-2011 / 15:22:32 / cg"
!
hideDartFields
- ^ hideDartFields ? false
+ ^ self flagNamed:#hideDartFields
!
hideDartFields:aBoolean
- hideDartFields := aBoolean.
+ self flagNamed:#hideDartFields put:aBoolean
"Modified: / 05-05-2011 / 15:22:34 / cg"
!
hideDartInterfaces
- ^ hideDartInterfaces ? false
+ ^ self flagNamed:#hideDartInterfaces
!
hideDartInterfaces:aBoolean
- hideDartInterfaces := aBoolean.
+ self flagNamed:#hideDartInterfaces put:aBoolean
"Modified: / 05-05-2011 / 15:22:38 / cg"
!
hideDartMethods
- ^ hideDartMethods ? false
+ ^ self flagNamed:#hideDartMethods
!
hideDartMethods:aBoolean
- hideDartMethods := aBoolean.
+ self flagNamed:#hideDartMethods put:aBoolean.
"Modified: / 05-05-2011 / 15:22:40 / cg"
!
hideDartPackages
- ^ hideDartPackages ? false
+ ^ self flagNamed:#hideDartPackages
!
hideDartPackages:aBoolean
- hideDartPackages := aBoolean.
+ self flagNamed:#hideDartPackages put:aBoolean.
"Modified: / 05-05-2011 / 15:22:41 / cg"
!
hideDataLabels
- ^ hideDataLabels ? false
+ ^ self flagNamed:#hideDataLabels
!
hideDataLabels:aBoolean
- hideDataLabels := aBoolean.
+ self flagNamed:#hideDataLabels put:aBoolean.
"Modified: / 05-05-2011 / 15:22:10 / cg"
!
hideDefines
- ^ hideDefines ? false
+ ^ self flagNamed:#hideDefines
!
hideDefines:aBoolean
- hideDefines := aBoolean.
+ self flagNamed:#hideDefines put:aBoolean.
"Modified: / 05-05-2011 / 15:22:12 / cg"
!
hideDocumentation
- ^ hideDocumentation ? false
+ ^ self flagNamed:#hideDocumentation
"Created: / 08-05-2011 / 10:11:02 / cg"
!
hideDocumentation:aBoolean
- hideDocumentation := aBoolean.
+ self flagNamed:#hideDocumentation put:aBoolean.
"Created: / 08-05-2011 / 10:11:06 / cg"
!
hideFunctionProtoTypes
- ^ hideFunctionProtoTypes ? false
+ ^ self flagNamed:#hideFunctionProtoTypes
!
hideFunctionProtoTypes:aBoolean
- hideFunctionProtoTypes := aBoolean.
+ self flagNamed:#hideFunctionProtoTypes put:aBoolean.
"Modified: / 05-05-2011 / 15:22:14 / cg"
!
hideFunctions
- ^ hideFunctions ? false
+ ^ self flagNamed:#hideFunctions
!
hideFunctions:aBoolean
- hideFunctions := aBoolean.
+ self flagNamed:#hideFunctions put:aBoolean.
"Modified: / 05-05-2011 / 15:22:18 / cg"
!
hideHTMLHeaders
- ^ hideHTMLHeaders ? false
+ ^ self flagNamed:#hideHTMLHeaders
"Created: / 12-09-2012 / 12:29:45 / cg"
!
hideHTMLHeaders:aBoolean
- hideHTMLHeaders := aBoolean.
+ self flagNamed:#hideHTMLHeaders put:aBoolean.
"Created: / 12-09-2012 / 12:29:52 / cg"
!
hideHTMLInput
- ^ hideHTMLInput ? false
+ ^ self flagNamed:#hideHTMLInput
"Created: / 20-04-2011 / 19:01:04 / cg"
!
hideHTMLInput:aBoolean
- hideHTMLInput := aBoolean.
+ self flagNamed:#hideHTMLInput put:aBoolean.
"Created: / 20-04-2011 / 19:01:32 / cg"
"Modified: / 05-05-2011 / 15:22:21 / cg"
!
hideHTMLScript
- ^ hideHTMLScript ? false
+ ^ self flagNamed:#hideHTMLScript
"Created: / 20-04-2011 / 19:00:32 / cg"
!
hideHTMLScript:aBoolean
- hideHTMLScript := aBoolean.
+ self flagNamed:#hideHTMLScript put:aBoolean.
"Created: / 20-04-2011 / 19:01:32 / cg"
"Modified: / 05-05-2011 / 15:22:23 / cg"
!
hideHTMLTable
- ^ hideHTMLTable ? false
+ ^ self flagNamed:#hideHTMLTable
"Created: / 20-04-2011 / 19:01:23 / cg"
!
hideHTMLTable:aBoolean
- hideHTMLTable := aBoolean.
+ self flagNamed:#hideHTMLTable put:aBoolean.
"Created: / 20-04-2011 / 19:01:48 / cg"
"Modified: / 05-05-2011 / 15:22:26 / cg"
!
hideHTMLTextArea
- ^ hideHTMLTextArea ? false
+ ^ self flagNamed:#hideHTMLTextArea
"Created: / 20-04-2011 / 19:00:55 / cg"
!
hideHTMLTextArea:aBoolean
- hideHTMLTextArea := aBoolean.
+ self flagNamed:#hideHTMLTextArea put:aBoolean.
"Created: / 20-04-2011 / 19:01:58 / cg"
"Modified: / 05-05-2011 / 15:22:28 / cg"
!
hideJavaClasses
- ^ hideJavaClasses ? false
+ ^ self flagNamed:#hideJavaClasses
!
hideJavaClasses:aBoolean
- hideJavaClasses := aBoolean.
+ self flagNamed:#hideJavaClasses put:aBoolean
"Modified: / 05-05-2011 / 15:22:32 / cg"
!
hideJavaFields
- ^ hideJavaFields ? false
+ ^ self hideJavaFields
!
hideJavaFields:aBoolean
- hideJavaFields := aBoolean.
+ self hideJavaFields put:aBoolean.
"Modified: / 05-05-2011 / 15:22:34 / cg"
!
hideJavaInterfaces
- ^ hideJavaInterfaces ? false
+ ^ self hideJavaInterfaces
!
hideJavaInterfaces:aBoolean
- hideJavaInterfaces := aBoolean.
+ self hideJavaInterfaces put:aBoolean.
"Modified: / 05-05-2011 / 15:22:38 / cg"
!
hideJavaMethods
- ^ hideJavaMethods ? false
+ ^ self flagNamed:#hideJavaMethods
!
hideJavaMethods:aBoolean
- hideJavaMethods := aBoolean.
+ self flagNamed:#hideJavaMethods put:aBoolean.
"Modified: / 05-05-2011 / 15:22:40 / cg"
!
hideJavaPackages
- ^ hideJavaPackages ? false
+ ^ self flagNamed:#hideJavaPackages
!
hideJavaPackages:aBoolean
- hideJavaPackages := aBoolean.
+ self flagNamed:#hideJavaPackages put:aBoolean.
"Modified: / 05-05-2011 / 15:22:41 / cg"
!
hideLispConstants
- ^ hideLispConstants ? false
+ ^ self flagNamed:#hideLispConstants
!
hideLispConstants:aBoolean
- hideLispConstants := aBoolean.
+ self flagNamed:#hideLispConstants put:aBoolean.
"Modified: / 05-05-2011 / 15:22:46 / cg"
!
hideLispEvaluations
- ^ hideLispEvaluations ? false
+ ^ self flagNamed:#hideLispEvaluations
!
hideLispEvaluations:aBoolean
- hideLispEvaluations := aBoolean.
+ self flagNamed:#hideLispEvaluations put:aBoolean.
"Modified: / 05-05-2011 / 15:22:49 / cg"
!
hideLispMacros
- ^ hideLispMacros ? false
+ ^ self flagNamed:#hideLispMacros
!
hideLispMacros:aBoolean
- hideLispMacros := aBoolean.
+ self flagNamed:#hideLispMacros put:aBoolean.
"Modified: / 05-05-2011 / 15:22:50 / cg"
!
hideLispMethods
- ^ hideLispMethods ? false
+ ^ self flagNamed:#hideLispMethods
!
hideLispMethods:aBoolean
- hideLispMethods := aBoolean.
+ self flagNamed:#hideLispMethods put:aBoolean.
"Modified: / 05-05-2011 / 15:22:53 / cg"
!
hideLocalLabels
- ^ hideLocalLabels ? false
+ ^ self flagNamed:#hideLocalLabels
!
hideLocalLabels2
- ^ hideLocalLabels2 ? false
+ ^ self flagNamed:#hideLocalLabels2
"Created: / 24-03-2012 / 23:23:15 / cg"
!
hideLocalLabels2:aBoolean
- hideLocalLabels2 := aBoolean.
+ self flagNamed:#hideLocalLabels2 put:aBoolean.
"Modified: / 05-05-2011 / 15:22:54 / cg"
"Created: / 24-03-2012 / 23:23:20 / cg"
!
hideLocalLabels3
- ^ hideLocalLabels3 ? false
+ ^ self flagNamed:#hideLocalLabels3
"Created: / 13-05-2012 / 11:12:37 / cg"
!
hideLocalLabels3:aBoolean
- hideLocalLabels3 := aBoolean.
+ self flagNamed:#hideLocalLabels3 put:aBoolean.
"Modified: / 05-05-2011 / 15:22:54 / cg"
"Created: / 13-05-2012 / 11:12:42 / cg"
!
hideLocalLabels:aBoolean
- hideLocalLabels := aBoolean.
+ self flagNamed:#hideLocalLabels put:aBoolean.
"Modified: / 05-05-2011 / 15:22:54 / cg"
!
+hideLuaFunctions
+ ^ self flagNamed:#hideLuaFunctions
+!
+
+hideLuaFunctions:aBoolean
+ self flagNamed:#hideLuaFunctions put:aBoolean
+!
+
hideMethods
- ^ hideMethods ? false
+ ^ self flagNamed:#hideMethods
"Created: / 21-08-2012 / 21:02:24 / cg"
!
hideMethods:aBoolean
- hideMethods := aBoolean.
+ self flagNamed:#hideMethods put:aBoolean.
"Created: / 21-08-2012 / 21:01:38 / cg"
!
hideOzClasses
- ^ hideOzClasses ? false
+ ^ self flagNamed:#hideOzClasses
!
hideOzClasses:aBoolean
- hideOzClasses := aBoolean.
+ self flagNamed:#hideOzClasses put:aBoolean.
"Modified: / 05-05-2011 / 15:22:58 / cg"
!
hideOzFunctions
- ^ hideOzFunctions ? false
+ ^ self flagNamed:#hideOzFunctions
!
hideOzFunctions:aBoolean
- hideOzFunctions := aBoolean.
+ self flagNamed:#hideOzFunctions put:aBoolean.
"Modified: / 05-05-2011 / 15:23:00 / cg"
!
hideOzMethods
- ^ hideOzMethods ? false
+ ^ self flagNamed:#hideOzMethods
!
hideOzMethods:aBoolean
- hideOzMethods := aBoolean.
+ self flagNamed:#hideOzMethods put:aBoolean.
"Modified: / 05-05-2011 / 15:23:02 / cg"
!
hidePythonClasses
- ^ hidePythonClasses ? false
+ ^ self flagNamed:#hidePythonClasses
!
hidePythonClasses:aBoolean
- hidePythonClasses := aBoolean.
+ self flagNamed:#hidePythonClasses put:aBoolean.
"Modified: / 05-05-2011 / 15:23:05 / cg"
!
hidePythonFunctions
- ^ hidePythonFunctions ? false
+ ^ self flagNamed:#hidePythonFunctions
!
hidePythonFunctions:aBoolean
- hidePythonFunctions := aBoolean.
+ self flagNamed:#hidePythonFunctions put:aBoolean.
"Modified: / 05-05-2011 / 15:23:07 / cg"
!
hidePythonMethods
- ^ hidePythonMethods ? false
+ ^ self flagNamed:#hidePythonMethods
!
hidePythonMethods:aBoolean
- hidePythonMethods := aBoolean.
+ self flagNamed:#hidePythonMethods put:aBoolean.
"Modified: / 05-05-2011 / 15:23:09 / cg"
!
hideStatic
- ^ hideStatic ? false
+ ^ self flagNamed:#hideStatic
!
hideStatic:aBoolean
- hideStatic := aBoolean.
+ self flagNamed:#hideStatic put:aBoolean.
"Modified: / 05-05-2011 / 15:23:11 / cg"
!
hideStructMembers
- ^ hideStructMembers ? false
+ ^ self flagNamed:#hideStructMembers
!
hideStructMembers:aBoolean
- hideStructMembers := aBoolean.
+ self flagNamed:#hideStructMembers put:aBoolean.
"Modified: / 05-05-2011 / 15:23:15 / cg"
!
hideStructures
- ^ hideStructures ? false
+ ^ self flagNamed:#hideStructures
!
hideStructures:aBoolean
- hideStructures := aBoolean.
+ self flagNamed:#hideStructures put:aBoolean.
"Modified: / 05-05-2011 / 15:23:17 / cg"
!
hideTextLabels
- ^ hideTextLabels ? false
+ ^ self flagNamed:#hideTextLabels
!
hideTextLabels:aBoolean
- hideTextLabels := aBoolean.
+ self flagNamed:#hideTextLabels put:aBoolean.
"Modified: / 05-05-2011 / 15:23:19 / cg"
!
hideTypedefs
- ^ hideTypedefs ? false
+ ^ self flagNamed:#hideTypedefs
!
hideTypedefs:aBoolean
- hideTypedefs := aBoolean.
+ self flagNamed:#hideTypedefs put:aBoolean.
"Modified: / 05-05-2011 / 15:23:21 / cg"
!
hideVariables
- ^ hideVariables ? false
+ ^ self flagNamed:#hideVariables
!
hideVariables:aBoolean
- hideVariables := aBoolean.
+ self flagNamed:#hideVariables put:aBoolean.
"Modified: / 05-05-2011 / 15:23:23 / cg"
!
@@ -1545,6 +1549,21 @@
^ tagTypesPresent
! !
+!TagList methodsFor:'initialization'!
+
+initContents:n
+ "Invoked when a new instance is created."
+
+ super initContents:n.
+ flags := IdentityDictionary new.
+!
+
+initialize
+ "Invoked when a new instance is created."
+
+ flags := IdentityDictionary new.
+! !
+
!TagList methodsFor:'private'!
applyFilterToList:aList
@@ -1761,13 +1780,13 @@
]
]
].
- hideStructMembers == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-m'].
- hideDefines == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-d' ].
- hideTypedefs == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-t' ].
- hideStructures == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-s'].
- hideVariables == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-v'].
- hideFunctions == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-f'].
- hideClasses == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-c'].
+ self hideStructMembers == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-m'].
+ self hideDefines == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-d' ].
+ self hideTypedefs == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-t' ].
+ self hideStructures == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-s'].
+ self hideVariables == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-v'].
+ self hideFunctions == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-f'].
+ self hideClasses == true ifTrue:[ moreOptions := moreOptions, ' --c-types=-c'].
].
isJavaSuffix ifTrue:[
@@ -1784,11 +1803,11 @@
]
]
].
- hideJavaClasses == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-c' ].
- hideJavaMethods == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-m' ].
- hideJavaInterfaces == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-i' ].
- hideJavaFields == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-f' ].
- hideJavaPackages == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-p' ].
+ self hideJavaClasses == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-c' ].
+ self hideJavaMethods == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-m' ].
+ self hideJavaInterfaces == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-i' ].
+ self hideJavaFields == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-f' ].
+ self hideJavaPackages == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-p' ].
].
isEiffelSuffix ifTrue:[
@@ -2038,7 +2057,7 @@
ifTrue:[ rawList ]
ifFalse:[ self applyFilterToList:rawList ].
filteredList notNil ifTrue:[
- hideFunctions == true ifTrue:[
+ self hideFunctions == true ifTrue:[
filteredList := filteredList reject:[:tag | tag isFunctionTag].
] ifFalse:[
showOnly == #functions ifTrue:[
@@ -2317,7 +2336,7 @@
word2 := stream upTo:Character tab. "/ optional class:
(word1 startsWith:'file:') ifTrue:[ "/ file: (scope)
- hideStatic == true ifTrue:[^ nil].
+ self hideStatic == true ifTrue:[^ nil].
].
(word2 startsWith: 'class:') ifTrue:[
@@ -2340,28 +2359,28 @@
"/ typeCharacter to tag-Class mapping...
languageMode == #c ifTrue:[
tagType = 'v' ifTrue:[
- hideVariables == true ifTrue:[^ nil].
+ self hideVariables == true ifTrue:[^ nil].
tagClass := Tag::TVariable
] ifFalse:[ tagType = 'f' ifTrue:[
- hideFunctions == true ifTrue:[^ nil].
+ self hideFunctions == true ifTrue:[^ nil].
tagClass := Tag::TFunction
] ifFalse:[ tagType = 'd' ifTrue:[
- hideDefines == true ifTrue:[^ nil].
+ self hideDefines == true ifTrue:[^ nil].
tagClass := Tag::TMacro
] ifFalse:[ tagType = 't' ifTrue:[
- hideTypedefs == true ifTrue:[^ nil].
+ self hideTypedefs == true ifTrue:[^ nil].
tagClass := Tag::TTypedef
] ifFalse:[ tagType = 'm' ifTrue:[
- hideStructMembers == true ifTrue:[^ nil].
+ self hideStructMembers == true ifTrue:[^ nil].
tagClass := Tag::TMember
] ifFalse:[ tagType = 's' ifTrue:[
- hideStructures == true ifTrue:[^ nil].
+ self hideStructures == true ifTrue:[^ nil].
tagClass := Tag::TStruct
] ifFalse:[ tagType = 'u' ifTrue:[
- hideStructures == true ifTrue:[^ nil].
+ self hideStructures == true ifTrue:[^ nil].
tagClass := Tag::TUnion
] ifFalse:[ tagType = 'c' ifTrue:[
- hideClasses == true ifTrue:[^ nil].
+ self hideClasses == true ifTrue:[^ nil].
tagClass := Tag::TClass
] ifFalse:[ tagType = 'e' ifTrue:[
tagClass := Tag::TEnumMember.
@@ -2379,26 +2398,26 @@
]]]]]]]]]]
] ifFalse:[ languageMode == #java ifTrue:[
tagType = 'c' ifTrue:[
- hideJavaClasses == true ifTrue:[^ nil].
+ self hideJavaClasses == true ifTrue:[^ nil].
tagClass := Tag::TClass
] ifFalse:[ tagType = 'm' ifTrue:[
- hideJavaMethods == true ifTrue:[^ nil].
+ self hideJavaMethods == true ifTrue:[^ nil].
tagClass := Tag::TMethod
] ifFalse:[ tagType = 'f' ifTrue:[
- hideJavaFields == true ifTrue:[^ nil].
+ self hideJavaFields == true ifTrue:[^ nil].
tagClass := Tag::TField
] ifFalse:[ tagType = 'i' ifTrue:[
- hideJavaInterfaces == true ifTrue:[^ nil].
+ self hideJavaInterfaces == true ifTrue:[^ nil].
tagClass := Tag::TInterface
] ifFalse:[ tagType = 'p' ifTrue:[
- hideJavaPackages == true ifTrue:[^ nil].
+ self hideJavaPackages == true ifTrue:[^ nil].
tagClass := Tag::TPackage
] ifFalse:[
"/ add more here */
]]]]]
] ifFalse:[ languageMode == #eiffel ifTrue:[
tagType = 'c' ifTrue:[
- hideClasses == true ifTrue:[^ nil].
+ self hideClasses == true ifTrue:[^ nil].
tagClass := Tag::TClass
"/ ] ifFalse:[ tagType = 'f' ifTrue:[
"/ tagClass := Tag::TFeature
@@ -2409,13 +2428,13 @@
]
] ifFalse:[ languageMode == #fortran ifTrue:[
tagType = 'f' ifTrue:[
- hideFunctions == true ifTrue:[^ nil].
+ self hideFunctions == true ifTrue:[^ nil].
tagClass := Tag::TFunction
] ifFalse:[ tagType = 'i' ifTrue:[
"/ hideInterfaces == true ifTrue:[^ nil].
tagClass := Tag::TInterface
] ifFalse:[ tagType = 't' ifTrue:[
- hideTypedefs == true ifTrue:[^ nil].
+ self hideTypedefs == true ifTrue:[^ nil].
tagClass := Tag::TTypedef
"/ ] ifFalse:[ tagType = 'l' ifTrue:[
"/ tagClass := Tag::TLabel
@@ -2633,11 +2652,11 @@
targets := OrderedCollection new.
s := aFilePath asFilename readStream.
s notNil ifTrue:[
- hideLocals := hideLocalLabels ? false.
- hideLocals2 := hideLocalLabels2 ? false.
- hideLocals3 := hideLocalLabels3 ? false.
- hideData := hideDataLabels ? false.
- hideText := hideTextLabels ? false.
+ hideLocals := self flagNamed:#hideLocalLabels ? false.
+ hideLocals2 := self flagNamed:#hideLocalLabels2 ? false.
+ hideLocals3 := self flagNamed:#hideLocalLabels3 ? false.
+ hideData := self flagNamed:#hideDataLabels ? false.
+ hideText := self flagNamed:#hideTextLabels ? false.
currentSegment := #text.
s := LineNumberReadStream readingFrom:s.
@@ -2757,12 +2776,12 @@
line := s nextLine.
l := line withoutSeparators.
{
- { 'function ' . #functions . hideFunctions . Tag::TFunction } .
- { 'var ' . #variables . hideVariables . Tag::TVariable } .
- { 'class ' . #classes . hideClasses . Tag::TClass } .
- { 'abstract class ' . #classes . hideClasses . Tag::TClass } .
- { 'interface ' . #interfaces . hideDartInterfaces . Tag::TInterface } .
- { 'factory ' . #methods . hideMethods . Tag::TMethod } .
+ { 'function ' . #functions . self hideFunctions . Tag::TFunction } .
+ { 'var ' . #variables . self hideVariables . Tag::TVariable } .
+ { 'class ' . #classes . self hideClasses . Tag::TClass } .
+ { 'abstract class ' . #classes . self hideClasses . Tag::TClass } .
+ { 'interface ' . #interfaces . self hideDartInterfaces . Tag::TInterface } .
+ { 'factory ' . #methods . self hideMethods . Tag::TMethod } .
} tuplesDo:[:keywordSpace :showOnlyEnum :hideVariableValue :tagType|
(l startsWith:keywordSpace) ifTrue:[
(showOnly isNil or:[showOnly == showOnlyEnum]) ifTrue:[
@@ -3013,7 +3032,7 @@
(l startsWith:'function ') ifTrue:[
(showOnly isNil or:[showOnly == #functions]) ifTrue:[
- hideFunctions ~~ true ifTrue:[
+ self hideFunctions ~~ true ifTrue:[
nm := l copyFrom:('function ' size + 1).
nm := nm copyTo:(nm
findFirst:[:ch | (ch isLetterOrDigit or:['$_' includes:ch]) not]
@@ -3028,7 +3047,7 @@
] ifFalse:[
(l startsWith:'var ') ifTrue:[
(showOnly isNil or:[showOnly == #variables]) ifTrue:[
- hideVariables ~~ true ifTrue:[
+ self hideVariables ~~ true ifTrue:[
nm := l copyFrom:('var ' size + 1).
nm := nm copyTo:(nm
findFirst:[:ch | (ch isLetterOrDigit or:['$_' includes:ch]) not]
@@ -3076,7 +3095,7 @@
(l startsWith:'(') ifFalse:[
(showOnly notNil and:[showOnly ~~ #documentation]) ifTrue:[^ nil].
- hideDocumentation == true ifTrue:[ ^ nil ].
+ self hideDocumentation == true ifTrue:[ ^ nil ].
(l startsWith:';;;') ifFalse:[^ nil].
rest := (l copyFrom:4) withoutSeparators.
@@ -3108,7 +3127,7 @@
def = 'defun' ifTrue:[
(showOnly notNil and:[showOnly ~~ #functions]) ifTrue:[^ nil].
- hideFunctions == true ifTrue:[ ^ nil ].
+ self hideFunctions == true ifTrue:[ ^ nil ].
^ Tag::TFunction
label:nm
pattern:nil
@@ -3118,7 +3137,7 @@
def = 'define' ifTrue:[ "/ scheme
inParens ifTrue:[
(showOnly notNil and:[showOnly ~~ #functions]) ifTrue:[^ nil].
- hideFunctions == true ifTrue:[ ^ nil ].
+ self hideFunctions == true ifTrue:[ ^ nil ].
^ Tag::TFunction
label:nm
pattern:nil
@@ -3136,7 +3155,7 @@
].
def = 'lambda' ifTrue:[
(showOnly notNil and:[showOnly ~~ #functions]) ifTrue:[^ nil].
- hideFunctions == true ifTrue:[ ^ nil ].
+ self hideFunctions == true ifTrue:[ ^ nil ].
^ Tag::TFunction
label:nm
pattern:nil
@@ -3145,7 +3164,7 @@
].
def = 'macro' ifTrue:[
(showOnly notNil and:[showOnly ~~ #macros]) ifTrue:[^ nil].
- hideLispMacros == true ifTrue:[ ^ nil ].
+ self hideLispMacros == true ifTrue:[ ^ nil ].
^ Tag::TLispMacro
label:nm
pattern:nil
@@ -3154,7 +3173,7 @@
].
].
(showOnly notNil and:[showOnly ~~ #variables]) ifTrue:[^ nil].
- hideVariables == true ifTrue:[ ^ nil ].
+ self hideVariables == true ifTrue:[ ^ nil ].
^ Tag::TVariable
label:nm
pattern:nil
@@ -3166,7 +3185,7 @@
def = 'defvar' ifTrue:[
(showOnly notNil and:[showOnly ~~ #variables]) ifTrue:[^ nil].
- hideVariables == true ifTrue:[ ^ nil ].
+ self hideVariables == true ifTrue:[ ^ nil ].
^ Tag::TVariable
label:nm
pattern:nil
@@ -3174,7 +3193,7 @@
lineNumber:lineNr.
].
def = 'set' ifTrue:[
- hideVariables == true ifTrue:[ ^ nil ].
+ self hideVariables == true ifTrue:[ ^ nil ].
^ Tag::TVariable
label:nm
pattern:nil
@@ -3183,7 +3202,7 @@
].
(def = 'defconstant' or:[def = 'constant']) ifTrue:[
(showOnly notNil and:[showOnly ~~ #constants]) ifTrue:[^ nil].
- hideLispConstants == true ifTrue:[ ^ nil ].
+ self hideLispConstants == true ifTrue:[ ^ nil ].
^ Tag::TLispConstant
label:nm
pattern:nil
@@ -3192,7 +3211,7 @@
].
(def = 'mac' or:[def = 'defmacro' or:[def = 'define-macro']]) ifTrue:[
(showOnly notNil and:[showOnly ~~ #macros]) ifTrue:[^ nil].
- hideLispMacros == true ifTrue:[ ^ nil ].
+ self hideLispMacros == true ifTrue:[ ^ nil ].
^ Tag::TLispMacro
label:nm
pattern:nil
@@ -3201,7 +3220,7 @@
].
(def = 'defclass' or:[def = 'define-class']) ifTrue:[
(showOnly notNil and:[showOnly ~~ #classes]) ifTrue:[^ nil].
- hideClasses == true ifTrue:[ ^ nil ].
+ self hideClasses == true ifTrue:[ ^ nil ].
^ Tag::TClass
label:nm
pattern:nil
@@ -3210,7 +3229,7 @@
].
(def = 'defmethod' or:[def = 'define-method' or:[def = 'define-generic']]) ifTrue:[
(showOnly notNil and:[showOnly ~~ #methods]) ifTrue:[^ nil].
- hideLispMethods == true ifTrue:[ ^ nil ].
+ self hideLispMethods == true ifTrue:[ ^ nil ].
^ Tag::TMethod
label:nm
pattern:nil
@@ -3218,7 +3237,7 @@
lineNumber:lineNr.
].
(def = 'defpackage') ifTrue:[
- hideLispMethods == true ifTrue:[ ^ nil ].
+ self hideLispMethods == true ifTrue:[ ^ nil ].
^ Tag::TPackage
label:nm
pattern:nil
@@ -3226,7 +3245,7 @@
lineNumber:lineNr.
].
def = 'eval-when' ifTrue:[
- hideLispEvaluations == true ifTrue:[ ^ nil ].
+ self hideLispEvaluations == true ifTrue:[ ^ nil ].
^ Tag::TLispEval
label:arg
pattern:nil
@@ -3234,7 +3253,7 @@
lineNumber:lineNr.
].
def = 'defstruct' ifTrue:[
- hideStructures == true ifTrue:[ ^ nil ].
+ self hideStructures == true ifTrue:[ ^ nil ].
^ Tag::TStruct
label:nm
pattern:nil
@@ -3243,7 +3262,7 @@
].
(def startsWith:'def') ifTrue:[
(showOnly notNil and:[showOnly ~~ #functions]) ifTrue:[^ nil].
- hideFunctions == true ifTrue:[ ^ nil ].
+ self hideFunctions == true ifTrue:[ ^ nil ].
^ Tag::TFunction
label:nm
pattern:nil
@@ -3305,7 +3324,7 @@
def = 'function' ifTrue:[
(showOnly notNil and:[showOnly ~~ #functions]) ifTrue:[^ nil].
- hideFunctions == true ifTrue:[ ^ nil ].
+ self hideFunctions == true ifTrue:[ ^ nil ].
^ Tag::TFunction
label:nm
pattern:nil
@@ -3360,24 +3379,24 @@
(l startsWith:'class') ifTrue:[
kwLen := 5.
type := Tag::TClass.
- hideHolder := hideOzClasses.
+ hideHolder := self hideOzClasses.
].
(l startsWith:'meth') ifTrue:[
kwLen := 4.
type := Tag::TMethod.
- hideHolder := hideOzMethods.
+ hideHolder := self hideOzMethods.
].
(l startsWith:'fun') ifTrue:[
kwLen := 3.
skipBrace := true.
type := Tag::TFunction.
- hideHolder := hideOzFunctions.
+ hideHolder := self hideOzFunctions.
].
(l startsWith:'proc') ifTrue:[
kwLen := 4.
skipBrace := true.
type := Tag::TFunction.
- hideHolder := hideOzFunctions.
+ hideHolder := self hideOzFunctions.
].
hideHolder value ~~ true ifTrue:[
kwLen notNil ifTrue:[
@@ -3560,7 +3579,7 @@
nm := nm withoutSeparators.
(showOnly ~~ #pythonFunctions
and:[showOnly ~~ #pythonMethods]) ifTrue:[
- hidePythonClasses ~~ true ifTrue:[
+ self hidePythonClasses ~~ true ifTrue:[
targets add:(Tag::TClass
label:nm
pattern:nil
@@ -3581,7 +3600,7 @@
inClass size > 0 ifTrue:[
(showOnly ~~ #pythonFunctions
and:[showOnly ~~ #pythonClasses]) ifTrue:[
- hidePythonMethods ~~ true ifTrue:[
+ self hidePythonMethods ~~ true ifTrue:[
nm := inClass first , '.' , nm.
targets add:(Tag::TMethod
label:nm
@@ -3593,7 +3612,7 @@
] ifFalse:[
(showOnly ~~ #pythonClasses
and:[showOnly ~~ #pythonMethods]) ifTrue:[
- hidePythonFunctions ~~ true ifTrue:[
+ self hidePythonFunctions ~~ true ifTrue:[
targets add:(Tag::TFunction
label:nm
pattern:nil
@@ -3633,7 +3652,7 @@
lineNumber:lineNr).
] ifFalse:[
(l startsWith:'class ') ifTrue:[
- hideClasses == true ifFalse:[
+ self hideClasses == true ifFalse:[
nm := l copyFrom:6.
^ (Tag::TClass
label:nm
@@ -3686,7 +3705,7 @@
] do:[
ChangeSet changesFromStream:s do:[:aChange :lNr :pos|
aChange isClassDefinitionChange ifTrue:[
- hideClasses == true ifFalse:[
+ self hideClasses == true ifFalse:[
targets add:(Tag::TClass
label:(aChange className)
pattern:('/subclass:')
@@ -3695,7 +3714,7 @@
]
] ifFalse:[
aChange isMethodChange ifTrue:[
- hideMethods == true ifFalse:[
+ self hideMethods == true ifFalse:[
targets add:((Tag::TMethod
label:(aChange selector)
pattern:('/^' , aChange selector)
@@ -3771,7 +3790,7 @@
type:nil
lineNumber:lineNr).
] ifFalse:[ (l startsWith:'set ') ifTrue:[
- hideVariables value ~~ true ifTrue:[
+ self hideVariables ~~ true ifTrue:[
words := l asCollectionOfWords.
words size >= 2 ifTrue:[
nm := words second.
@@ -3846,14 +3865,14 @@
!TagList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.42 2014-05-10 13:23:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.43 2014-05-10 17:57:24 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.42 2014-05-10 13:23:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.43 2014-05-10 17:57:24 cg Exp $'
!
version_SVN
- ^ '$Id: Tools__TagList.st,v 1.42 2014-05-10 13:23:19 cg Exp $'
+ ^ '$Id: Tools__TagList.st,v 1.43 2014-05-10 17:57:24 cg Exp $'
! !