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

comparison trunk/src/dil/Parser.d @ 508:943ecc9c133a

Added isIntegralType() to Token and refactored code.

author	Aziz K?ksal <aziz.koeksal@gmail.com>
date	Wed, 12 Dec 2007 03:25:07 +0100
parents	996041463028
children	baa7c4c0be78

comparison

equal deleted inserted replaced

-:996041463028
+:943ecc9c133a
 nT();
 decl = new EmptyDeclaration();
 break;
 // Declaration
 case T.Identifier, T.Dot, T.Typeof:
-// IntegralType
-case T.Char,   T.Wchar,   T.Dchar, T.Bool,
-T.Byte,   T.Ubyte,   T.Short, T.Ushort,
-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, T.Void:
 case_Declaration:
 return parseVariableOrFunction(this.storageClass, this.protection, this.linkageType);
 /+case T.Module:
 // TODO: Error: module is optional and can appear only once at the top of the source file.
 break;+/
 default:
+if (token.isIntegralType)
+goto case_Declaration;
 decl = new IllegalDeclaration();
 // Skip to next valid token.
 do
 nT();
 while (!token.isDeclDefStart &&
 Statement parseStatement()
 {
 auto begin = token;
 Statement s;
 Declaration d;
+if (token.isIntegralType)
+{
+d = parseVariableOrFunction();
+goto LreturnDeclarationStatement;
+}
 switch (token.type)
 {
 case T.Align:
 uint size = parseAlignAttribute();
 // Restrict align attribute to structs in parsing phase.
 else
 expected(T.Struct);
 d = new AlignDeclaration(size, structDecl ? cast(Declaration)structDecl : new Declarations);
 goto LreturnDeclarationStatement;
 /+ Not applicable for statements.
-//          T.Private,
+T.Private, T.Package, T.Protected, T.Public, T.Export,
-//          T.Package,
+T.Deprecated, T.Override, T.Abstract,+/
-//          T.Protected,
-//          T.Public,
-//          T.Export,
-//          T.Deprecated,
-//          T.Override,
-//          T.Abstract,
-+/
 case T.Extern,
 T.Final,
 T.Const,
 T.Auto:
 //T.Scope
 );
 if (success)
 goto LreturnDeclarationStatement; // Declaration
 else
 goto case_parseExpressionStatement; // Expression
-// IntegralType
-case T.Char,   T.Wchar,   T.Dchar, T.Bool,
-T.Byte,   T.Ubyte,   T.Short, T.Ushort,
-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, T.Void:
-case_parseDeclaration:
-d = parseVariableOrFunction();
-goto LreturnDeclarationStatement;
 case T.If:
 s = parseIfStatement();
 break;
 case T.While:
 s = parseWhileStatement();
 // case T.Mixin:
 case T.Import:
 case T.Typeid:
 case T.Is:
 case T.LParen:
-/+ // IntegralType
-case T.Char,   T.Wchar,   T.Dchar, T.Bool,
-T.Byte,   T.Ubyte,   T.Short, T.Ushort,
-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, T.Void:+/
 case T.Traits: // D2.0
 // Tokens that can start a UnaryExpression:
-case T.AndBinary,
+case T.AndBinary, T.PlusPlus, T.MinusMinus, T.Mul, T.Minus,
-T.PlusPlus,
+T.Plus, T.Not, T.Tilde, T.New, T.Delete, T.Cast:
-T.MinusMinus,
-T.Mul,
-T.Minus,
-T.Plus,
-T.Not,
-T.Tilde,
-T.New,
-T.Delete,
-T.Cast:
 case_parseExpressionStatement:
 s = new ExpressionStatement(parseExpression());
 require(T.Semicolon);
 break;
 default:
 e = parseExpression();
 require(T.RParen);
 // TODO: create ParenExpression?
 }
 break;
-// IntegralType . Identifier
-case T.Char,   T.Wchar,   T.Dchar, T.Bool,
-T.Byte,   T.Ubyte,   T.Short, T.Ushort,
-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, T.Void:
-auto type = new IntegralType(token.type);
-nT();
-set(type, begin);
-require(T.Dot);
-auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
-e = new TypeDotIdExpression(type, ident);
-break;
 version(D2)
 {
 case T.Traits:
 nT();
 require(T.LParen);
 require(T.RParen);
 e = new TraitsExpression(id, args);
 break;
 }
 default:
-if (token.isSpecialToken)
+if (token.isIntegralType)
+{ // IntegralType . Identifier
+auto type = new IntegralType(token.type);
+nT();
+set(type, begin);
+require(T.Dot);
+auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
+e = new TypeDotIdExpression(type, ident);
+}
+else if (token.isSpecialToken)
 {
 e = new SpecialTokenExpression(token);
 nT();
-break;
+}
-}
+else
+{
 error(MID.ExpectedButFound, "Expression", token.srcText);
 e = new EmptyExpression();
 if (!trying)
 {
 // Insert a dummy token and don't consume current one.
 begin = lx.insertEmptyTokenBefore(token);
 this.prevToken = begin;
+}
 }
 }
 set(e, begin);
 return e;
 }
 Type parseBasicType()
 {
 auto begin = token;
 Type t;
-//     IdentifierType tident;
+if (token.isIntegralType)
+{
+t = new IntegralType(token.type);
+nT();
+}
+else
 switch (token.type)
 {
-case T.Char,   T.Wchar,   T.Dchar, T.Bool,
-T.Byte,   T.Ubyte,   T.Short, T.Ushort,
-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, T.Void:
-t = new IntegralType(token.type);
-nT();
-set(t, begin);
-break;
 case T.Identifier, T.Typeof, T.Dot:
 t = parseDotListType();
 assert(!isNodeSet(t));
-set(t, begin);
 break;
 version(D2)
 {
 case T.Const:
 // const ( Type )
 nT();
 require(T.LParen);
 t = parseType();
 require(T.RParen);
 t = new ConstType(t);
-set(t, begin);
 break;
 case T.Invariant:
 // invariant ( Type )
 nT();
 require(T.LParen);
 t = parseType();
 require(T.RParen);
 t = new InvariantType(t);
-set(t, begin);
 break;
 } // version(D2)
 default:
 error(MID.ExpectedButFound, "BasicType", token.srcText);
 t = new UndefinedType();
 nT();
-set(t, begin);
+}
-}
+return set(t, begin);
-return t;
 }
 Type parseBasicType2(Type t)
 {
 typeof(token) begin;

Mercurial > projects > dil

comparison trunk/src/dil/Parser.d @ 508:943ecc9c133a