--- a/Tools__TagList.st	Wed Jun 05 14:16:59 2019 +0200
+++ b/Tools__TagList.st	Wed Jun 05 17:07:59 2019 +0200
@@ -4098,7 +4098,7 @@
             lineStream next.
             nm := lineStream 
                     nextMatching:[:c | c isLetter] 
-                    thenMatching:[:c | c isLetterOrDigit or:[c == $_]].
+                    thenMatching:[:c | c isLetterOrDigitOrUnderline].
             ^ (Tag::TVariable 
                         label:nm 
                         pattern:nil
@@ -4111,7 +4111,7 @@
             lineStream skipSeparators.
             nm := lineStream 
                     nextMatching:[:c | c isLetter] 
-                    thenMatching:[:c | c isLetterOrDigit or:[c == $_]].
+                    thenMatching:[:c | c isLetterOrDigitOrUnderline].
             ^ (Tag::TClass 
                             label:nm 
                             pattern:nil
@@ -4122,8 +4122,8 @@
                 lineStream := (l copyFrom:'function ' size) readStream.
                 lineStream skipSeparators.
                 nm := lineStream 
-                        nextMatching:[:c | c isLetter or:[c == $_]] 
-                        thenMatching:[:c | c isLetterOrDigit or:[c == $_]].
+                        nextMatching:[:c | c isLetterOrUnderline] 
+                        thenMatching:[:c | c isLetterOrDigitOrUnderline].
                  ^ (Tag::TFunction
                                 label:nm 
                                 pattern:nil
@@ -4133,6 +4133,8 @@
         ].
     ].
     ^ nil
+
+    "Modified: / 05-06-2019 / 17:07:15 / Claus Gittinger"
 !
 
 phpTagsInFile:aFilePath