--- a/Tools__Tag.st	Sun Jan 12 23:30:25 2014 +0000
+++ b/Tools__Tag.st	Wed Apr 01 10:38:01 2015 +0100
@@ -27,6 +27,13 @@
 	privateIn:Tag
 !
 
+Tag subclass:#TCaseLabel
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:Tag
+!
+
 Tag subclass:#TClass
 	instanceVariableNames:''
 	classVariableNames:''
@@ -387,6 +394,16 @@
 "/        ^  type, ' ' , l
 "/    ].
     ^ l
+!
+
+shortInfoString
+    |s|
+
+    s := self typeString.
+    fileName notNil ifTrue:[
+        s := s , ' in ', fileName baseName "pathName".
+    ].
+    ^ s
 ! !
 
 !Tag methodsFor:'queries'!
@@ -429,25 +446,25 @@
         atStart := true.
     ].
     (pat endsWith:$$) ifTrue:[
-        pat := pat copyButLast:1.
+        pat := pat copyButLast.
         atEnd := true.
     ].
     atStart == true ifTrue:[
         atEnd == true ifTrue:[
-            lnr := someText findFirst:[:l| l = pat].
+            lnr := someText findFirst:[:line | line = pat].
         ] ifFalse:[
-            lnr := someText findFirst:[:l| l startsWith:pat].
+            lnr := someText findFirst:[:line | line startsWith:pat].
         ]
     ] ifFalse:[
         atEnd == true ifTrue:[
-            lnr := someText findFirst:[:l| l endsWith:pat].
+            lnr := someText findFirst:[:line | line endsWith:pat].
         ] ifFalse:[
-            lnr := someText findFirst:[:l| l includesString:pat].
+            lnr := someText findFirst:[:line | line includesString:pat].
         ].
     ].
 
     lnr == 0 ifTrue:[
-        lnr := someText findFirst:[:l| l includesString:self label].
+        lnr := someText findFirst:[:line | line includesString:self label].
         lnr == 0 ifTrue:[
             lnr := 1.
         ].
@@ -493,6 +510,12 @@
 
 !
 
+isFunctionOrMethodTag
+    "return true, if this is a function or a method tag 
+    "
+    ^ false
+!
+
 isFunctionTag
     "return true, if this is a function tag 
     "
@@ -663,6 +686,34 @@
     "Created: / 20-04-2011 / 18:53:16 / cg"
 ! !
 
+!Tag::TCaseLabel class methodsFor:'accessing'!
+
+typeIdentifier
+    ^ 'L'
+! !
+
+!Tag::TCaseLabel methodsFor:'accessing'!
+
+typeString
+    ^ 'case label'
+! !
+
+!Tag::TCaseLabel methodsFor:'testing'!
+
+isCaseLabelTag
+    "return true, if this is a case label tag 
+    "
+    ^ true
+!
+
+isLabelTag
+    "return true, if this is a label tag 
+    "
+    ^ true
+
+
+! !
+
 !Tag::TClass class methodsFor:'accessing'!
 
 typeIdentifier
@@ -895,6 +946,12 @@
 
 !Tag::TFunction methodsFor:'testing'!
 
+isFunctionOrMethodTag
+    "return true, if this is a function or method tag 
+    "
+    ^ true
+!
+
 isFunctionTag
     "return true, if this is a function tag 
     "
@@ -1086,11 +1143,9 @@
 !Tag::TMacro methodsFor:'testing'!
 
 isMacroTag
-    "return true, if this is a define macro tag 
+    "return true, if this is a define macro / macro tag 
     "
     ^ true
-
-
 ! !
 
 !Tag::TMakeRule class methodsFor:'accessing'!
@@ -1196,12 +1251,16 @@
 
 !Tag::TMethod methodsFor:'testing'!
 
-isMethodTag
-    "return true, if this is a java method tag 
+isFunctionOrMethodTag
+    "return true, if this is a function or method tag 
     "
     ^ true
+!
 
-
+isMethodTag
+    "return true, if this is a method tag 
+    "
+    ^ true
 ! !
 
 !Tag::TPackage class methodsFor:'accessing'!
@@ -1374,16 +1433,15 @@
 
 !Tag class methodsFor:'documentation'!
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Tag.st,v 1.8 2013-09-01 07:31:11 cg Exp $'
+version
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Tag.st,v 1.14 2014-07-04 10:27:24 cg Exp $'
 !
 
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Tag.st,v 1.14 2014-07-04 10:27:24 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__Tag.st,v 1.8 2013-09-01 07:31:11 cg Exp $'
+    ^ '$Id: Tools__Tag.st,v 1.14 2014-07-04 10:27:24 cg Exp $'
 ! !