dsource.org

Open Source Development for
the D Programming Language

Navigation

← Previous Changeset
Next Changeset →

Changeset 2140

Timestamp:

11/09/10 01:47:01 (2 years ago)

Author:

walter

Message:

bugzilla 1351 Discrepancies in the language specification

Files:

trunk/docsrc/attribute.dd (modified) (3 diffs)
trunk/docsrc/class.dd (modified) (10 diffs)
trunk/docsrc/declaration.dd (modified) (10 diffs)
trunk/docsrc/doc.ddoc (modified) (1 diff)
trunk/docsrc/enum.dd (modified) (2 diffs)
trunk/docsrc/expression.dd (modified) (12 diffs)
trunk/docsrc/lex.dd (modified) (2 diffs)
trunk/docsrc/statement.dd (modified) (6 diffs)
trunk/docsrc/struct.dd (modified) (1 diff)
trunk/docsrc/template-mixin.dd (modified) (1 diff)
trunk/docsrc/template.dd (modified) (9 diffs)
trunk/docsrc/version.dd (modified) (8 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/docsrc/attribute.dd

r2040	r2140
16	16	$(B static)
17	17	$(B final)
	18	$(B synchronized)
18	19	$(LINK2 #override, $(B override))
19	20	$(LINK2 #abstract, $(B abstract))
…	…
21	22	$(LINK2 #auto, $(B auto))
22	23	$(LINK2 #scope, $(B scope))
23		$(V2 $(LINK2 #gshared, $(B __gshared))
	24	$(V2 $(LINK2 #gshared, $(B __gshared))
24	25	$(LINK2 #shared, $(B shared))
25	26	$(LINK2 #immutable, $(B immutable))
…	…
145	146	$(GNAME AlignAttribute):
146	147	$(B align)
147		$(B align) $(B $(LPAREN)) $(~~I Integer~~) $(B $(RPAREN))
	148	$(B align) $(B $(LPAREN)) $(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral)) $(B $(RPAREN))
148	149	)
149	150

trunk/docsrc/class.dd

r2136	r2140
240	240	$(GRAMMAR
241	241	$(GNAME Constructor):
242		$(B this) $(I Parameters) $(I FunctionBody)
	242	$(B this) $(GLINK2 declaration, Parameters) $(GLINK2 function, FunctionBody)
	243	$(V2 $(GLINK2 template, TemplatedConstructor))
243	244	)
244	245
…	…
415	416	$(GRAMMAR
416	417	$(GNAME Destructor):
417		$(B ~this()) $(I FunctionBody)
	418	$(B ~this()) $(GLINK2 function, FunctionBody)
418	419	)
419	420
…	…
475	476	$(GRAMMAR
476	477	$(GNAME StaticConstructor):
477		$(B static this()) $(I FunctionBody)
	478	$(B static this()) $(GLINK2 function, FunctionBody)
478	479	)
479	480
…	…
569	570	$(GRAMMAR
570	571	$(GNAME StaticDestructor):
571		$(B static ~this()) $(I FunctionBody)
	572	$(B static ~this()) $(GLINK2 function, FunctionBody)
572	573	)
573	574
…	…
614	615	$(GRAMMAR
615	616	$(GNAME SharedStaticConstructor):
616		$(B shared static this()) $(I FunctionBody)
	617	$(B shared static this()) $(GLINK2 function, FunctionBody)
617	618	)
618	619
…	…
625	626	$(GRAMMAR
626	627	$(GNAME SharedStaticDestructor):
627		$(B shared static ~this()) $(I FunctionBody)
	628	$(B shared static ~this()) $(GLINK2 function, FunctionBody)
628	629	)
629	630
…	…
638	639	$(GRAMMAR
639	640	$(GNAME Invariant):
640		$(B invariant()) $(I BlockStatement)
	641	$(B invariant()) $(GLINK2 statement, BlockStatement)
641	642	)
642	643
…	…
720	721	$(GRAMMAR
721	722	$(GNAME ClassAllocator):
722		$(B new) $(~~I Parameters) $(I~~ FunctionBody)
	723	$(B new) $(GLINK2 declaration, Parameters) $(GLINK2 function, FunctionBody)
723	724	)
724	725
…	…
787	788	$(GRAMMAR
788	789	$(GNAME ClassDeallocator):
789		$(B delete) $(~~I Parameters) $(I~~ FunctionBody)
	790	$(B delete) $(GLINK2 declaration, Parameters) $(GLINK2 function, FunctionBody)
790	791	)
791	792
…	…
1141	1142	$(GRAMMAR
1142	1143	$(GNAME NewAnonClassExpression):
1143		$(B new) $(~~I PerenArgumentList)<sub>opt</sub> $(B class) $(I PerenArgumentList)<sub>opt</sub> $(I SuperClass)<sub>opt</sub> $(I InterfaceClasses)<sub>opt</sub> $(I~~ ClassBody)
1144
1145		$(GNAME PerenArgumentList):
1146		$(B $(LPAREN))~~$(I ArgumentList)~~$(B $(RPAREN))
	1144	$(B new) $(GLINK ParenArgumentList)$(OPT) $(B class) $(I ParenArgumentList)$(OPT) $(GLINK SuperClass)$(OPT) $(GLINK InterfaceClasses)$(OPT) $(GLINK ClassBody)
	1145
	1146	$(GNAME ParenArgumentList):
	1147	$(B $(LPAREN)) $(I ArgumentList) $(B $(RPAREN))
1147	1148	)
1148	1149

trunk/docsrc/declaration.dd

r2040	r2140
72	72	$(B [) $(VEXPRESSION) $(B ])
73	73	$(B [) $(VEXPRESSION) .. $(VEXPRESSION) $(B ])
74		$(B [) $(I Type) $(B ])
	74	$(B [) $(GLINK Type) $(B ])
75	75	$(B delegate) $(GLINK Parameters) $(V2 $(GLINK FunctionAttributes)$(OPT))
76	76	$(B function) $(GLINK Parameters) $(V2 $(GLINK FunctionAttributes)$(OPT))
…	…
78	78	$(GNAME Declarator):
79	79	$(GLINK BasicType2)$(OPT) $(I Declarator) $(GLINK DeclaratorSuffixes)$(OPT)
	80	$(GLINK BasicType2)$(OPT) $(B $(LPAREN)) $(I Declarator) $(B $(RPAREN)) $(GLINK DeclaratorSuffixes)$(OPT)
80	81	$(GLINK BasicType2)$(OPT) $(I Identifier) $(GLINK DeclaratorSuffixes)$(OPT)
81	82
…	…
87	88	$(B [ ])
88	89	$(B [) $(VEXPRESSION) $(B ])
89		$(B [) $(I Type) $(B ])
90		$(~~LINK2 template.html#TemplateParameterList, $(I TemplateParameterList))$(OPT) $(GLINK Parameters) $(V2 $(GLINK MemberFunctionAttributes)<sub>opt</sub>~~)
	90	$(B [) $(GLINK Type) $(B ])
	91	$(GLINK2 template, TemplateParameterList)$(OPT) $(GLINK Parameters) $(V2 $(GLINK MemberFunctionAttributes)$(OPT) $(GLINK2 template, Constraint)$(OPT))
91	92
92	93	$(GNAME IdentifierList):
93	94	$(I Identifier)
94	95	$(I Identifier) $(B .) $(I IdentifierList)
95		$(I TemplateInstance)
96		$(I TemplateInstance) $(B .) $(I IdentifierList)
	96	$(GLINK2 template, TemplateInstance)
	97	$(GLINK2 template, TemplateInstance) $(B .) $(I IdentifierList)
97	98
98	99	$(GNAME StorageClasses):
…	…
107	108	$(B extern)
108	109	$(B final)
109		$(V2
110		$(B immutable)
	110	$(V2 $(B immutable)
111	111	$(B inout)
112	112	$(B shared)
…	…
114	114	$(B override)
115	115	$(B pure)
	116	$(B __gshared)
	117	$(GLINK Property)
116	118	) $(B scope)
117	119	$(B static)
118	120	$(B synchronized)
119	121
	122	$(GNAME Property):
	123	$(B @) $(I Identifier)
	124
120	125	$(GNAME Type):
121	126	$(GLINK BasicType)
…	…
123	128
124	129	$(GNAME Declarator2):
125		$(GLINK BasicType2) $(I Declarator2)
126		$(B $(LPAREN)) $(I Declarator2) $(B $(RPAREN))
127		$(B $(LPAREN)) $(I Declarator2) $(B $(RPAREN)) $(GLINK DeclaratorSuffixes)
	130	$(GLINK BasicType2)$(OPT) $(I Declarator2)$(OPT) $(GLINK DeclaratorSuffixes)$(OPT)
	131	$(GLINK BasicType2)$(OPT) $(B $(LPAREN)) $(I Declarator2) $(B $(RPAREN)) $(GLINK DeclaratorSuffixes)$(OPT)
128	132
129	133	$(GNAME Parameters):
…	…
134	138	$(GLINK Parameter)
135	139	$(GLINK Parameter) $(B ,) $(I ParameterList)
136		~~$(GLINK Parameter) $(B ...)~~
137	140	$(B ...)
138	141
139	142	$(GNAME Parameter):
140		$(GLINK Declarator)
141		$(GLINK Declarator) = $(I DefaultInitializerExpression)
142		$(I InOut) $(GLINK Declarator)
143		$(I InOut) $(GLINK Declarator) = $(I DefaultInitializerExpression)
144
145		$(GNAME InOut):
146		$(B in)
	143	$(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator)
	144	$(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator) $(B ...)
	145	$(I InOut)$(OPT) $(GLINK BasicType) $(GLINK Declarator) = $(GLINK DefaultInitializerExpression)
	146	$(I InOut)$(OPT) $(GLINK Type)
	147	$(I InOut)$(OPT) $(GLINK Type) $(B ...)
	148
	149	$(GNAME InOut):
	150	$(I InOutX)
	151	$(I InOut InOutX)
	152
	153	$(GNAME InOutX):
	154	$(B auto)
	155	$(B const)
	156	$(B final)
	157	$(V2 $(B immutable)
	158	) $(B in)
	159	$(B inout)
	160	$(B lazy)
147	161	$(B out)
148	162	$(B ref)
149		$(B lazy)
	163	$(B scope)
	164	$(B shared)
150	165
151	166	$(V2
…	…
157	172	$(B nothrow)
158	173	$(B pure)
	174	$(GLINK Property)
159	175	)
160	176	$(GNAME MemberFunctionAttributes):
…	…
171	187	$(GNAME DefaultInitializerExpression):
172	188	$(ASSIGNEXPRESSION)
173		$(V2
174		$(B __FILE__)
	189	$(V2 $(B __FILE__)
175	190	$(B __LINE__))
176	191
…	…
274	289	$(GRAMMAR
275	290	$(GNAME AutoDeclaration):
276		$(I StorageClasses) $(I Identifier) $(B =) $(ASSIGNEXPRESSION) $(B ;)
	291	$(GLINK StorageClasses) $(I AutoDeclarationX) $(B ;)
	292
	293	$(GNAME AutoDeclarationX):
	294	$(I Identifier) $(B =) $(GLINK Initializer)
	295	$(I AutoDeclarationX) $(B ,) $(I Identifier) $(B =) $(GLINK Initializer)
277	296	)
278	297

trunk/docsrc/doc.ddoc

r2139	r2140
360	360	NG_DMDScript = <a href="$(NEWS DMDScript,$0)">DMDScript/$0</a>
361	361
	362	OPT=<sub>opt</sub>
362	363	GLINK=$(LINK2 #$0, $(I $0))
363	364	GLINK2=$(LINK2 $1.html#$2, $(I $2))

trunk/docsrc/enum.dd

r671	r2140
14	14
15	15	$(GNAME EnumBaseType):
16		$(~~I Type~~)
	16	$(LINK2 declaration.html#Type, $(I Type))
17	17
18	18	$(GNAME EnumBody):
…	…
28	28	$(I Identifier)
29	29	$(I Identifier) $(B =) $(ASSIGNEXPRESSION)
30		$(V2
31		$(I Type) $(I Identifier) $(B =) $(ASSIGNEXPRESSION))
	30	$(V2 $(LINK2 declaration.html#Type, $(I Type)) $(B =) $(ASSIGNEXPRESSION))
32	31	)
33	32

trunk/docsrc/expression.dd

r2111	r2140
292	292	Equality for floating point types is more complicated. -0 and
293	293	+0 compare as equal. If either or both operands are NAN, then
294		== returns false and != returns true. Otherwise, the bit
	294	both the == returns false and != returns true. Otherwise, the bit
295	295	patterns are compared for equality.
296	296	<p>
…	…
729	729	$(B !) $(I UnaryExpression)
730	730	$(B ~) $(I UnaryExpression)
731		$(B $(LPAREN)) $(~~I Type~~) $(B $(RPAREN) .) $(I Identifier)
	731	$(B $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(B $(RPAREN) .) $(I Identifier)
732	732	$(GLINK NewExpression)
733	733	$(GLINK DeleteExpression)
…	…
741	741	$(GRAMMAR
742	742	$(GNAME NewExpression):
743		$(I NewArguments) $(~~I Type~~) $(B [) $(GLINK AssignExpression) $(B ])
744		$(I NewArguments) $(~~I Type~~) $(B $(LPAREN)) $(GLINK ArgumentList) $(B $(RPAREN))
745		$(I NewArguments) $(~~I Type~~)
746		$(I NewArguments) $(I ClassArguments) $(~~I BaseClasslist)<sub>opt</sub> $(B {) $(I~~ DeclDefs) $(B } )
	743	$(I NewArguments) $(LINK2 declaration.html#Type, $(I Type)) $(B [) $(GLINK AssignExpression) $(B ])
	744	$(I NewArguments) $(LINK2 declaration.html#Type, $(I Type)) $(B $(LPAREN)) $(GLINK ArgumentList) $(B $(RPAREN))
	745	$(I NewArguments) $(LINK2 declaration.html#Type, $(I Type))
	746	$(I NewArguments) $(I ClassArguments) $(GLINK BaseClasslist)$(OPT) $(B {) $(GLINK DeclDefs) $(B } )
747	747
748	748	$(GNAME NewArguments):
…	…
861	861	$(GRAMMAR
862	862	$(GNAME CastExpression):
863		$(B cast $(LPAREN)) $(I Type) $(B $(RPAREN)) $(GLINK UnaryExpression)
	863	$(B cast $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(B $(RPAREN)) $(GLINK UnaryExpression)
	864	$(B cast $(LPAREN)) $(I CastParam) $(B $(RPAREN)) $(GLINK UnaryExpression)
	865
	866	$(GNAME CastParam):
	867	$(LINK2 declaration.html#Type, $(I Type))
	868	$(B const)
	869	$(B const shared)
	870	$(B shared const)
	871	$(B inout)
	872	$(B inout shared)
	873	$(B shared inout)
	874	$(B immutable)
	875	$(B shared)
864	876	)
865	877
866	878	$(P A $(I CastExpression) converts the $(I UnaryExpression)
867		to $(~~I Type~~).
	879	to $(LINK2 declaration.html#Type, $(I Type)).
868	880	)
869	881
…	…
944	956	$(GLINK PrimaryExpression)
945	957	$(I PostfixExpression) $(B .) $(I Identifier)
	958	$(I PostfixExpression) $(B .) $(LINK2 template.html#TemplateInstance, $(I TemplateInstance))
946	959	$(I PostfixExpression) $(B .) $(GLINK NewExpression)
947	960	$(I PostfixExpression) $(B ++)
…	…
1038	1051	$(B false)
1039	1052	$(B $)
1040		$(V2
1041		$(B __FILE__)
	1053	$(V2 $(B __FILE__)
1042	1054	$(B __LINE__))
1043	1055	$(GLINK2 lex, IntegerLiteral)
…	…
1051	1063	$(GLINK MixinExpression)
1052	1064	$(GLINK ImportExpression)
1053		$(~~I BasicType~~) $(B .) $(I Identifier)
	1065	$(LINK2 declaration.html#BasicTypeX, $(I BasicType)) $(B .) $(I Identifier)
1054	1066	$(LINK2 declaration.html#Typeof, $(I Typeof))
1055	1067	$(GLINK TypeidExpression)
1056	1068	$(GLINK IsExpression)
1057	1069	$(B $(LPAREN)) $(I Expression) $(B $(RPAREN))
1058		$(V2
1059		$(LINK2 traits.html#TraitsExpression, $(I TraitsExpression)))
	1070	$(V2 $(LINK2 traits.html#TraitsExpression, $(I TraitsExpression)))
1060	1071	)
1061	1072
…	…
1252	1263
1253	1264	$(GNAME KeyExpression):
1254		$(GLINK ~~Conditional~~Expression)
	1265	$(GLINK AssignExpression)
1255	1266
1256	1267	$(GNAME ValueExpression):
1257		$(GLINK ~~Conditional~~Expression)
	1268	$(GLINK AssignExpression)
1258	1269	)
1259	1270
…	…
1286	1297	$(GRAMMAR
1287	1298	$(GNAME FunctionLiteral):
1288		$(B function) $(~~I Type)<sub>opt</sub> $(I ParameterAttributes) <sub>opt</sub> $(I FunctionBody~~)
1289		$(B delegate) $(~~I Type)<sub>opt</sub> $(I ParameterAttributes) <sub>opt</sub> $(I FunctionBody~~)
1290		$(I ParameterAttributes) $(~~I FunctionBody~~)
1291		$(~~I FunctionBody~~)
	1299	$(B function) $(LINK2 declaration.html#Type, $(I Type))$(OPT) $(I ParameterAttributes) $(OPT) $(LINK2 function.html#FunctionBody, $(I FunctionBody))
	1300	$(B delegate) $(LINK2 declaration.html#Type, $(I Type))$(OPT) $(I ParameterAttributes) $(OPT) $(LINK2 function.html#FunctionBody, $(I FunctionBody))
	1301	$(I ParameterAttributes) $(LINK2 function.html#FunctionBody, $(I FunctionBody))
	1302	$(LINK2 function.html#FunctionBody, $(I FunctionBody))
1292	1303
1293	1304	$(GNAME ParameterAttributes):
1294	1305	$(LINK2 declaration.html#Parameters, $(I Parameters))
1295		$(V2
1296		$(LINK2 declaration.html#Parameters, $(I Parameters)) $(LINK2 declaration.html#FunctionAttributes, $(I FunctionAttributes))
1297		)
	1306	$(V2 $(LINK2 declaration.html#Parameters, $(I Parameters)) $(LINK2 declaration.html#FunctionAttributes, $(I FunctionAttributes)))
1298	1307	)
1299	1308
…	…
1508	1517	$(GRAMMAR
1509	1518	$(GNAME TypeidExpression):
1510		$(B typeid $(LPAREN)) $(~~I Type~~) $(B $(RPAREN))
1511		$(V2 $(B typeid $(LPAREN)) $(I Expression) $(B $(RPAREN)))
	1519	$(B typeid $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(B $(RPAREN))
	1520	$(V2 $(B typeid $(LPAREN)) $(GLINK Expression) $(B $(RPAREN)))
1512	1521	)
1513	1522
…	…
1556	1565	$(GRAMMAR
1557	1566	$(GNAME IsExpression):
1558		$(B is $(LPAREN)) $(~~I Type~~) $(B $(RPAREN))
1559		$(B is $(LPAREN)) $(~~I Type~~) $(B :) $(I TypeSpecialization) $(B $(RPAREN))
1560		$(B is $(LPAREN)) $(~~I Type~~) $(B ==) $(I TypeSpecialization) $(B $(RPAREN))
1561		$(B is $(LPAREN)) $(~~I Type~~) $(I Identifier) $(B $(RPAREN))
1562		$(B is $(LPAREN)) $(~~I Type~~) $(I Identifier) $(B :) $(I TypeSpecialization) $(B $(RPAREN))
1563		$(B is $(LPAREN)) $(~~I Type~~) $(I Identifier) $(B ==) $(I TypeSpecialization) $(B $(RPAREN))
1564		$(V2 $(B is $(LPAREN)) $(~~I Type~~) $(I Identifier) $(B :) $(I TypeSpecialization) $(B ,) $(I TemplateParameterList) $(B $(RPAREN))
1565		$(B is $(LPAREN)) $(~~I Type~~) $(I Identifier) $(B ==) $(I TypeSpecialization) $(B ,) $(I TemplateParameterList) $(B $(RPAREN))
	1567	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(B $(RPAREN))
	1568	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(B :) $(I TypeSpecialization) $(B $(RPAREN))
	1569	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(B ==) $(I TypeSpecialization) $(B $(RPAREN))
	1570	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(I Identifier) $(B $(RPAREN))
	1571	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(I Identifier) $(B :) $(I TypeSpecialization) $(B $(RPAREN))
	1572	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(I Identifier) $(B ==) $(I TypeSpecialization) $(B $(RPAREN))
	1573	$(V2 $(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(I Identifier) $(B :) $(I TypeSpecialization) $(B ,) $(I TemplateParameterList) $(B $(RPAREN))
	1574	$(B is $(LPAREN)) $(LINK2 declaration.html#Type, $(I Type)) $(I Identifier) $(B ==) $(I TypeSpecialization) $(B ,) $(I TemplateParameterList) $(B $(RPAREN))
1566	1575	)
1567	1576
1568	1577	$(GNAME TypeSpecialization):
1569		$(~~I Type~~)
	1578	$(LINK2 declaration.html#Type, $(I Type))
1570	1579	$(V1 $(B typedef)
1571	1580	) $(B struct)
…	…
1577	1586	$(B delegate)
1578	1587	$(B super)
1579		$(V2
1580		$(B const)
	1588	$(V2 $(B const)
1581	1589	$(B immutable)
1582	1590	$(B inout)

trunk/docsrc/lex.dd

r2040	r2140
301	301	$(B ~)
302	302	$(B ~=)
	303	$(V2 $(B @))
303	304	)
304	305
…	…
672	673
673	674	$(GRAMMAR
674		$(I IntegerLiteral):
	675	$(GNAME IntegerLiteral):
675	676	$(I Integer)
676	677	$(I Integer) $(I IntegerSuffix)

trunk/docsrc/statement.dd

r2131	r2140
216	216	$(EXPRESSION)
217	217	$(B auto) $(I Identifier) $(B =) $(EXPRESSION)
218		$(I Declarator) $(B =) $(EXPRESSION)
	218	$(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(B =) $(EXPRESSION)
219	219
220	220	$(GNAME ThenStatement):
…	…
330	330	$(GRAMMAR
331	331	$(I ForStatement):
332		$(B for $(LPAREN))$(I Initialize) $(I Test) ~~$(B ;) $(I Increment~~)$(B $(RPAREN)) $(PSSCOPE)
	332	$(B for $(LPAREN))$(I Initialize) $(I Test)$(OPT) $(B ;) $(I Increment)$(OPT)$(B $(RPAREN)) $(PSSCOPE)
333	333
334	334	$(GNAME Initialize):
…	…
337	337
338	338	$(GNAME Test):
339		~~$(I empty)~~
340	339	$(EXPRESSION)
341	340
342	341	$(GNAME Increment):
343		~~$(I empty)~~
344	342	$(EXPRESSION)
345	343	)
…	…
414	412
415	413	$(GNAME ForeachType):
416		$(B ref) $(~~I Type) $(I Identifie~~r)
417		$(~~I Type) $(I Identifie~~r)
	414	$(B ref) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
	415	$(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
418	416	$(B ref) $(I Identifier)
419	417	$(I Identifier)
…	…
817	815
818	816	$(I FirstExp):
819		$(~~I AssignExpression~~)
	817	$(ASSIGNEXPRESSION)
820	818
821	819	$(I LastExp):
822		$(~~I AssignExpression~~)
	820	$(ASSIGNEXPRESSION)
823	821	)
824	822	$(GNAME DefaultStatement):
…	…
1319	1317
1320	1318	$(GNAME CatchParameter):
1321		$(I BasicType) $(I Identifier)
	1319	$(GLINK2 declaration, BasicType) $(I Identifier)
1322	1320
1323	1321	$(GNAME FinallyStatement):

trunk/docsrc/struct.dd

r2136	r2140
580	580	$(GRAMMAR
581	581	$(GNAME StructPostblit):
582		$(B this(this)) $(~~I FunctionBody~~)
	582	$(B this(this)) $(LINK2 function.html#FunctionBody, $(I FunctionBody))
583	583	)
584	584

trunk/docsrc/template-mixin.dd

r2040	r2140
10	10	$(GNAME TemplateMixinDeclaration):
11	11	$(V2 $(B mixin)) $(B template) $(TEMPLATEIDENTIFIER) $(B $(LPAREN)) $(TEMPLATEPARAMETERLIST) $(B $(RPAREN)) $(V2 $(GLINK Constraint)$(SUB $(I opt)))
12		$(B {) ~~DeclDefs~~ $(B })
	12	$(B {) $(LINK2 module.html#DeclDefs, DeclDefs) $(B })
13	13
14	14	$(GNAME TemplateMixin):

trunk/docsrc/template.dd

r1939	r2140
14	14	$(GNAME TemplateDeclaration):
15	15	$(B template) $(GLINK TemplateIdentifier) $(B $(LPAREN)) $(GLINK TemplateParameterList) $(B $(RPAREN)) $(V2 $(GLINK Constraint)$(SUB $(I opt)))
16		$(B {) ~~DeclDefs~~ $(B })
	16	$(B {) $(GLINK2 module, DeclDefs) $(B })
17	17
18	18	$(GNAME TemplateIdentifier):
…	…
29	29	$(GLINK TemplateAliasParameter)
30	30	$(GLINK TemplateTupleParameter)
31		$(V2
32		$(GLINK TemplateThisParameter))
	31	$(V2 $(GLINK TemplateThisParameter))
33	32	)
34	33
…	…
68	67	$(GNAME TemplateInstance):
69	68	$(GLINK TemplateIdentifier) $(B !$(LPAREN)) $(GLINK TemplateArgumentList) $(B $(RPAREN))
70		$(V2
71		$(GLINK TemplateIdentifier) $(B !) $(GLINK TemplateSingleArgument)
72		)
	69	$(V2 $(GLINK TemplateIdentifier) $(B !) $(GLINK TemplateSingleArgument))
73	70
74	71	$(GNAME TemplateArgumentList):
…	…
78	75
79	76	$(GNAME TemplateArgument):
80		$(I Type)
	77	$(GLINK2 declaration, Type)
81	78	$(ASSIGNEXPRESSION)
82	79	$(I Symbol)
…	…
335	332
336	333	$(GNAME TemplateTypeParameterSpecialization):
337		$(B :) $(I Type)
	334	$(B :) $(GLINK2 declaration, Type)
338	335
339	336	$(GNAME TemplateTypeParameterDefault):
340		$(B =) $(I Type)
	337	$(B =) $(GLINK2 declaration, Type)
341	338	)
342	339
…	…
415	412	$(GRAMMAR
416	413	$(GNAME TemplateValueParameter):
417		$(~~I Declaration~~)
418		$(~~I Declaration~~) $(I TemplateValueParameterSpecialization)
419		$(~~I Declaration~~) $(I TemplateValueParameterDefault)
420		$(~~I Declaration~~) $(I TemplateValueParameterSpecialization) $(I TemplateValueParameterDefault)
	414	$(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator)
	415	$(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(I TemplateValueParameterSpecialization)
	416	$(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(I TemplateValueParameterDefault)
	417	$(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(I TemplateValueParameterSpecialization) $(I TemplateValueParameterDefault)
421	418
422	419	$(GNAME TemplateValueParameterSpecialization):
…	…
424	421
425	422	$(GNAME TemplateValueParameterDefault):
426		$(V2
427		$(B = __FILE__)
	423	$(V2 $(B = __FILE__)
428	424	$(B = __LINE__))
429		$(B =) $(~~LINK2 expression.html#ConditionalExpression, $(I ConditionalExpression)~~)
	425	$(B =) $(ASSIGNEXPRESSION)
430	426	)
431	427
…	…
474	470	$(GRAMMAR
475	471	$(GNAME TemplateAliasParameter):
476		$(B alias) $(I Identifier) $(I TemplateAliasParameterSpecialization)$(SUB $(I opt)) $(I TemplateAliasParameterDefault)$(SUB $(I opt))
	472	$(B alias) $(I Identifier) $(I TemplateAliasParameterSpecialization)$(OPT) $(I TemplateAliasParameterDefault)$(OPT)
	473	$(B alias) $(GLINK2 declaration, BasicType) $(GLINK2 declaration, Declarator) $(I TemplateAliasParameterSpecialization)$(OPT) $(I TemplateAliasParameterDefault)$(OPT)
477	474
478	475	$(GNAME TemplateAliasParameterSpecialization):
479		$(B :) $(I Type)
	476	$(B :) $(GLINK2 declaration, Type)
	477	$(B :) $(GLINK2 expression, ConditionalExpression)
480	478
481	479	$(GNAME TemplateAliasParameterDefault):
482		$(B =) $(I Type)
	480	$(B =) $(GLINK2 declaration, Type)
	481	$(B =) $(GLINK2 expression, ConditionalExpression)
483	482	)
484	483
…	…
784	783	$(GRAMMAR
785	784	$(GNAME ClassTemplateDeclaration):
786		$(B class) $(I Identifier) $(B $(LPAREN)) $(GLINK TemplateParameterList) $(B $(RPAREN)) $(I BaseClassList) $(I ClassBody)
	785	$(B class) $(I Identifier) $(B $(LPAREN)) $(GLINK TemplateParameterList) $(B $(RPAREN)) $(GLINK Constraint)$(OPT) $(GLINK2 class, BaseClassList) $(GLINK2 class, ClassBody)
	786
	787	$(GNAME TemplatedConstructor):
	788	$(B this) $(B $(LPAREN)) $(GLINK2 template, TemplateParameterList) $(B $(RPAREN)) $(GLINK2 declaration, Parameters) $(GLINK Constraint)$(OPT) $(GLINK2 function, FunctionBody))
787	789	)
788	790

trunk/docsrc/version.dd

r1580	r2140
71	71	$(GRAMMAR
72	72	$(GNAME VersionCondition):
73		$(B version $(LPAREN)) $(~~I Integer~~) $(B $(RPAREN))
	73	$(B version $(LPAREN)) $(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral)) $(B $(RPAREN))
74	74	$(B version $(LPAREN)) $(I Identifier) $(B $(RPAREN))
75	75	$(V2
…	…
77	77	)
78	78
79		$(P The $(I VersionCondition) is satisfied if the $(I Integer)
	79	$(P The $(I VersionCondition) is satisfied if the $(I IntegerLiteral)
80	80	is greater than or equal to the current $(I version level),
81	81	or if $(I Identifier) matches a $(I version identifier).
…	…
126	126	$(GNAME VersionSpecification):
127	127	$(B version =) $(I Identifier) $(B ;)
128		$(B version =) $(~~I Integer~~) $(B ;)
	128	$(B version =) $(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral)) $(B ;)
129	129	)
130	130
…	…
201	201
202	202	------
203		version($(I n)) // add in version code if version level is >= $(I n)
	203	version($(I n)) // add in version code if version level is >= $(I n)
204	204	{
205	205	... version code ...
…	…
303	303	$(GNAME DebugCondition):
304	304	$(B debug)
305		$(B debug $(LPAREN)) $(~~I Integer~~) $(B $(RPAREN))
	305	$(B debug $(LPAREN)) $(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral)) $(B $(RPAREN))
306	306	$(B debug $(LPAREN)) $(I Identifier) $(B $(RPAREN))
307	307	)
…	…
311	311	)
312	312
313		$(P The $(B debug $(LPAREN)) $(I Integer) $(B $(RPAREN)) condition is satisfied
	313	$(P The $(B debug $(LPAREN)) $(I IntegerLiteral) $(B $(RPAREN)) condition is satisfied
314	314	when the debug
315		level is >= $(I Integer).
	315	level is >= $(I IntegerLiteral).
316	316	)
317	317
…	…
335	335	$(GNAME DebugSpecification):
336	336	$(B debug =) $(I Identifier) $(B ;)
337		$(B debug =) $(~~I Integer~~) $(B ;)
	337	$(B debug =) $(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral)) $(B ;)
338	338	)
339	339
…	…
363	363
364	364	------
365		debug($(~~I Integer)) { } // add in debug code if debug level is >= $(I Integer~~)
	365	debug($(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral))) { } // add in debug code if debug level is >= $(LINK2 lex.html#IntegerLiteral, $(I IntegerLiteral))
366	366	debug($(I identifier)) { } // add in debug code if debug keyword is $(I identifier)
367	367	------

Download in other formats:

© Copyright 2004-2012 - The Sankaty Group, Inc. All rights reserved.

Make a Donation

Privacy Statement Terms of Service