--- a/trunk/src/cmd/Generate.d	Fri Jan 18 23:11:44 2008 +0100
+++ b/trunk/src/cmd/Generate.d	Fri Jan 18 23:40:12 2008 +0100
@@ -390,7 +390,7 @@
   }
 
   // Traverse linked list and print tokens.
-  while (token.type != TOK.EOF)
+  while (token.kind != TOK.EOF)
   {
     token = token.next;
 
@@ -445,7 +445,7 @@
   print(tags[DocPart.SrcBegin]);
 
   // Traverse linked list and print tokens.
-  while (token.type != TOK.EOF)
+  while (token.kind != TOK.EOF)
   {
     token = token.next;
     // Print whitespace.
@@ -462,7 +462,7 @@
   alias DocPart DP;
   string srcText = xml_escape(token.srcText);
 
-  switch(token.type)
+  switch(token.kind)
   {
   case TOK.Identifier:
     print.format(tags[DP.Identifier], srcText);
@@ -530,7 +530,7 @@
   case TOK.Not:
     // Check if this is part of a template instantiation.
     // TODO: comments aren't skipped. Use Token.nextNWS and Token.prevNWS
-    if (token.prev.type == TOK.Identifier && token.next.type == TOK.LParen)
+    if (token.prev.kind == TOK.Identifier && token.next.kind == TOK.LParen)
       goto default;
     print(tags[DP.Not]);
     break;