Split declaration; support 'for (int i = 0;...)'

gvanrossum · gvanrossum · commit 5e90a2274171 · 2022-10-27T16:27:51.000-07:00
diff --git a/Tools/cases_generator/sparser.py b/Tools/cases_generator/sparser.py
@@ -108,7 +108,7 @@ def stmt(self) -> Node | None:
         # TODO: switch, case, default, label
         if kind == lx.SEMI:
             return self.empty_stmt()
-        if decl := self.declaration():
+        if decl := self.decl_stmt():
             return decl
         return self.expr_stmt()
 
@@ -126,7 +126,7 @@ def block(self):
     def for_stmt(self):
         if self.expect(lx.FOR):
             self.require(lx.LPAREN)
-            init = self.expr()
+            init = self.decl() or self.expr()
             self.require(lx.SEMI)
             cond = self.expr()
             self.require(lx.SEMI)
@@ -180,7 +180,13 @@ def expr_stmt(self):
             return expr
 
     @contextual
-    def declaration(self):
+    def decl_stmt(self):
+        if decl := self.decl():
+            if self.expect(lx.SEMI):
+                return decl
+
+    @contextual
+    def decl(self):
         if not (type := self.type_name()):
             return None
         stars = 0
@@ -191,11 +197,8 @@ def declaration(self):
                 init = self.expr()
                 if not init:
                     raise self.make_syntax_error("Expected initialization expression")
-                self.require(lx.SEMI)
             else:
                 init = None
-                if not (self.expect(lx.SEMI)):
-                    return None
             return VarDecl(type, name, init)
 
 
