--- a/Tools__TagList.st Thu Jun 22 11:31:29 2017 +0200
+++ b/Tools__TagList.st Thu Jun 22 13:42:42 2017 +0200
@@ -673,6 +673,7 @@
!
dartClassesAndMethodsOnly
+ <resource: #obsolete>
^ self classesAndMethodsOnly
"/ ^ showOnly == #dartClassesAndMethods
@@ -680,6 +681,7 @@
!
dartClassesAndMethodsOnly:aBoolean
+ <resource: #obsolete>
self classesAndMethodsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -690,6 +692,7 @@
!
dartClassesOnly
+ <resource: #obsolete>
^ self classesOnly
"/ ^ showOnly == #dartClasses
@@ -697,6 +700,7 @@
!
dartClassesOnly:aBoolean
+ <resource: #obsolete>
self classesOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -707,6 +711,7 @@
!
dartMethodsOnly
+ <resource: #obsolete>
^ self methodsOnly
"/ ^ showOnly == #dartMethods
@@ -714,6 +719,7 @@
!
dartMethodsOnly:aBoolean
+ <resource: #obsolete>
self methodsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -824,6 +830,7 @@
!
hideDartClasses
+ <resource: #obsolete>
^ self hideClasses
"/ ^ self flagNamed:#hideDartClasses
@@ -831,6 +838,7 @@
!
hideDartClasses:aBoolean
+ <resource: #obsolete>
self hideClasses:aBoolean
"/ self flagNamed:#hideDartClasses put:aBoolean
@@ -838,6 +846,7 @@
!
hideDartFields
+ <resource: #obsolete>
^ self hideFields
"/ ^ self flagNamed:#hideDartFields
@@ -845,6 +854,7 @@
!
hideDartFields:aBoolean
+ <resource: #obsolete>
self hideFields:aBoolean
"/ self flagNamed:#hideDartFields put:aBoolean
@@ -852,6 +862,7 @@
!
hideDartInterfaces
+ <resource: #obsolete>
^ self hideInterfaces
"/ ^ self flagNamed:#hideDartInterfaces
@@ -859,6 +870,7 @@
!
hideDartInterfaces:aBoolean
+ <resource: #obsolete>
self hideInterfaces:aBoolean
"/ self flagNamed:#hideDartInterfaces put:aBoolean
@@ -866,6 +878,7 @@
!
hideDartMethods
+ <resource: #obsolete>
^ self hideMethods
"/ ^ self flagNamed:#hideDartMethods
@@ -873,6 +886,7 @@
!
hideDartMethods:aBoolean
+ <resource: #obsolete>
self hideMethods:aBoolean
"/ self flagNamed:#hideDartMethods put:aBoolean.
@@ -880,6 +894,7 @@
!
hideDartPackages
+ <resource: #obsolete>
^ self hidePackages
"/ ^ self flagNamed:#hideDartPackages
@@ -887,6 +902,7 @@
!
hideDartPackages:aBoolean
+ <resource: #obsolete>
self hidePackages:aBoolean
"/ self flagNamed:#hideDartPackages put:aBoolean.
@@ -1034,6 +1050,7 @@
!
hideJavaClasses
+ <resource: #obsolete>
^ self hideClasses
"/ ^ self flagNamed:#hideJavaClasses
@@ -1041,6 +1058,7 @@
!
hideJavaClasses:aBoolean
+ <resource: #obsolete>
self hideClasses:aBoolean
"/ self flagNamed:#hideJavaClasses put:aBoolean
@@ -1048,6 +1066,7 @@
!
hideJavaFields
+ <resource: #obsolete>
^ self hideFields
"/ ^ self flagNamed:#hideJavaFields
@@ -1055,6 +1074,7 @@
!
hideJavaFields:aBoolean
+ <resource: #obsolete>
self hideFields:aBoolean
"/ self flagNamed:#hideJavaFields put:aBoolean.
@@ -1062,6 +1082,7 @@
!
hideJavaInterfaces
+ <resource: #obsolete>
^ self hideInterfaces
"/ ^ self flagNamed:#hideJavaInterfaces
@@ -1069,6 +1090,7 @@
!
hideJavaInterfaces:aBoolean
+ <resource: #obsolete>
self hideInterfaces:aBoolean
"/ self flagNamed:#hideJavaInterfaces put:aBoolean.
@@ -1076,6 +1098,7 @@
!
hideJavaMethods
+ <resource: #obsolete>
^ self hideMethods
"/ ^ self flagNamed:#hideJavaMethods
@@ -1083,6 +1106,7 @@
!
hideJavaMethods:aBoolean
+ <resource: #obsolete>
self hideMethods:aBoolean
"/ self flagNamed:#hideJavaMethods put:aBoolean.
@@ -1090,6 +1114,7 @@
!
hideJavaPackages
+ <resource: #obsolete>
^ self hidePackages
"/ ^ self flagNamed:#hideJavaPackages
@@ -1097,6 +1122,7 @@
!
hideJavaPackages:aBoolean
+ <resource: #obsolete>
self hidePackages:aBoolean
"/ self flagNamed:#hideJavaPackages put:aBoolean.
@@ -1190,6 +1216,7 @@
!
hideLuaFunctions
+ <resource: #obsolete>
^ self hideFunctions
"/ ^ self flagNamed:#hideLuaFunctions
@@ -1197,6 +1224,7 @@
!
hideLuaFunctions:aBoolean
+ <resource: #obsolete>
self hideFunctions:aBoolean
"/ self flagNamed:#hideLuaFunctions put:aBoolean
@@ -1216,6 +1244,7 @@
!
hideObjcClasses
+ <resource: #obsolete>
^ self hideClasses
"/ ^ self flagNamed:#hideObjcClasses
@@ -1223,6 +1252,7 @@
!
hideObjcClasses:aBoolean
+ <resource: #obsolete>
self hideClasses:aBoolean
"/ self flagNamed:#hideObjcClasses put:aBoolean.
@@ -1230,6 +1260,7 @@
!
hideObjcMethods
+ <resource: #obsolete>
^ self hideMethods
"/ ^ self flagNamed:#hideObjcMethods
@@ -1237,6 +1268,7 @@
!
hideObjcMethods:aBoolean
+ <resource: #obsolete>
self hideMethods:aBoolean
"/ self flagNamed:#hideObjcMethods put:aBoolean.
@@ -1244,6 +1276,7 @@
!
hideOzClasses
+ <resource: #obsolete>
^ self hideClasses
"/ ^ self flagNamed:#hideOzClasses
@@ -1251,6 +1284,7 @@
!
hideOzClasses:aBoolean
+ <resource: #obsolete>
self hideClasses:aBoolean
"/ self flagNamed:#hideOzClasses put:aBoolean.
@@ -1258,6 +1292,7 @@
!
hideOzFunctions
+ <resource: #obsolete>
^ self hideFunctions
"/ ^ self flagNamed:#hideOzFunctions
@@ -1265,6 +1300,7 @@
!
hideOzFunctions:aBoolean
+ <resource: #obsolete>
self hideFunctions:aBoolean
"/ self flagNamed:#hideOzFunctions put:aBoolean.
@@ -1272,6 +1308,7 @@
!
hideOzMethods
+ <resource: #obsolete>
^ self hideMethods
"/ ^ self flagNamed:#hideOzMethods
@@ -1279,6 +1316,7 @@
!
hideOzMethods:aBoolean
+ <resource: #obsolete>
self hideMethods:aBoolean
"/ self flagNamed:#hideOzMethods put:aBoolean.
@@ -1298,6 +1336,7 @@
!
hidePythonClasses
+ <resource: #obsolete>
^ self hideClasses
"/ ^ self flagNamed:#hidePythonClasses
@@ -1305,6 +1344,7 @@
!
hidePythonClasses:aBoolean
+ <resource: #obsolete>
self hideClasses:aBoolean
"/ self flagNamed:#hidePythonClasses put:aBoolean.
@@ -1312,6 +1352,7 @@
!
hidePythonFunctions
+ <resource: #obsolete>
^ self hideFunctions
"/ ^ self flagNamed:#hidePythonFunctions
@@ -1319,6 +1360,7 @@
!
hidePythonFunctions:aBoolean
+ <resource: #obsolete>
self hideFunctions:aBoolean
"/ self flagNamed:#hidePythonFunctions put:aBoolean.
@@ -1326,6 +1368,7 @@
!
hidePythonMethods
+ <resource: #obsolete>
^ self hideMethods
"/ ^ self flagNamed:#hidePythonMethods
@@ -1333,6 +1376,7 @@
!
hidePythonMethods:aBoolean
+ <resource: #obsolete>
self hideMethods:aBoolean
"/ self flagNamed:#hidePythonMethods put:aBoolean.
@@ -1400,6 +1444,7 @@
!
javaClassesAndMethodsOnly
+ <resource: #obsolete>
^ self classesAndMethodsOnly
"/ ^ showOnly == #javaClassesAndMethods
@@ -1407,6 +1452,7 @@
!
javaClassesAndMethodsOnly:aBoolean
+ <resource: #obsolete>
self classesAndMethodsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1417,6 +1463,7 @@
!
javaClassesOnly
+ <resource: #obsolete>
^ self classesOnly
"/ ^ showOnly == #javaClasses
@@ -1424,6 +1471,7 @@
!
javaClassesOnly:aBoolean
+ <resource: #obsolete>
self classesOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1434,6 +1482,7 @@
!
javaMethodsOnly
+ <resource: #obsolete>
^ self methodsOnly
"/ ^ showOnly == #javaMethods
@@ -1441,6 +1490,7 @@
!
javaMethodsOnly:aBoolean
+ <resource: #obsolete>
self methodsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1485,6 +1535,7 @@
!
ozClassesOnly
+ <resource: #obsolete>
^ self classesOnly
"/ ^ showOnly == #ozClasses
@@ -1492,6 +1543,7 @@
!
ozClassesOnly:aBoolean
+ <resource: #obsolete>
self classesOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1502,6 +1554,7 @@
!
ozFunctionsOnly
+ <resource: #obsolete>
^ self functionsOnly
"/ ^ showOnly == #ozFunctions
@@ -1509,6 +1562,7 @@
!
ozFunctionsOnly:aBoolean
+ <resource: #obsolete>
self functionsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1520,6 +1574,7 @@
!
ozMethodsOnly
+ <resource: #obsolete>
^ self methodsOnly
"/ ^ showOnly == #ozMethods
@@ -1527,6 +1582,7 @@
!
ozMethodsOnly:aBoolean
+ <resource: #obsolete>
self methodsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1537,6 +1593,7 @@
!
pythonClassesOnly
+ <resource: #obsolete>
^ self classesOnly
"/ ^ showOnly == #pythonClasses
@@ -1544,6 +1601,7 @@
!
pythonClassesOnly:aBoolean
+ <resource: #obsolete>
self classesOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1554,6 +1612,7 @@
!
pythonFunctionsOnly
+ <resource: #obsolete>
^ self functionsOnly
"/ ^ showOnly == #pythonFunctions
@@ -1561,6 +1620,7 @@
!
pythonFunctionsOnly:aBoolean
+ <resource: #obsolete>
self functionsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -1571,6 +1631,7 @@
!
pythonMethodsOnly
+ <resource: #obsolete>
^ self methodsOnly
"/ ^ showOnly == #pythonMethods
@@ -1578,6 +1639,7 @@
!
pythonMethodsOnly:aBoolean
+ <resource: #obsolete>
self methodsOnly:aBoolean
"/ showOnly := nil.
"/ aBoolean ifTrue:[
@@ -2078,11 +2140,11 @@
]
]
].
- 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' ].
+ self hideClasses == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-c' ].
+ self hideMethods == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-m' ].
+ self hideInterfaces == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-i' ].
+ self hideFields == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-f' ].
+ self hidePackages == true ifTrue:[ moreOptions := moreOptions, ' --java-types=-p' ].
].
isEiffelSuffix ifTrue:[
@@ -2183,7 +2245,7 @@
^ shellCommand
"Created: / 05-01-2012 / 11:07:41 / cg"
- "Modified: / 22-06-2017 / 10:25:20 / cg"
+ "Modified: / 22-06-2017 / 13:35:53 / cg"
!
sortBlock
@@ -2716,19 +2778,19 @@
]]]]]]]]]]
] ifFalse:[ languageMode == #java ifTrue:[
tagType = 'c' ifTrue:[
- self hideJavaClasses == true ifTrue:[^ nil].
+ self hidelasses == true ifTrue:[^ nil].
tagClass := Tag::TClass
] ifFalse:[ tagType = 'm' ifTrue:[
- self hideJavaMethods == true ifTrue:[^ nil].
+ self hideMethods == true ifTrue:[^ nil].
tagClass := Tag::TMethod
] ifFalse:[ tagType = 'f' ifTrue:[
- self hideJavaFields == true ifTrue:[^ nil].
+ self hideFields == true ifTrue:[^ nil].
tagClass := Tag::TField
] ifFalse:[ tagType = 'i' ifTrue:[
- self hideJavaInterfaces == true ifTrue:[^ nil].
+ self hideInterfaces == true ifTrue:[^ nil].
tagClass := Tag::TInterface
] ifFalse:[ tagType = 'p' ifTrue:[
- self hideJavaPackages == true ifTrue:[^ nil].
+ self hidePackages == true ifTrue:[^ nil].
tagClass := Tag::TPackage
] ifFalse:[
"/ add more here */
@@ -2827,7 +2889,7 @@
lineNumber:lineNumber
className:className.
- "Modified: / 22-06-2017 / 11:19:33 / cg"
+ "Modified: / 22-06-2017 / 13:35:45 / cg"
! !
!TagList methodsFor:'tag generation - helpers'!
@@ -3875,12 +3937,12 @@
(l startsWith:'@interface') ifTrue:[
kwLen := '@interface' size.
type := Tag::TInterface.
- hideHolder := self hideObjcClasses.
+ hideHolder := self hideClasses.
].
(l startsWith:'@implementation') ifTrue:[
kwLen := '@implementation' size.
type := Tag::TClass.
- hideHolder := self hideObjcClasses.
+ hideHolder := self hideClasses.
].
(l startsWith:'@property') ifTrue:[
kwLen := '@property' size.
@@ -3889,7 +3951,7 @@
(l startsWithAnyOf:'+-') ifTrue:[
kwLen := 1.
type := Tag::TMethod.
- hideHolder := self hideObjcMethods.
+ hideHolder := self hideMethods.
skipType := true.
].
hideHolder value ~~ true ifTrue:[
@@ -3915,6 +3977,8 @@
].
^ nil
+
+ "Modified: / 22-06-2017 / 13:37:20 / cg"
!
objcTagsInFile:aFilePath
@@ -3944,24 +4008,24 @@
(l startsWith:'class') ifTrue:[
kwLen := 5.
type := Tag::TClass.
- hideHolder := self hideOzClasses.
+ hideHolder := self hideClasses.
].
(l startsWith:'meth') ifTrue:[
kwLen := 4.
type := Tag::TMethod.
- hideHolder := self hideOzMethods.
+ hideHolder := self hideMethods.
].
(l startsWith:'fun') ifTrue:[
kwLen := 3.
skipBrace := true.
type := Tag::TFunction.
- hideHolder := self hideOzFunctions.
+ hideHolder := self hideFunctions.
].
(l startsWith:'proc') ifTrue:[
kwLen := 4.
skipBrace := true.
type := Tag::TFunction.
- hideHolder := self hideOzFunctions.
+ hideHolder := self hideFunctions.
].
hideHolder value ~~ true ifTrue:[
kwLen notNil ifTrue:[
@@ -3982,6 +4046,8 @@
].
].
^ nil
+
+ "Modified: / 22-06-2017 / 13:37:50 / cg"
!
ozTagsInFile:aFilePath
@@ -4146,7 +4212,7 @@
nm := nm withoutSeparators.
(showOnly ~~ #pythonFunctions
and:[showOnly ~~ #pythonMethods]) ifTrue:[
- self hidePythonClasses ~~ true ifTrue:[
+ self hideClasses ~~ true ifTrue:[
targets add:(Tag::TClass
label:nm
pattern:nil
@@ -4167,7 +4233,7 @@
inClass size > 0 ifTrue:[
(showOnly ~~ #pythonFunctions
and:[showOnly ~~ #pythonClasses]) ifTrue:[
- self hidePythonMethods ~~ true ifTrue:[
+ self hideMethods ~~ true ifTrue:[
nm := inClass first , '.' , nm.
targets add:(Tag::TMethod
label:nm
@@ -4179,7 +4245,7 @@
] ifFalse:[
(showOnly ~~ #pythonClasses
and:[showOnly ~~ #pythonMethods]) ifTrue:[
- self hidePythonFunctions ~~ true ifTrue:[
+ self hideFunctions ~~ true ifTrue:[
targets add:(Tag::TFunction
label:nm
pattern:nil
@@ -4197,7 +4263,7 @@
].
^ targets
- "Modified: / 08-05-2011 / 10:39:10 / cg"
+ "Modified: / 22-06-2017 / 13:38:30 / cg"
!
rubyTagFromLine:line lineNr:lineNr