fixup! gh-138970: Add general metadata system to the peg generator

Author: pablogsal

Lib/test/test_peg_generator/test_pegen.py

@@ -1145,27 +1145,10 @@ def test_rule_flags(self) -> None:
         single_custom_rule = rules['single_custom_flag']
         self.assertFalse(single_custom_rule.memo, "single_custom_flag should have memo=False")
         self.assertEqual(single_custom_rule.flags, frozenset(['custom']),
-                        f"single_custom_flag flags should be ['custom'], got {single_custom_rule.flags}")
+                        f"single_custom_flag flags should be {'custom'}, got {single_custom_rule.flags}")
 
         # Test no flags rule
         no_flags_rule = rules['no_flags_rule']
         self.assertFalse(no_flags_rule.memo, "no_flags_rule should have memo=False")
         self.assertEqual(no_flags_rule.flags, [],
-                        f"no_flags_rule flags should be [], got {no_flags_rule.flags}")
-
-    def test_memo(self) -> None:
-        """Test that the old (memo) syntax works with the flag system"""
-        grammar_source = """
-        start: memo_rule
-
-        memo_rule (memo):
-            | "test"
-        """
-
-        grammar: Grammar = parse_string(grammar_source, GrammarParser)
-        rules = grammar.rules
-
-        memo_rule = rules['memo_rule']
-        self.assertTrue(memo_rule.memo, "memo_rule should have memo=True")
-        self.assertEqual(memo_rule.flags, frozenset(['memo']),
-                        f"memo_rule flags should be ['memo'], got {memo_rule.flags}")
+                        f"no_flags_rule flags should be [], got {no_flags_rule.flags}")

Tools/peg_generator/pegen/grammar_parser.py

@@ -50,11 +50,11 @@ rules[RuleList]:
     | rule { [rule] }
 
 rule[Rule]:
-    | rulename flags? ":" alts NEWLINE INDENT more_alts DEDENT {
-          Rule(rulename[0], rulename[1], Rhs(alts.alts + more_alts.alts), flags=opt) }
-    | rulename flags? ":" NEWLINE INDENT more_alts DEDENT {
-          Rule(rulename[0], rulename[1], more_alts, flags=opt) }
-    | rulename flags? ":" alts NEWLINE { Rule(rulename[0], rulename[1], alts, flags=opt) }
+    | rulename flags=flags? ":" alts NEWLINE INDENT more_alts DEDENT {
+          Rule(rulename[0], rulename[1], Rhs(alts.alts + more_alts.alts), flags=flags) }
+    | rulename flags=flags? ":" NEWLINE INDENT more_alts DEDENT {
+          Rule(rulename[0], rulename[1], more_alts, flags=flags) }
+    | rulename flags=flags? ":" alts NEWLINE { Rule(rulename[0], rulename[1], alts, flags=flags) }
 
 rulename[RuleName]:
     | NAME annotation { (name.string, annotation) }