projects/dil: trunk/src/Parser.d comparison

comparison trunk/src/Parser.d @ 115:cea36caeec42

- Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier(). - Simplified parseModule().

author	aziz
date	Mon, 09 Jul 2007 13:17:00 +0000
parents	83bb5190c0fc
children	f0c1883cdd4c

comparison

equal deleted inserted replaced

-:83bb5190c0fc
+:cea36caeec42
 {
 Declaration[] decls;
 if (token.type == T.Module)
 {
-nT();
+ModuleName moduleName;
-string[] idents;
 do
 {
 nT();
-if (token.type == T.Identifier)
+moduleName ~= requireIdentifier();
-{
-idents ~= token.identifier;
-nT();
-}
-else
-{
-errorIfNot(T.Identifier);
-skipToOnePast(T.Semicolon);
-goto Lreturn;
-}
 } while (token.type == T.Dot)
 require(T.Semicolon);
-decls ~= new ModuleDeclaration(idents);
+decls ~= new ModuleDeclaration(moduleName);
 }
 decls ~= parseDeclarationDefinitions();
-Lreturn:
 return decls;
 }
 Declaration[] parseDeclarationDefinitions()
 {
 ModuleName[] moduleNames;
 string[] moduleAliases;
 string[] bindNames;
 string[] bindAliases;
+nT(); // Skip import keyword.
 do
 {
 ModuleName moduleName;
 string moduleAlias;
-if (token.type == T.Identifier)
+moduleAlias = requireIdentifier();
-{
-moduleAlias = token.identifier;
+// AliasName = ModuleName
+if (token.type == T.Assign)
+{
 nT();
-}
+moduleName ~= requireIdentifier();
-else
+}
-errorIfNot(T.Identifier); // TODO: better error msg
+else // import Identifier [^=]
-// import Identifier [^=]
-if (token.type != T.Assign)
 {
 moduleName ~= moduleAlias;
 moduleAlias = null;
 }
-else
-{
-nT();
-// AliasName = ModuleName
-if (token.type == T.Identifier)
-{
-moduleName ~= token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
-}
 // parse Identifier(.Identifier)*
 while (token.type == T.Dot)
 {
 nT();
-if (token.type == T.Identifier)
+moduleName ~= requireIdentifier();
-{
-moduleName ~= token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 }
 // Push identifiers.
 moduleNames ~= moduleName;
 moduleAliases ~= moduleAlias;
 {
 string bindName, bindAlias;
 do
 {
 nT();
-if (token.type == T.Identifier)
+bindAlias = requireIdentifier();
-{
-bindAlias = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 if (token.type == T.Assign)
 {
 nT();
-if (token.type == T.Identifier)
+bindName = requireIdentifier();
-{
-bindName = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 }
 else
 {
 bindName = bindAlias;
 bindAlias = null;
 string enumName;
 Type baseType;
 string[] members;
 Expression[] values;
-nT();
+nT(); // Skip enum keyword.
-if (token.type == T.Identifier)
+enumName = requireIdentifier();
-{
-enumName = token.identifier;
-nT();
-}
 if (token.type == T.Colon)
 {
 nT();
 baseType = parseBasicType();
 }
-//     if (token.type == T.Semicolon && ident.length == 0)
+if (token.type == T.Semicolon)
-// error
+{
-if (token.type == T.LBrace)
+//if (ident.length == 0)
+// TODO: issue error msg
+nT();
+}
+else if (token.type == T.LBrace)
 {
 nT();
 do
 {
-if (token.type == T.Identifier)
+members ~= requireIdentifier();
-{
-members ~= token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 if (token.type == T.Assign)
 {
+nT();
 values ~= parseAssignExpression();
-nT();
 }
 else
 values ~= null;
 if (token.type == T.Comma)
 nT();
 else if (token.type != T.RBrace)
+{
 errorIfNot(T.RBrace);
+break;
+}
 } while (token.type != T.RBrace)
 nT();
 }
 return new EnumDeclaration(enumName, baseType, members, values);
 string className;
 BaseClass[] bases;
 Declaration[] decls;
-nT();
+nT(); // Skip class keyword.
-if (token.type == T.Identifier)
+className = requireIdentifier();
-{
-className = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 if (token.type == T.LParen)
 {
 // TODO: parse template parameters
 }
 nT();
 }
 else if (token.type == T.LBrace)
 {
 nT();
+// TODO: think about setting a member status variable to a flag InClassBody... this way we can check for DeclDefs that are illegal in class bodies in the parsing phase.
 decls = parseDeclarationDefinitions();
 require(T.RBrace);
 }
 else
 errorIfNot(T.LBrace); // TODO: better error msg
 LisIdentifier:
 ident = token.identifier;
 nT();
 // TODO: handle template instantiations: class Foo : Bar!(int)
 }
+else
+errorIfNot(T.Identifier);
 bases ~= new BaseClass(prot, ident);
 if (token.type != T.Comma)
 break;
 }
 return bases;
 string name;
 BaseClass[] bases;
 Declaration[] decls;
-nT();
+nT(); // Skip interface keyword.
-if (token.type == T.Identifier)
+name = requireIdentifier();
-{
-name = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 if (token.type == T.LParen)
 {
 // TODO: parse template parameters
 }
 bases = parseBaseClasses();
 if (token.type == T.Semicolon)
 {
 //if (bases.length != 0)
-// error: bases classes are not allowed in forward declarations.
+// TODO: error: base classes are not allowed in forward declarations.
 nT();
 }
 else if (token.type == T.LBrace)
 {
 nT();
 TOK tok = token.type;
 string name;
 Declaration[] decls;
-nT();
+nT(); // Skip struct or union keyword.
+// name is optional.
 if (token.type == T.Identifier)
 {
 name = token.identifier;
 nT();
-}
+if (token.type == T.LParen)
+{
-if (token.type == T.LParen)
+// TODO: parse template parameters
-{
+}
-// TODO: parse template parameters
 }
 if (token.type == T.Semicolon)
-nT();
+{
+//if (name.length == 0)
+// TODO: error: forward declarations must have a name.
+nT();
+}
 else if (token.type == T.LBrace)
 {
 nT();
 decls = parseDeclarationDefinitions();
 require(T.RBrace);
 case T.LParen:
 // ( Type ) . Identifier
 auto type = parseType();
 require(T.RParen);
 require(T.Dot);
-string ident;
+string ident = requireIdentifier();
-if (token.type == T.Identifier)
-{
-ident = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 e = new TypeDotIdExpression(type, ident);
 break;
 default:
 e = parsePostExpression(parsePrimaryExpression());
 break;
 case T.Typeof:
 requireNext(T.LParen);
 auto type = new TypeofType(parseExpression());
 require(T.RParen);
 if (token.type == T.Dot)
-{
+{ // typeof ( Expression ) . Identifier
 nT();
-string ident;
+string ident = requireIdentifier;
-if (token.type == T.Identifier)
-{
-ident = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 e = new TypeDotIdExpression(type, ident);
 }
-else
+else // typeof ( Expression )
 e = new TypeofExpression(type);
 break;
 case T.Is:
 requireNext(T.LParen);
 T.Int,    T.Uint,    T.Long,   T.Ulong,
 T.Float,  T.Double,  T.Real,
 T.Ifloat, T.Idouble, T.Ireal,
 T.Cfloat, T.Cdouble, T.Creal:
 auto type = new Type(token.type);
 requireNext(T.Dot);
+auto ident = requireIdentifier();
-string ident;
-if (token.type == T.Identifier)
-{
-ident = token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 e = new TypeDotIdExpression(type, ident);
 break;
 default:
 // TODO: issue error msg and decide what to return.
 //         parse template instance
 Lident:
 while (token.type == T.Dot)
 {
 nT();
-if (token.type == T.Identifier)
+tident ~= requireIdentifier();
-{
-tident ~= token.identifier;
-nT();
-}
-else
-errorIfNot(T.Identifier);
 // TODO: parse template instance
 //       if (token.type == T.Not)
 //         parse template instance
 }
 t = tident;
 nT();
 else
 error(MID.ExpectedButFound, tok, token.srcText);
 }
+string requireIdentifier()
+{
+string identifier;
+if (token.type == T.Identifier)
+{
+identifier = token.identifier;
+nT();
+}
+else
+error(MID.ExpectedButFound, "Identifier", token.srcText);
+return identifier;
+}
 void error(MID id, ...)
 {
 errors ~= new Information(InfoType.Parser, id, lx.loc, arguments(_arguments, _argptr));
 }
 }

Mercurial > projects > dil

comparison trunk/src/Parser.d @ 115:cea36caeec42