forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup on lexer. More work on the parser and AST

This commit is contained in:
Hackerpilot 2013-05-30 01:12:10 +00:00
parent 8a7c962d16
commit e405a1ad2b
3 changed files with 2634 additions and 1632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

448
std/d/ast.d
View File

@ -1,220 +1,234 @@
// Written in the D programming language. // Written in the D programming language.
/** /**
* This module defines an Abstract Syntax Tree for the D language * This module defines an Abstract Syntax Tree for the D language
*/ *
* Examples:
* ---
* // TODO
* ---
*
* Copyright: Brian Schott 2013
* License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt Boost, License 1.0)
* Authors: Brian Schott
* Source: $(PHOBOSSRC std/d/_ast.d)
*/
module std.d.ast; module std.d.ast;
import std.d.lexer; import std.d.lexer;
interface ASTVisitor /**
* Implements the $(LINK2 http://en.wikipedia.org/wiki/Visitor_pattern, Visitor Pattern)
* for the various AST classes
*/
abstract class ASTVisitor
{ {
void visit(AddExpression addExpression); /** */ void visit(AddExpression addExpression) {}
void visit(AliasDeclaration aliasDeclaration); /** */ void visit(AliasDeclaration aliasDeclaration) {}
void visit(AliasInitializer aliasInitializer); /** */ void visit(AliasInitializer aliasInitializer) {}
void visit(AliasThisDeclaration aliasThisDeclaration); /** */ void visit(AliasThisDeclaration aliasThisDeclaration) {}
void visit(AlignAttribute alignAttribute); /** */ void visit(AlignAttribute alignAttribute) {}
void visit(AndAndExpression andAndExpression); /** */ void visit(AndAndExpression andAndExpression) {}
void visit(AndExpression andExpression); /** */ void visit(AndExpression andExpression) {}
void visit(ArgumentList argumentList); /** */ void visit(ArgumentList argumentList) {}
void visit(Arguments arguments); /** */ void visit(Arguments arguments) {}
void visit(ArrayInitializer arrayInitializer); /** */ void visit(ArrayInitializer arrayInitializer) {}
void visit(ArrayLiteral arrayLiteral); /** */ void visit(ArrayLiteral arrayLiteral) {}
void visit(ArrayMemberInitialization arrayMemberInitialization); /** */ void visit(ArrayMemberInitialization arrayMemberInitialization) {}
void visit(ArrayMemberInitializations arrayMemberInitializations); /** */ void visit(ArrayMemberInitializations arrayMemberInitializations) {}
void visit(AsmAddExp asmAddExp); /** */ void visit(AsmAddExp asmAddExp) {}
void visit(AsmAndExp asmAndExp); /** */ void visit(AsmAndExp asmAndExp) {}
void visit(AsmBrExp asmBrExp); /** */ void visit(AsmBrExp asmBrExp) {}
void visit(AsmEqualExp asmEqualExp); /** */ void visit(AsmEqualExp asmEqualExp) {}
void visit(AsmExp asmExp); /** */ void visit(AsmExp asmExp) {}
void visit(AsmInstruction asmInstruction); /** */ void visit(AsmInstruction asmInstruction) {}
void visit(AsmLogAndExp asmLogAndExp); /** */ void visit(AsmLogAndExp asmLogAndExp) {}
void visit(AsmLogOrExp asmLogOrExp); /** */ void visit(AsmLogOrExp asmLogOrExp) {}
void visit(AsmMulExp asmMulExp); /** */ void visit(AsmMulExp asmMulExp) {}
void visit(AsmOrExp asmOrExp); /** */ void visit(AsmOrExp asmOrExp) {}
void visit(AsmPrimaryExp asmPrimaryExp); /** */ void visit(AsmPrimaryExp asmPrimaryExp) {}
void visit(AsmRelExp asmRelExp); /** */ void visit(AsmRelExp asmRelExp) {}
void visit(AsmShiftExp asmShiftExp); /** */ void visit(AsmShiftExp asmShiftExp) {}
void visit(AsmStatement asmStatement); /** */ void visit(AsmStatement asmStatement) {}
void visit(AsmTypePrefix asmTypePrefix); /** */ void visit(AsmTypePrefix asmTypePrefix) {}
void visit(AsmUnaExp asmUnaExp); /** */ void visit(AsmUnaExp asmUnaExp) {}
void visit(AsmXorExp asmXorExp); /** */ void visit(AsmXorExp asmXorExp) {}
void visit(AssertExpression assertExpression); /** */ void visit(AssertExpression assertExpression) {}
void visit(AssertStatement assertStatement); /** */ void visit(AssertStatement assertStatement) {}
void visit(AssignExpression assignExpression); /** */ void visit(AssignExpression assignExpression) {}
void visit(AssignStatement assignStatement); /** */ void visit(AssignStatement assignStatement) {}
void visit(AssocArrayLiteral assocArrayLiteral); /** */ void visit(AssocArrayLiteral assocArrayLiteral) {}
void visit(AtAttribute atAttribute); /** */ void visit(AtAttribute atAttribute) {}
void visit(Attribute attribute); /** */ void visit(Attribute attribute) {}
void visit(AttributedDeclaration attributedDeclaration); /** */ void visit(AttributedDeclaration attributedDeclaration) {}
void visit(AutoDeclaration autoDeclaration); /** */ void visit(AutoDeclaration autoDeclaration) {}
void visit(BlockStatement blockStatement); /** */ void visit(BlockStatement blockStatement) {}
void visit(BodyStatement bodyStatement); /** */ void visit(BodyStatement bodyStatement) {}
void visit(BreakStatement breakStatement); /** */ void visit(BreakStatement breakStatement) {}
void visit(BuiltinType builtinType); /** */ void visit(BuiltinType builtinType) {}
void visit(CaseRangeStatement caseRangeStatement); /** */ void visit(CaseRangeStatement caseRangeStatement) {}
void visit(CaseStatement caseStatement); /** */ void visit(CaseStatement caseStatement) {}
void visit(CastExpression castExpression); /** */ void visit(CastExpression castExpression) {}
void visit(CastQualifier castQualifier); /** */ void visit(CastQualifier castQualifier) {}
void visit(Catch catch_); /** */ void visit(Catch catch_) {}
void visit(Catches catches); /** */ void visit(Catches catches) {}
void visit(ClassBody classBody); /** */ void visit(ClassBody classBody) {}
void visit(ClassDeclaration classDeclaration); /** */ void visit(ClassDeclaration classDeclaration) {}
void visit(CmpExpression cmpExpression); /** */ void visit(CmpExpression cmpExpression) {}
void visit(CompileCondition compileCondition); /** */ void visit(CompileCondition compileCondition) {}
void visit(ConditionalDeclaration conditionalDeclaration); /** */ void visit(ConditionalDeclaration conditionalDeclaration) {}
void visit(ConditionalStatement conditionalStatement); /** */ void visit(ConditionalStatement conditionalStatement) {}
void visit(Constraint constraint); /** */ void visit(Constraint constraint) {}
void visit(Constructor constructor); /** */ void visit(Constructor constructor) {}
void visit(ContinueStatement continueStatement); /** */ void visit(ContinueStatement continueStatement) {}
void visit(DebugCondition debugCondition); /** */ void visit(DebugCondition debugCondition) {}
void visit(DebugSpecification debugSpecification); /** */ void visit(DebugSpecification debugSpecification) {}
void visit(Declaration declaration); /** */ void visit(Declaration declaration) {}
void visit(DeclarationsAndStatements declarationsAndStatements); /** */ void visit(DeclarationsAndStatements declarationsAndStatements) {}
void visit(Declarator declarator); /** */ void visit(Declarator declarator) {}
void visit(DeclaratorSuffix declaratorSuffix); /** */ void visit(DeclaratorSuffix declaratorSuffix) {}
void visit(DefaultStatement defaultStatement); /** */ void visit(DefaultStatement defaultStatement) {}
void visit(DeleteExpression deleteExpression); /** */ void visit(DeleteExpression deleteExpression) {}
void visit(DeleteStatement deleteStatement); /** */ void visit(DeleteStatement deleteStatement) {}
void visit(Deprecated deprecated_); /** */ void visit(Deprecated deprecated_) {}
void visit(Destructor destructor); /** */ void visit(Destructor destructor) {}
void visit(DoStatement doStatement); /** */ void visit(DoStatement doStatement) {}
void visit(EnumBody enumBody); /** */ void visit(EnumBody enumBody) {}
void visit(EnumDeclaration enumDeclaration); /** */ void visit(EnumDeclaration enumDeclaration) {}
void visit(EnumMember enumMember); /** */ void visit(EnumMember enumMember) {}
void visit(EqualExpression equalExpression); /** */ void visit(EqualExpression equalExpression) {}
void visit(Expression expression); /** */ void visit(Expression expression) {}
void visit(FinalSwitchStatement finalSwitchStatement); /** */ void visit(FinalSwitchStatement finalSwitchStatement) {}
void visit(Finally finally_); /** */ void visit(Finally finally_) {}
void visit(ForStatement forStatement); /** */ void visit(ForStatement forStatement) {}
void visit(ForeachRangeStatement foreachRangeStatement); /** */ void visit(ForeachRangeStatement foreachRangeStatement) {}
void visit(ForeachStatement foreachStatement); /** */ void visit(ForeachStatement foreachStatement) {}
void visit(ForeachType foreachType); /** */ void visit(ForeachType foreachType) {}
void visit(ForeachTypeList foreachTypeList); /** */ void visit(ForeachTypeList foreachTypeList) {}
void visit(FunctionAttribute functionAttribute); /** */ void visit(FunctionAttribute functionAttribute) {}
void visit(FunctionBody functionBody); /** */ void visit(FunctionBody functionBody) {}
void visit(FunctionCallExpression functionCallExpression); /** */ void visit(FunctionCallExpression functionCallExpression) {}
void visit(FunctionCallStatement functionCallStatement); /** */ void visit(FunctionCallStatement functionCallStatement) {}
void visit(FunctionDeclaration functionDeclaration); /** */ void visit(FunctionDeclaration functionDeclaration) {}
void visit(FunctionLiteralExpression functionLiteralExpression); /** */ void visit(FunctionLiteralExpression functionLiteralExpression) {}
void visit(GotoStatement gotoStatement); /** */ void visit(GotoStatement gotoStatement) {}
void visit(IdentifierChain identifierChain); /** */ void visit(IdentifierChain identifierChain) {}
void visit(IdentifierList identifierList); /** */ void visit(IdentifierList identifierList) {}
void visit(IdentifierOrTemplateChain identifierOrTemplateChain); /** */ void visit(IdentifierOrTemplateChain identifierOrTemplateChain) {}
void visit(IdentifierOrTemplateInstance identifierOrTemplateInstance); /** */ void visit(IdentifierOrTemplateInstance identifierOrTemplateInstance) {}
void visit(IdentityExpression identityExpression); /** */ void visit(IdentityExpression identityExpression) {}
void visit(IfStatement ifStatement); /** */ void visit(IfStatement ifStatement) {}
void visit(ImportBind importBind); /** */ void visit(ImportBind importBind) {}
void visit(ImportBindings importBindings); /** */ void visit(ImportBindings importBindings) {}
void visit(ImportDeclaration importDeclaration); /** */ void visit(ImportDeclaration importDeclaration) {}
void visit(ImportExpression importExpression); /** */ void visit(ImportExpression importExpression) {}
void visit(ImportList importList); /** */ void visit(ImportList importList) {}
void visit(InExpression inExpression); /** */ void visit(InExpression inExpression) {}
void visit(InStatement inStatement); /** */ void visit(InStatement inStatement) {}
void visit(Initialize initialize); /** */ void visit(Initialize initialize) {}
void visit(Initializer initializer); /** */ void visit(Initializer initializer) {}
void visit(InterfaceDeclaration interfaceDeclaration); /** */ void visit(InterfaceDeclaration interfaceDeclaration) {}
void visit(Invariant invariant_); /** */ void visit(Invariant invariant_) {}
void visit(IsExpression isExpression); /** */ void visit(IsExpression isExpression) {}
void visit(KeyValuePair keyValuePair); /** */ void visit(KeyValuePair keyValuePair) {}
void visit(KeyValuePairs keyValuePairs); /** */ void visit(KeyValuePairs keyValuePairs) {}
void visit(LabeledStatement labeledStatement); /** */ void visit(LabeledStatement labeledStatement) {}
void visit(LambdaExpression lambdaExpression); /** */ void visit(LambdaExpression lambdaExpression) {}
void visit(LastCatch lastCatch); /** */ void visit(LastCatch lastCatch) {}
void visit(LinkageAttribute linkageAttribute); /** */ void visit(LinkageAttribute linkageAttribute) {}
void visit(MemberFunctionAttribute memberFunctionAttribute); /** */ void visit(MemberFunctionAttribute memberFunctionAttribute) {}
void visit(MixinDeclaration mixinDeclaration); /** */ void visit(MixinDeclaration mixinDeclaration) {}
void visit(MixinExpression mixinExpression); /** */ void visit(MixinExpression mixinExpression) {}
void visit(MixinTemplateName mixinTemplateName); /** */ void visit(MixinTemplateName mixinTemplateName) {}
void visit(Module module_); /** */ void visit(Module module_) {}
void visit(ModuleDeclaration moduleDeclaration); /** */ void visit(ModuleDeclaration moduleDeclaration) {}
void visit(MulExpression mulExpression); /** */ void visit(MulExpression mulExpression) {}
void visit(NewAnonClassExpression newAnonClassExpression); /** */ void visit(NewAnonClassExpression newAnonClassExpression) {}
void visit(NewExpression newExpression); /** */ void visit(NewExpression newExpression) {}
void visit(NonEmptyStatement nonEmptyStatement); /** */ void visit(NonEmptyStatement nonEmptyStatement) {}
void visit(NonEmptyStatementNoCaseNoDefault nonEmptyStatementNoCaseNoDefault); /** */ void visit(NonEmptyStatementNoCaseNoDefault nonEmptyStatementNoCaseNoDefault) {}
void visit(NonVoidInitializer nonVoidInitializer); /** */ void visit(NonVoidInitializer nonVoidInitializer) {}
void visit(Opcode opcode); /** */ void visit(Opcode opcode) {}
void visit(Operand operand); /** */ void visit(Operand operand) {}
void visit(Operands operands); /** */ void visit(Operands operands) {}
void visit(OrExpression orExpression); /** */ void visit(OrExpression orExpression) {}
void visit(OrOrExpression orOrExpression); /** */ void visit(OrOrExpression orOrExpression) {}
void visit(OutStatement outStatement); /** */ void visit(OutStatement outStatement) {}
void visit(Parameter parameter); /** */ void visit(Parameter parameter) {}
void visit(ParameterAttribute parameterAttribute); /** */ void visit(ParameterAttribute parameterAttribute) {}
void visit(Parameters parameters); /** */ void visit(Parameters parameters) {}
void visit(PostIncDecExpression postIncDecExpression); /** */ void visit(PostIncDecExpression postIncDecExpression) {}
void visit(PowExpression powExpression); /** */ void visit(PowExpression powExpression) {}
void visit(PragmaDeclaration pragmaDeclaration); /** */ void visit(PragmaDeclaration pragmaDeclaration) {}
void visit(PragmaExpression pragmaExpression); /** */ void visit(PragmaExpression pragmaExpression) {}
void visit(PreIncDecExpression preIncDecExpression); /** */ void visit(PreIncDecExpression preIncDecExpression) {}
void visit(PrimaryExpression primaryExpression); /** */ void visit(PrimaryExpression primaryExpression) {}
void visit(ProtectionAttribute protectionAttribute); /** */ void visit(ProtectionAttribute protectionAttribute) {}
void visit(Register register); /** */ void visit(Register register) {}
void visit(RelExpression relExpression); /** */ void visit(RelExpression relExpression) {}
void visit(ReturnStatement returnStatement); /** */ void visit(ReturnStatement returnStatement) {}
void visit(ScopeGuardStatement scopeGuardStatement); /** */ void visit(ScopeGuardStatement scopeGuardStatement) {}
void visit(SharedStaticConstructor sharedStaticConstructor); /** */ void visit(SharedStaticConstructor sharedStaticConstructor) {}
void visit(SharedStaticDestructor sharedStaticDestructor); /** */ void visit(SharedStaticDestructor sharedStaticDestructor) {}
void visit(ShiftExpression shiftExpression); /** */ void visit(ShiftExpression shiftExpression) {}
void visit(SingleImport singleImport); /** */ void visit(SingleImport singleImport) {}
void visit(Statement statement); /** */ void visit(Statement statement) {}
void visit(StatementNoCaseNoDefault statementNoCaseNoDefault); /** */ void visit(StatementNoCaseNoDefault statementNoCaseNoDefault) {}
void visit(StaticAssertDeclaration staticAssertDeclaration); /** */ void visit(StaticAssertDeclaration staticAssertDeclaration) {}
void visit(StaticAssertStatement staticAssertStatement); /** */ void visit(StaticAssertStatement staticAssertStatement) {}
void visit(StaticConstructor staticConstructor); /** */ void visit(StaticConstructor staticConstructor) {}
void visit(StaticDestructor staticDestructor); /** */ void visit(StaticDestructor staticDestructor) {}
void visit(StaticIfCondition staticIfCondition); /** */ void visit(StaticIfCondition staticIfCondition) {}
void visit(StorageClass storageClass); /** */ void visit(StorageClass storageClass) {}
void visit(StructBody structBody); /** */ void visit(StructBody structBody) {}
void visit(StructDeclaration structDeclaration); /** */ void visit(StructDeclaration structDeclaration) {}
void visit(StructInitializer structInitializer); /** */ void visit(StructInitializer structInitializer) {}
void visit(StructMemberInitializer structMemberInitializer); /** */ void visit(StructMemberInitializer structMemberInitializer) {}
void visit(StructMemberInitializers structMemberInitializers); /** */ void visit(StructMemberInitializers structMemberInitializers) {}
void visit(SwitchBody switchBody); /** */ void visit(SwitchBody switchBody) {}
void visit(SwitchStatement switchStatement); /** */ void visit(SwitchStatement switchStatement) {}
void visit(Symbol symbol); /** */ void visit(Symbol symbol) {}
void visit(SynchronizedStatement synchronizedStatement); /** */ void visit(SynchronizedStatement synchronizedStatement) {}
void visit(TemplateAliasParameter templateAliasParameter); /** */ void visit(TemplateAliasParameter templateAliasParameter) {}
void visit(TemplateArgument templateArgument); /** */ void visit(TemplateArgument templateArgument) {}
void visit(TemplateArgumentList templateArgumentList); /** */ void visit(TemplateArgumentList templateArgumentList) {}
void visit(TemplateArguments templateArguments); /** */ void visit(TemplateArguments templateArguments) {}
void visit(TemplateDeclaration templateDeclaration); /** */ void visit(TemplateDeclaration templateDeclaration) {}
void visit(TemplateInstance templateInstance); /** */ void visit(TemplateInstance templateInstance) {}
void visit(TemplateMixinStatement templateMixinStatement); /** */ void visit(TemplateMixinStatement templateMixinStatement) {}
void visit(TemplateParameter templateParameter); /** */ void visit(TemplateParameter templateParameter) {}
void visit(TemplateParameterList templateParameterList); /** */ void visit(TemplateParameterList templateParameterList) {}
void visit(TemplateParameters templateParameters); /** */ void visit(TemplateParameters templateParameters) {}
void visit(TemplateSingleArgument templateSingleArgument); /** */ void visit(TemplateSingleArgument templateSingleArgument) {}
void visit(TemplateThisParameter templateThisParameter); /** */ void visit(TemplateThisParameter templateThisParameter) {}
void visit(TemplateTupleParameter templateTupleParameter); /** */ void visit(TemplateTupleParameter templateTupleParameter) {}
void visit(TemplateTypeParameter templateTypeParameter); /** */ void visit(TemplateTypeParameter templateTypeParameter) {}
void visit(TemplateValueParameter templateValueParameter); /** */ void visit(TemplateValueParameter templateValueParameter) {}
void visit(TemplateValueParameterDefault templateValueParameterDefault); /** */ void visit(TemplateValueParameterDefault templateValueParameterDefault) {}
void visit(TernaryExpression ternaryExpression); /** */ void visit(TernaryExpression ternaryExpression) {}
void visit(ThrowStatement throwStatement); /** */ void visit(ThrowStatement throwStatement) {}
void visit(TraitsArgument traitsArgument); /** */ void visit(TraitsArgument traitsArgument) {}
void visit(TraitsExpression traitsExpression); /** */ void visit(TraitsExpression traitsExpression) {}
void visit(TryStatement tryStatement); /** */ void visit(TryStatement tryStatement) {}
void visit(Type type); /** */ void visit(Type type) {}
void visit(Type2 type2); /** */ void visit(Type2 type2) {}
void visit(Type3 type3); /** */ void visit(Type3 type3) {}
void visit(TypeConstructor typeConstructor); /** */ void visit(TypeConstructor typeConstructor) {}
void visit(TypeConstructors typeConstructors); /** */ void visit(TypeConstructors typeConstructors) {}
void visit(TypeSpecialization typeSpecialization); /** */ void visit(TypeSpecialization typeSpecialization) {}
void visit(TypeSuffix typeSuffix); /** */ void visit(TypeSuffix typeSuffix) {}
void visit(TypeidExpression typeidExpression); /** */ void visit(TypeidExpression typeidExpression) {}
void visit(TypeofExpression typeofExpression); /** */ void visit(TypeofExpression typeofExpression) {}
void visit(UnaryExpression unaryExpression); /** */ void visit(UnaryExpression unaryExpression) {}
void visit(UnionDeclaration unionDeclaration); /** */ void visit(UnionDeclaration unionDeclaration) {}
void visit(Unittest unittest_); /** */ void visit(Unittest unittest_) {}
void visit(VariableDeclaration variableDeclaration); /** */ void visit(VariableDeclaration variableDeclaration) {}
void visit(VersionCondition versionCondition); /** */ void visit(VersionCondition versionCondition) {}
void visit(VersionSpecification versionSpecification); /** */ void visit(VersionSpecification versionSpecification) {}
void visit(WhileStatement whileStatement); /** */ void visit(WhileStatement whileStatement) {}
void visit(WithStatement withStatement); /** */ void visit(WithStatement withStatement) {}
void visit(XorExpression xorExpression); /** */ void visit(XorExpression xorExpression) {}
} }
interface ASTNode interface ASTNode
@ -237,7 +251,8 @@ class AddExpression : ASTNode
public: public:
mixin(DEFAULT_ACCEPT); mixin(DEFAULT_ACCEPT);
Token operator; Token operator;
AddExpression addExpression; AddExpression left;
AddExpression right;
MulExpression mulExpression; MulExpression mulExpression;
} }
@ -269,16 +284,15 @@ class AlignAttribute : ASTNode
{ {
public: public:
mixin(DEFAULT_ACCEPT); mixin(DEFAULT_ACCEPT);
Token integerLiteral; Token intLiteral;
} }
class AndAndExpression : ASTNode class AndAndExpression : ASTNode
{ {
public: public:
mixin(DEFAULT_ACCEPT); mixin(DEFAULT_ACCEPT);
OrExpression orExpression; AndAndExpression left;
AndAndExpression andandExpression; OrExpression right;
CmpExpression cmpExpression;
} }
class AndExpression : ASTNode class AndExpression : ASTNode
@ -1240,8 +1254,8 @@ class MulExpression : ASTNode
public: public:
mixin(DEFAULT_ACCEPT); mixin(DEFAULT_ACCEPT);
Token operator; Token operator;
MulExpression mulExpression; UnaryExpression left;
PowExpression powExpression; UnaryExpression right;
} }
class NewAnonClassExpression : ASTNode class NewAnonClassExpression : ASTNode
@ -1988,6 +2002,6 @@ class XorExpression : ASTNode
{ {
public: public:
mixin(DEFAULT_ACCEPT); mixin(DEFAULT_ACCEPT);
XorExpression xorExpression; XorExpression left;
AndExpression andExpression; AndExpression right;
} }

