Move add_type to declarator_no_init: all lexer registration per-declarator, none in doDeclaration

Co-authored-by: michael-schwarz <13812333+michael-schwarz@users.noreply.github.com>
Agent-Logs-Url: https://github.com/goblint/cil/sessions/459679d3-44f6-4f0b-8a30-92252ab7fa0d

Author: Copilot

src/frontc/cparser.mly

@@ -79,7 +79,7 @@ let smooth_expression lst =
 let currentFunctionName = ref "<outside any function>"
 
 (* Set to true while parsing a typedef declaration's declarator list, so that
-   declarator_no_init knows not to call add_identifier for typedef names. *)
+   declarator_no_init calls add_type (not add_identifier) for typedef names. *)
 let is_typedef_decl = ref false
 
 let announceFunctionName ((n, decl, _, _):name) =
@@ -120,18 +120,17 @@ let applyPointer (ptspecs: attribute list list) (dt: decl_type)
 
 let doDeclaration (loc: cabsloc) (specs: spec_elem list) (nl: init_name list) : definition =
   is_typedef_decl := false;
-  if isTypedef specs then begin
-    (* Tell the lexer about the new type names *)
-    List.iter (fun ((n, _, _, _), _) -> !Lexerhack.add_type n) nl;
+  (* Lexer registrations (add_type / add_identifier) are done per-declarator in
+     declarator_no_init / declarator_init_start as each declarator is parsed
+     (C11 6.2.1.7: scope begins just after the completion of the declarator), so
+     nothing to do here. *)
+  if isTypedef specs then
     TYPEDEF ((specs, List.map (fun (n, _) -> n) nl), loc)
-  end else
+  else
     if nl = [] then
       ONLYTYPEDEF (specs, loc)
-    else begin
-      (* add_identifier is called in declarator_no_init / declarator_init_start as each
-         declarator is parsed (C11 6.2.1.7), so nothing to do here. *)
+    else
       DECDEF ((specs, nl), loc)
-    end
 
 
 let doFunctionDef (loc: cabsloc)
@@ -1046,15 +1045,19 @@ init_declarator:                             /* ISO 6.7 */
                                         { let (n, d, a, l) = $1 in ((n, d, a, joinLoc l $3), $2) }
 ;
 
-/* (* Parses "declarator" (without initializer) and immediately adds the declared name
-      as a variable identifier in the lexer hack, for non-typedef declarations only,
-      so that subsequent declarators in the same declaration see the name as an
-      identifier, not as a type (C11 6.2.1.7: scope begins just after the completion
-      of its declarator). For typedef declarations (is_typedef_decl = true), the name
-      is registered later via add_type in doDeclaration. *) */
+/* (* Parses "declarator" (without initializer) and immediately registers the
+      declared name in the lexer hack, per C11 6.2.1.7 (scope begins just after
+      the completion of its declarator).
+      - For non-typedef declarations: calls add_identifier so subsequent
+        declarators in the same list see the name as a variable (not a type).
+      - For typedef declarations (is_typedef_decl = true): calls add_type so
+        subsequent declarators see the name as a type.
+      In both cases every declarator is registered at the right time without
+      going through doDeclaration. *) */
 declarator_no_init:
     declarator                          { let (n, _, _, _) = $1 in
-                                          if not !is_typedef_decl then !Lexerhack.add_identifier n;
+                                          if !is_typedef_decl then !Lexerhack.add_type n
+                                          else !Lexerhack.add_identifier n;
                                           $1 }
 ;