# HG changeset patch
# User aziz
# Date 1186164301 0
# Node ID 3a2a0a63c6385fcde2d25cc9811f0fa33c7a2a4e
# Parent  50cc74026ea8144762e96c41c28671ae393694ce
- Changed some string types to Token*.

diff -r 50cc74026ea8 -r 3a2a0a63c638 trunk/src/Declarations.d
--- a/trunk/src/Declarations.d	Fri Aug 03 17:51:02 2007 +0000
+++ b/trunk/src/Declarations.d	Fri Aug 03 18:05:01 2007 +0000
@@ -308,10 +308,10 @@
 
 class TemplateDeclaration : Declaration
 {
-  string templateName;
+  Token* templateName;
   TemplateParameters templateParams;
   Declaration[] decls;
-  this(string templateName, TemplateParameters templateParams, Declaration[] decls)
+  this(Token* templateName, TemplateParameters templateParams, Declaration[] decls)
   {
     super(true);
     this.templateName = templateName;
diff -r 50cc74026ea8 -r 3a2a0a63c638 trunk/src/Parser.d
--- a/trunk/src/Parser.d	Fri Aug 03 17:51:02 2007 +0000
+++ b/trunk/src/Parser.d	Fri Aug 03 18:05:01 2007 +0000
@@ -546,8 +546,8 @@
         if (token.type == T.LParen)
         {
           nT();
-          auto ident = requireIdentifier();
-          switch (ident)
+          auto ident = requireId();
+          switch (ident ? ident.identifier : null)
           {
           case "C":
             if (token.type == T.PlusPlus)
@@ -1250,7 +1250,7 @@
   {
     assert(token.type == T.Template);
     nT(); // Skip template keyword.
-    auto templateName = requireIdentifier();
+    auto templateName = requireId();
     auto templateParams = parseTemplateParameterList();
     auto decls = parseDeclarationDefinitionsBlock();
     return new TemplateDeclaration(templateName, templateParams, decls);
@@ -1757,8 +1757,8 @@
         if (token.type == T.LParen)
         {
           nT();
-          auto ident = requireIdentifier();
-          switch (ident)
+          auto ident = requireId();
+          switch (ident ? ident.identifier : null)
           {
           case "C":
             if (token.type == T.PlusPlus)