9
std/d/lexer.d
View File

@ -23,7 +23,7 @@
* auto tokens = byToken(source, config); * auto tokens = byToken(source, config);
* --- * ---
* The result of byToken$(LPAREN)$(RPAREN) is a forward range of tokens that can * The result of byToken$(LPAREN)$(RPAREN) is a forward range of tokens that can
* be used easily with the algorithms from std.algorithm or iterated over with * be easily used with the algorithms from std.algorithm or iterated over with
* $(D_KEYWORD foreach) * $(D_KEYWORD foreach)
* --- * ---
* assert (tokens.front.type == TokenType.import_); * assert (tokens.front.type == TokenType.import_);
@ -47,7 +47,6 @@
* stdout.write(`<span class="`, cssClass, `">`, value.replace("&", "&amp;").replace("<", "&lt;"), `</span>`); * stdout.write(`<span class="`, cssClass, `">`, value.replace("&", "&amp;").replace("<", "&lt;"), `</span>`);
* } * }
* *
*
* // http://ethanschoonover.com/solarized * // http://ethanschoonover.com/solarized
* void highlight(R)(R tokens) * void highlight(R)(R tokens)
* { * {
@ -71,7 +70,7 @@
* *
* foreach (Token t; tokens) * foreach (Token t; tokens)
* { * {
* if (isType(t.type)) * if (isBuiltType(t.type))
* writeSpan("type", t.value); * writeSpan("type", t.value);
* else if (isKeyword(t.type)) * else if (isKeyword(t.type))
* writeSpan("kwrd", t.value); * writeSpan("kwrd", t.value);
@ -2211,9 +2210,9 @@ enum TokenType: ushort
uintLiteral, /// 123u uintLiteral, /// 123u
ulongLiteral, /// 123uL ulongLiteral, /// 123uL
characterLiteral, /// 'a' characterLiteral, /// 'a'
dstringLiteral, /// $(D_STRING "32-bit character string"d) dstringLiteral, /// $(D_STRING "32-bit string"d)
stringLiteral, /// $(D_STRING "an 8-bit string") stringLiteral, /// $(D_STRING "an 8-bit string")
wstringLiteral, /// $(D_STRING "16-bit character string"w) wstringLiteral, /// $(D_STRING "16-bit string"w)
} }
// Implementation details follow // Implementation details follow

3809
std/d/parser.d
View File

File diff suppressed because it is too large Load Diff