tags: eliminate duplicated text methods.

* tags.tl (tag): New slot, type; new method, text.
(fun-tag, var-tag, struct-tag, type-tag): Override
type slot with appropriate value ("f", "v", "s", "t"), and
remove text method.
(slot-tag): Override type; keep text method, and interpolate
typee instead of hard-coded "m".

1 files changed, 13 insertions, 10 deletions

diff --git a/tags.tl b/tags.tl
index 52960096..8ad51107 100755
--- a/tags.tl
+++ b/tags.tl
@@ -4,8 +4,13 @@
   ident
   path
   pattern
+  (type "?")
+
   (:postinit (me)
-    (upd me.ident tostringp)))
+    (upd me.ident tostringp))
+
+  (:method text (me)
+    `@{me.ident}\t@{me.path}\t/^@{me.pattern}$/;"\t@{me.type}`))
 
 (defun escape (str)
   (mappend (do caseql @1
@@ -20,27 +25,25 @@
     `@{me.ident}\t@{me.path}\t;"\tF`))
 
 (defstruct fun-tag tag
-  (:method text (me)
-    `@{me.ident}\t@{me.path}\t/^@{me.pattern}$/;"\tf`))
+  (type "f"))
 
 (defstruct var-tag tag
-  (:method text (me)
-    `@{me.ident}\t@{me.path}\t/^@{me.pattern}$/;"\tv`))
+  (type "v"))
 
 (defstruct struct-tag tag
-  (:method text (me)
-    `@{me.ident}\t@{me.path}\t/^@{me.pattern}$/;"\ts`))
+  (type "s"))
 
 (defstruct type-tag tag
-  (:method text (me)
-    `@{me.ident}\t@{me.path}\t/^@{me.pattern}$/;"\tt`))
+  (type "t"))
 
 (defstruct slot-tag tag
+  (type "m")
   parent
   expattern
   (:method text (me)
     `@{me.ident}\t@{me.path}\t/^@{me.pattern}$/ \
-     @(if me.expattern `;/@(escape me.ident)/`);"\tm\tstruct:@{me.parent}`))
+     @(if me.expattern `;/@(escape me.ident)/`);"\t \
+     @{me.type}\tstruct:@{me.parent}`))
 
 (defvarl err-ret (gensym))