Mercurial > projects > dil

changeset 263:ebcf7941f1db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Changed some string types to Token*.
author aziz
date Fri, 03 Aug 2007 17:08:02 +0000
parents 0f22269e76ff
children 50cc74026ea8
files trunk/src/Declarations.d trunk/src/Expressions.d trunk/src/Parser.d
diffstat 3 files changed, 21 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/src/Declarations.d	Fri Aug 03 17:01:05 2007 +0000
+++ b/trunk/src/Declarations.d	Fri Aug 03 17:08:02 2007 +0000
@@ -37,7 +37,7 @@
   }
 }
 
-alias string[] ModuleName; // Identifier(.Identifier)*
+alias Token*[] ModuleName; // Identifier(.Identifier)*
 
 class ModuleDeclaration : Declaration
 {
@@ -52,10 +52,10 @@
 class ImportDeclaration : Declaration
 {
   ModuleName[] moduleNames;
-  string[] moduleAliases;
-  string[] bindNames;
-  string[] bindAliases;
-  this(ModuleName[] moduleNames, string[] moduleAliases, string[] bindNames, string[] bindAliases)
+  Token*[] moduleAliases;
+  Token*[] bindNames;
+  Token*[] bindAliases;
+  this(ModuleName[] moduleNames, Token*[] moduleAliases, Token*[] bindNames, Token*[] bindAliases)
   {
     super(false);
     this.moduleNames = moduleNames;
--- a/trunk/src/Expressions.d	Fri Aug 03 17:01:05 2007 +0000
+++ b/trunk/src/Expressions.d	Fri Aug 03 17:08:02 2007 +0000
@@ -635,9 +635,9 @@
 
 class StructInitializer : Expression
 {
-  string[] idents;
+  Token*[] idents;
   Expression[] values;
-  this(string[] idents, Expression[] values)
+  this(Token*[] idents, Expression[] values)
   {
     this.idents = idents;
     this.values = values;
--- a/trunk/src/Parser.d	Fri Aug 03 17:01:05 2007 +0000
+++ b/trunk/src/Parser.d	Fri Aug 03 17:08:02 2007 +0000
@@ -118,7 +118,7 @@
       do
       {
         nT();
-        moduleName ~= requireIdentifier();
+        moduleName ~= requireId();
       } while (token.type == T.Dot)
       require(T.Semicolon);
       decls ~= set(new ModuleDeclaration(moduleName), begin);
@@ -429,7 +429,7 @@
       //         { StructMemberInitializers }
       Expression parseStructInitializer()
       {
-        string[] idents;
+        Token*[] idents;
         Expression[] values;
 
         nT();
@@ -440,7 +440,7 @@
             // Peek for colon to see if this is a member identifier.
             if (peekNext() == T.Colon)
             {
-              idents ~= token.identifier();
+              idents ~= token;
               nT();
               nT();
             }
@@ -718,23 +718,23 @@
     }
 
     ModuleName[] moduleNames;
-    string[] moduleAliases;
-    string[] bindNames;
-    string[] bindAliases;
+    Token*[] moduleAliases;
+    Token*[] bindNames;
+    Token*[] bindAliases;
 
     nT(); // Skip import keyword.
     do
     {
       ModuleName moduleName;
-      string moduleAlias;
-
-      moduleAlias = requireIdentifier();
+      Token* moduleAlias;
+
+      moduleAlias = requireId();
 
       // AliasName = ModuleName
       if (token.type == T.Assign)
       {
         nT();
-        moduleName ~= requireIdentifier();
+        moduleName ~= requireId();
       }
       else // import Identifier [^=]
       {
@@ -747,7 +747,7 @@
       while (token.type == T.Dot)
       {
         nT();
-        moduleName ~= requireIdentifier();
+        moduleName ~= requireId();
       }
 
       // Push identifiers.
@@ -758,16 +758,16 @@
       //       : BindName(, BindName)*;
       if (token.type == T.Colon)
       {
-        string bindName, bindAlias;
+        Token* bindName, bindAlias;
         do
         {
           nT();
-          bindAlias = requireIdentifier();
+          bindAlias = requireId();
 
           if (token.type == T.Assign)
           {
             nT();
-            bindName = requireIdentifier();
+            bindName = requireId();
           }
           else
           {