Skip to content

Commit e39b479

Browse files
committed
Rename and reorganise property grammar
It seems the attributes in the grammar are all prefixed with @ but this is implied by the rule for properties i.e: Property: @ PropertyIdentifier Furthermore disable is referenced twice, and they are not in alphabetical order.
1 parent fe35ad5 commit e39b479

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

spec/attribute.dd

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,23 @@ $(GNAME Attribute):
2828
$(RELATIVE_LINK2 inout, $(D inout))
2929
$(RELATIVE_LINK2 shared, $(D shared))
3030
$(RELATIVE_LINK2 gshared, $(D __gshared))
31-
$(GLINK Property)
31+
$(GLINK AtAttribute)
3232
$(RELATIVE_LINK2 nothrow, $(D nothrow))
3333
$(RELATIVE_LINK2 pure, $(D pure))
3434
$(RELATIVE_LINK2 ref, $(D ref))
3535
$(RELATIVE_LINK2 return, $(D return))
3636

37-
$(GNAME Property):
38-
$(D @) $(GLINK PropertyIdentifier)
37+
$(GNAME AtAttribute):
38+
$(D @) $(RELATIVE_LINK2 disable, $(D disable))
39+
$(D @) $(RELATIVE_LINK2 nogc, $(D nogc))
40+
$(GLINK Property)
41+
$(D @) $(RELATIVE_LINK2 safe, $(D safe))
42+
$(D @) $(RELATIVE_LINK2 safe, $(D system))
43+
$(D @) $(RELATIVE_LINK2 safe, $(D trusted))
3944
$(GLINK UserDefinedAttribute)
4045

41-
$(GNAME PropertyIdentifier):
42-
$(RELATIVE_LINK2 property, `property`)
43-
$(RELATIVE_LINK2 safe, `@safe`)
44-
$(RELATIVE_LINK2 safe, `@trusted`)
45-
$(RELATIVE_LINK2 safe, `@system`)
46-
$(RELATIVE_LINK2 disable, $(D disable))
47-
$(RELATIVE_LINK2 nogc, `nogc`)
48-
$(RELATIVE_LINK2 disable, `@disable`)
46+
$(GNAME Property):
47+
$(D @) $(RELATIVE_LINK2 property, $(D property))
4948

5049
$(GNAME DeclarationBlock):
5150
$(GLINK2 module, DeclDef)

0 commit comments

Comments
 (0)