Skip to content

Commit

Permalink
Merge pull request #273 from 9rnsr/fix_trivials
Browse files Browse the repository at this point in the history
Fix trivials
  • Loading branch information
alexrp committed Feb 13, 2013
2 parents 2811c3c + ce37495 commit 0f2f7d9
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion attribute.dd
Expand Up @@ -22,7 +22,7 @@ $(GNAME Attribute):
$(LINK2 #const, $(D const))
$(LINK2 #auto, $(D auto))
$(LINK2 #scope, $(D scope))
$(LINK2 #gshared, $(D __gshared))
$(LINK2 #gshared, $(D __gshared))
$(LINK2 #shared, $(D shared))
$(LINK2 #immutable, $(D immutable))
$(LINK2 #inout, $(D inout))
Expand Down
4 changes: 2 additions & 2 deletions class.dd
Expand Up @@ -256,8 +256,8 @@ $(H3 $(LNAME2 constructors, Constructors))

$(GRAMMAR
$(GNAME Constructor):
$(B this) $(GLINK2 declaration, Parameters) $(GLINK2 function, FunctionBody)
$(GLINK2 template, TemplatedConstructor)
$(B this) $(GLINK2 declaration, Parameters) $(GLINK2 function, FunctionBody)
$(GLINK2 template, TemplatedConstructor)
)

$(P Members are always initialized to the
Expand Down
14 changes: 7 additions & 7 deletions declaration.dd
Expand Up @@ -50,7 +50,7 @@ $(GNAME BasicType):
$(GLINK IdentifierList)
$(GLINK Typeof)
$(GLINK Typeof) $(D .) $(GLINK IdentifierList)
$(D const$(LPAREN)) $(GLINK Type) $(D $(RPAREN))
$(D const$(LPAREN)) $(GLINK Type) $(D $(RPAREN))
$(D immutable$(LPAREN)) $(GLINK Type) $(D $(RPAREN))
$(D shared$(LPAREN)) $(GLINK Type) $(D $(RPAREN))
$(D inout$(LPAREN)) $(GLINK Type) $(D $(RPAREN))
Expand Down Expand Up @@ -116,12 +116,12 @@ $(GNAME StorageClasses):
$(GNAME StorageClass):
$(MULTICOLS 5, $(D abstract)
$(D auto)
$(GLINK TypeCtor)
$(GLINK TypeCtor)
$(D deprecated)
$(D enum)
$(D enum)
$(LINK2 #extern, $(D extern))
$(D final)
$(D nothrow)
$(D nothrow)
$(D override)
$(D pure)
$(D __gshared)
Expand Down Expand Up @@ -180,7 +180,7 @@ $(GNAME InOut):

$(GNAME InOutX):
$(D auto)
$(GLINK TypeCtor)
$(GLINK TypeCtor)
$(D final)
$(D in)
$(D lazy)
Expand Down Expand Up @@ -210,7 +210,7 @@ $(GNAME MemberFunctionAttribute):

$(GNAME DefaultInitializerExpression):
$(ASSIGNEXPRESSION)
$(D __FILE__)
$(D __FILE__)
$(D __LINE__)

$(GNAME Initializer):
Expand Down Expand Up @@ -521,7 +521,7 @@ $(H3 $(LNAME2 typeof, $(D typeof)))
$(GRAMMAR
$(GNAME Typeof):
$(D typeof $(LPAREN)) $(EXPRESSION) $(D $(RPAREN))
$(D typeof $(LPAREN)) $(D return) $(D $(RPAREN)))
$(D typeof $(LPAREN)) $(D return) $(D $(RPAREN)))

$(P
$(I Typeof) is a way to specify a type based on the type
Expand Down
2 changes: 1 addition & 1 deletion enum.dd
Expand Up @@ -33,7 +33,7 @@ $(GNAME EnumMembers):
$(GNAME EnumMember):
$(I Identifier)
$(I Identifier) $(B =) $(ASSIGNEXPRESSION)
$(GLINK2 declaration, Type) $(B =) $(ASSIGNEXPRESSION)
$(GLINK2 declaration, Type) $(B =) $(ASSIGNEXPRESSION)
)

$(P Enum declarations are used to define a group of constants.
Expand Down
28 changes: 14 additions & 14 deletions expression.dd
Expand Up @@ -485,7 +485,7 @@ $(H3 In Expressions)
$(GRAMMAR
$(GNAME InExpression):
$(GLINK ShiftExpression) $(D in) $(GLINK ShiftExpression)
$(GLINK ShiftExpression) $(D !in) $(GLINK ShiftExpression)
$(GLINK ShiftExpression) $(D !in) $(GLINK ShiftExpression)
)

$(P An associative array can be tested to see if an element is in the array:
Expand Down Expand Up @@ -684,7 +684,7 @@ $(GNAME AllocatorArguments):

$(GNAME ArgumentList):
$(GLINK AssignExpression)
$(GLINK AssignExpression) $(D ,)
$(GLINK AssignExpression) $(D ,)
$(GLINK AssignExpression) $(D ,) $(I ArgumentList)
)

Expand Down Expand Up @@ -945,7 +945,7 @@ $(GNAME PostfixExpression):
$(I PostfixExpression) $(D --)
$(I PostfixExpression) $(D ( ))
$(I PostfixExpression) $(D $(LPAREN)) $(GLINK ArgumentList) $(D $(RPAREN))
$(GLINK2 declaration, TypeCtors)$(OPT) $(GLINK2 declaration, BasicType) $(D ( ))
$(GLINK2 declaration, TypeCtors)$(OPT) $(GLINK2 declaration, BasicType) $(D ( ))
$(GLINK2 declaration, TypeCtors)$(OPT) $(GLINK2 declaration, BasicType) $(D $(LPAREN)) $(GLINK ArgumentList) $(D $(RPAREN))
$(GLINK IndexExpression)
$(GLINK SliceExpression)
Expand Down Expand Up @@ -1039,7 +1039,7 @@ $(GNAME PrimaryExpression):
$(D true)
$(D false)
$(D $)
$(D __FILE__)
$(D __FILE__)
$(D __LINE__)
$(GLINK2 lex, IntegerLiteral)
$(GLINK2 lex, FloatLiteral)
Expand All @@ -1057,7 +1057,7 @@ $(GNAME PrimaryExpression):
$(GLINK TypeidExpression)
$(GLINK IsExpression)
$(D $(LPAREN)) $(I Expression) $(D $(RPAREN))
$(GLINK2 traits, TraitsExpression)
$(GLINK2 traits, TraitsExpression)
)

$(H4 .Identifier)
Expand Down Expand Up @@ -1275,8 +1275,8 @@ $(H4 Lambdas)

$(GRAMMAR
$(GNAME Lambda):
$(IDENTIFIER) $(D =>) $(GLINK AssignExpression)
$(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
$(IDENTIFIER) $(D =>) $(GLINK AssignExpression)
$(GLINK ParameterAttributes) $(D =>) $(GLINK AssignExpression)
)

$(P $(I Lambda)s are a shorthand syntax for $(GLINK FunctionLiteral)s.
Expand Down Expand Up @@ -1310,14 +1310,14 @@ $(H4 Function Literals)

$(GRAMMAR
$(GNAME FunctionLiteral):
$(D function) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK2 function, FunctionBody)
$(D delegate) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK2 function, FunctionBody)
$(GLINK ParameterAttributes) $(GLINK2 function, FunctionBody)
$(GLINK2 function, FunctionBody)
$(D function) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK2 function, FunctionBody)
$(D delegate) $(GLINK2 declaration, Type)$(OPT) $(GLINK ParameterAttributes) $(OPT) $(GLINK2 function, FunctionBody)
$(GLINK ParameterAttributes) $(GLINK2 function, FunctionBody)
$(GLINK2 function, FunctionBody)

$(GNAME ParameterAttributes):
$(GLINK2 declaration, Parameters)
$(GLINK2 declaration, Parameters) $(GLINK2 declaration, FunctionAttributes)
$(GLINK2 declaration, Parameters) $(GLINK2 declaration, FunctionAttributes)
)

$(P $(I FunctionLiteral)s enable embedding anonymous functions
Expand Down Expand Up @@ -1547,7 +1547,7 @@ $(H4 Typeid Expressions)
$(GRAMMAR
$(GNAME TypeidExpression):
$(D typeid $(LPAREN)) $(GLINK2 declaration, Type) $(D $(RPAREN))
$(D typeid $(LPAREN)) $(GLINK Expression) $(D $(RPAREN))
$(D typeid $(LPAREN)) $(GLINK Expression) $(D $(RPAREN))
)


Expand Down Expand Up @@ -1606,7 +1606,7 @@ $(GNAME TypeSpecialization):
$(D function)
$(D delegate)
$(D super)
$(D const)
$(D const)
$(D immutable)
$(D inout)
$(D shared)
Expand Down
6 changes: 3 additions & 3 deletions statement.dd
Expand Up @@ -27,7 +27,7 @@ $(GNAME NonEmptyOrScopeBlockStatement):
$(GNAME NonEmptyStatement):
$(GLINK NonEmptyStatementNoCaseNoDefault)
$(GLINK CaseStatement)
$(GLINK CaseRangeStatement)
$(GLINK CaseRangeStatement)
$(GLINK DefaultStatement)

$(GNAME NonEmptyStatementNoCaseNoDefault):
Expand All @@ -40,7 +40,7 @@ $(GNAME NonEmptyStatementNoCaseNoDefault):
$(GLINK ForStatement)
$(GLINK ForeachStatement)
$(GLINK SwitchStatement)
$(GLINK FinalSwitchStatement)
$(GLINK FinalSwitchStatement)
$(GLINK ContinueStatement)
$(GLINK BreakStatement)
$(GLINK ReturnStatement)
Expand All @@ -53,7 +53,7 @@ $(GNAME NonEmptyStatementNoCaseNoDefault):
$(GLINK AsmStatement)
$(GLINK PragmaStatement)
$(GLINK MixinStatement)
$(GLINK ForeachRangeStatement)
$(GLINK ForeachRangeStatement)
$(GLINK2 version, ConditionalStatement)
$(GLINK2 version, StaticAssert)
$(GLINK2 template-mixin, TemplateMixin)
Expand Down
2 changes: 1 addition & 1 deletion struct.dd
Expand Up @@ -101,7 +101,7 @@ $(GNAME StructBodyDeclaration):
$(GLINK2 module, DeclDef)
$(GLINK StructAllocator)
$(GLINK StructDeallocator)
$(GLINK StructPostblit)
$(GLINK StructPostblit)
$(GLINK2 class, AliasThis)

$(GNAME StructAllocator):
Expand Down
4 changes: 2 additions & 2 deletions template-mixin.dd
Expand Up @@ -8,8 +8,8 @@ $(SPEC_S Template Mixins,

$(GRAMMAR
$(GNAME TemplateMixinDeclaration):
$(B mixin) $(B template) $(TEMPLATEIDENTIFIER) $(B $(LPAREN)) $(TEMPLATEPARAMETERLIST) $(B $(RPAREN)) $(V2 $(GLINK2 template, Constraint)$(SUBSCRIPT $(I opt)))
$(B {) $(GLINK2 module, DeclDefs) $(B })
$(B mixin) $(B template) $(TEMPLATEIDENTIFIER) $(B $(LPAREN)) $(TEMPLATEPARAMETERLIST) $(B $(RPAREN)) $(V2 $(GLINK2 template, Constraint)$(OPT))
$(B {) $(GLINK2 module, DeclDefs) $(B })

$(GNAME TemplateMixin):
$(B mixin) $(TEMPLATEIDENTIFIER) $(B ;)
Expand Down
18 changes: 9 additions & 9 deletions template.dd
Expand Up @@ -12,23 +12,23 @@ $(P Templates are D's approach to generic programming.

$(GRAMMAR
$(GNAME TemplateDeclaration):
$(B template) $(GLINK TemplateIdentifier) $(B $(LPAREN)) $(GLINK TemplateParameterList) $(B $(RPAREN)) $(GLINK Constraint)$(SUBSCRIPT $(I opt))
$(B {) $(GLINK2 module, DeclDefs) $(B })
$(B template) $(GLINK TemplateIdentifier) $(B $(LPAREN)) $(GLINK TemplateParameterList) $(B $(RPAREN)) $(GLINK Constraint)$(OPT)
$(B {) $(GLINK2 module, DeclDefs) $(B })

$(GNAME TemplateIdentifier):
$(I Identifier)

$(GNAME TemplateParameterList):
$(GLINK TemplateParameter)
$(GLINK TemplateParameter) ,
$(GLINK TemplateParameter) ,
$(GLINK TemplateParameter) , $(I TemplateParameterList)

$(GNAME TemplateParameter):
$(GLINK TemplateTypeParameter)
$(GLINK TemplateValueParameter)
$(GLINK TemplateAliasParameter)
$(GLINK TemplateTupleParameter)
$(GLINK TemplateThisParameter)
$(GLINK TemplateThisParameter)
)

$(P The body of the $(I TemplateDeclaration) must be syntactically correct
Expand Down Expand Up @@ -66,11 +66,11 @@ $(P
$(GRAMMAR
$(GNAME TemplateInstance):
$(GLINK TemplateIdentifier) $(B !$(LPAREN)) $(GLINK TemplateArgumentList) $(B $(RPAREN))
$(GLINK TemplateIdentifier) $(B !) $(GLINK TemplateSingleArgument)
$(GLINK TemplateIdentifier) $(B !) $(GLINK TemplateSingleArgument)

$(GNAME TemplateArgumentList):
$(GLINK TemplateArgument)
$(GLINK TemplateArgument) ,
$(GLINK TemplateArgument) ,
$(GLINK TemplateArgument) , $(I TemplateArgumentList)

$(GNAME TemplateArgument):
Expand Down Expand Up @@ -327,10 +327,10 @@ $(GNAME TemplateTypeParameter):
$(I Identifier) $(GLINK TemplateTypeParameterSpecialization) $(GLINK TemplateTypeParameterDefault)

$(GNAME TemplateTypeParameterSpecialization):
$(B :) $(GLINK2 declaration, Type)
$(B :) $(GLINK2 declaration, Type)

$(GNAME TemplateTypeParameterDefault):
$(B =) $(GLINK2 declaration, Type)
$(B =) $(GLINK2 declaration, Type)
)

$(H3 Specialization)
Expand Down Expand Up @@ -591,7 +591,7 @@ $(H2 $(LNAME2 variadic-templates, Template Tuple Parameters))

$(GRAMMAR
$(GNAME TemplateTupleParameter):
$(I Identifier) $(B ...)
$(I Identifier) $(B ...)
)

$(P If the last template parameter in the $(I TemplateParameterList)
Expand Down
2 changes: 1 addition & 1 deletion unittest.dd
Expand Up @@ -4,7 +4,7 @@ $(SPEC_S Unit Tests,

$(GRAMMAR
$(GNAME UnitTest):
$(B unittest) $(GLINK2 function, FunctionBody)
$(B unittest) $(GLINK2 function, FunctionBody)
)

$(P Unit tests are a series of test cases applied to a module to determine
Expand Down

0 comments on commit 0f2f7d9

Please sign in to comment.