Skip to content

Commit 2ed31bf

Browse files
authored
[spec/lex] Tweak integer literal grammar formatting (#3759)
Move OctalDigit out of literals section (not used there). Format decimal/binary/hex literal grammar separately.
1 parent d615a92 commit 2ed31bf

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

spec/lex.dd

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,16 @@ $(GNAME EscapeSequence):
546546
$(B \u) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit)
547547
$(B \U) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit) $(GLINK HexDigit)
548548
$(B \\) $(GLINK2 entity, NamedCharacterEntity)
549+
550+
$(GNAME OctalDigit):
551+
$(B 0)
552+
$(B 1)
553+
$(B 2)
554+
$(B 3)
555+
$(B 4)
556+
$(B 5)
557+
$(B 6)
558+
$(B 7)
549559
)
550560

551561
$(LONGTABLE_2COLS 0.8, Escape Sequences,
@@ -636,7 +646,9 @@ $(GNAME IntegerSuffix):
636646
$(B LU)
637647
$(B uL)
638648
$(B UL)
649+
)
639650

651+
$(GRAMMAR_LEX
640652
$(GNAME DecimalInteger):
641653
$(B 0) $(GLINK Underscores)$(OPT)
642654
$(GLINK NonZeroDigit)
@@ -646,16 +658,6 @@ $(GNAME Underscores):
646658
$(B _)
647659
$(GLINK Underscores) $(B _)
648660

649-
$(GNAME BinaryInteger):
650-
$(GLINK BinPrefix) $(GLINK BinaryDigitsNoSingleUS)
651-
652-
$(GNAME BinPrefix):
653-
$(B 0b)
654-
$(B 0B)
655-
656-
$(GNAME HexadecimalInteger):
657-
$(GLINK HexPrefix) $(GLINK HexDigitsNoSingleUS)
658-
659661
$(GNAME NonZeroDigit):
660662
$(B 1)
661663
$(B 2)
@@ -689,6 +691,15 @@ $(GNAME DecimalDigit):
689691
$(GNAME DecimalDigitUS):
690692
$(GLINK DecimalDigit)
691693
$(B _)
694+
)
695+
696+
$(GRAMMAR_LEX
697+
$(GNAME BinaryInteger):
698+
$(GLINK BinPrefix) $(GLINK BinaryDigitsNoSingleUS)
699+
700+
$(GNAME BinPrefix):
701+
$(B 0b)
702+
$(B 0B)
692703

693704
$(GNAME BinaryDigitsNoSingleUS):
694705
$(GLINK BinaryDigitsUS)$(OPT) $(GLINK BinaryDigit) $(GLINK BinaryDigitsUS)$(OPT)
@@ -704,16 +715,11 @@ $(GNAME BinaryDigit):
704715
$(GNAME BinaryDigitUS):
705716
$(GLINK BinaryDigit)
706717
$(B _)
718+
)
707719

708-
$(GNAME OctalDigit):
709-
$(B 0)
710-
$(B 1)
711-
$(B 2)
712-
$(B 3)
713-
$(B 4)
714-
$(B 5)
715-
$(B 6)
716-
$(B 7)
720+
$(GRAMMAR_LEX
721+
$(GNAME HexadecimalInteger):
722+
$(GLINK HexPrefix) $(GLINK HexDigitsNoSingleUS)
717723

718724
$(GNAME HexDigits):
719725
$(GLINK HexDigit)

0 commit comments

Comments
 (0)