Merge pull request #2892 from GaijinEntertainment/claude/silly-wing-55035c

class_super: CFG-aware super(...) lint + reject super-skip-intermediate

Author: borisbat

doc/source/reference/language/classes.rst

@@ -169,7 +169,17 @@ up the inheritance chain to the nearest ancestor that does:
 
 Walk-up matches by argument types, so overloaded ``super(args)`` calls pick the closest
 ancestor whose constructor or method accepts those arguments. If no ancestor matches, the
-call is rejected at compile time.
+call is rejected at compile time. The walk-up may only step past a class that has no
+user-defined constructor (or method, in the case of ``super.method()``); attempting to
+skip a class whose user constructor (or method) would otherwise establish invariants is
+rejected — call the immediate parent and let it chain via its own ``super()``.
+
+Every constructor in a derived class whose parent has a user-defined constructor must call
+``super(...)`` exactly once on every control-flow path. The lint is unconditional:
+
+* zero ``super(...)`` calls on any reachable path → error;
+* two or more ``super(...)`` calls on any path → error;
+* ``super(...)`` inside a loop body → error (call count is not bounded to one).
 
 Inside a derived class's finalizer (``operator delete``), ``delete super.self`` runs the
 parent's finalizer on the current object:
@@ -197,9 +207,6 @@ functions — see :ref:`Structs <structs>`.
 Base-class finalization is explicit, not automatic: a derived finalizer that omits
 ``delete super.self`` will not run any ancestor finalizer.
 
-The option ``always_call_super`` can be enabled to require ``super()`` in every constructor
-(see :ref:`Options <options>`).
-
 Alternatively, the parent's method can be called directly using the backtick syntax:
 
 .. code-block:: das

doc/source/reference/language/options.rst

@@ -92,10 +92,6 @@ Lint Control
      - bool
      - true
      - Disallows writing to nameless (intermediate) variables on the stack.
-   * - ``always_call_super``
-     - bool
-     - false
-     - Requires ``super()`` to be called in every class constructor.
    * - ``no_unused_function_arguments``
      - bool
      - false

doc/source/reference/tutorials/18_classes.rst

@@ -75,6 +75,67 @@ bypassing virtual dispatch::
 The compiler rewrites ``super()`` to ``Parent`Constructor(self, ...)`` and
 ``super.method()`` to ``Parent`method(self, ...)``.
 
+``super(...)`` is required exactly once per path
+================================================
+
+Every constructor in a derived class whose parent has a user-defined constructor
+must call ``super(...)`` exactly once on every control-flow path. The lint catches:
+
+::
+
+  class Bad : Base {
+      def Bad(f : bool) {
+          if (f) {
+              super()   // ERROR: false branch has zero super() calls
+          }
+      }
+  }
+
+  class AlsoBad : Base {
+      def AlsoBad {
+          super()
+          super()       // ERROR: super() called more than once
+      }
+  }
+
+A call to ``super(...)`` inside a loop is also rejected — the count is not
+bounded to one. To branch on arguments, both branches must call ``super(...)``::
+
+  class OK : Shape {
+      def OK(big : bool) {
+          if (big) {
+              super("Big")
+          } else {
+              super("Small")
+          }
+      }
+  }
+
+``super.X()`` cannot skip an intermediate
+=========================================
+
+``super.X()`` (whether ``X`` is a method or the name of an ancestor class) may
+walk past only intermediate classes that have **no** user-defined constructor or
+matching method. Skipping a class whose user code would otherwise establish
+invariants is rejected. Empty intermediates are still legal::
+
+  class A {
+      def A { /* ... */ }
+  }
+
+  class B : A {
+      def B { super() }     // B has its own ctor
+  }
+
+  class C : B {
+      def C {
+          super.A()         // ERROR: would silently skip B's invariants
+      }
+  }
+
+If you really want only ``A``'s setup, name the immediate parent:
+``super.B()`` (or ``super()``) and let ``B``'s constructor chain to ``A`` itself.
+
 Creating instances
 ==================
 

include/daScript/ast/ast.h

@@ -1567,7 +1567,6 @@ namespace das
         /*option*/ bool no_unsafe_uninitialized_structures = true; // if true, then unsafe uninitialized structures are not allowed
         /*option*/ bool strict_properties = false;                 // if true, then properties are strict, i.e. a.prop = b does not get promoted to a.prop := b
         /*option*/ bool no_writing_to_nameless = true;             // if true, then writing to nameless variables (intermediate on the stack) is not allowed
-        /*option*/ bool always_call_super = false;                  // if true, then super() needs to be called from every class constructor
     // environment
         /*option*/ bool no_optimizations = false;                  // disable optimizations, regardless of settings
         /*option*/ bool no_infer_time_folding = false;             // disable infer-time constant folding

modules/dasClangBind/bind/bind_bgfx.das

@@ -29,8 +29,7 @@ class BgfxGen : CppGenBind {
             "-I{get_full_file_name(inc_bx)}"
         )
         func_per_chunk = 20
-        init_args(pfn, pfp, args)
-        setDefaultFiles()
+        super(pfn, pfp, args)
         init_skip()
         openAllFiles()
     }
@@ -49,10 +48,7 @@ class BgfxGen : CppGenBind {
         }
     }
     def override skip_const(name : string) : bool {
-        if (name |> starts_with("GL_")) {
-            return true
-        }
-        return false
+        return name |> starts_with("GL_")
     }
     def override skip_struct(name : string) {
         return bgfx_skip_struct |> key_exists(name)

modules/dasClangBind/bind/bind_clangbind.das

@@ -19,8 +19,7 @@ class ClangGen : CppGenBind {
             "-DCINDEX_EXPORTS"
         )
         func_per_chunk = 20
-        init_args(pfn, pfp, args)
-        setDefaultFiles()
+        super(pfn, pfp, args)
         init_enum_prefix()
         openAllFiles()
     }
@@ -70,15 +69,7 @@ class ClangGen : CppGenBind {
         return true
     }
     def override skip_file(fname : string) : bool {
-        if (fname |> ends_with("CXErrorCode.h")) {
-            return false
-        } elif (fname |> ends_with("CXString.h")) {
-            return false
-        } elif (fname |> ends_with("CXDiagnostic.h")) {
-            return false
-        } elif (fname |> ends_with("CXFile.h")) {
-            return false
-        } elif (fname |> ends_with("CXSourceLocation.h")) {
+        if (fname |> ends_with("CXErrorCode.h") || fname |> ends_with("CXString.h") || fname |> ends_with("CXDiagnostic.h") || fname |> ends_with("CXFile.h") || fname |> ends_with("CXSourceLocation.h")) {
             return false
         }
         return !fname |> ends_with(PARSE_FILE_NAME)

modules/dasClangBind/bind/bind_llvm.das

@@ -94,8 +94,7 @@ class LlvmGen : CppGenBind {
         let pfn = "cb_dasLLVM.h"
         let pfp = "{get_das_root()}/modules/dasLLVM/src/"
         func_per_chunk = 20
-        init_args(pfn, pfp, args)
-        setDefaultFiles()
+        super(pfn, pfp, args)
 //        init_enum_prefix()
         openAllFiles()
     }
@@ -137,7 +136,7 @@ class LlvmGen : CppGenBind {
 
 class LlvmGenDinamic : DasGenBind {
     def LlvmGenDinamic(pfn, pfp : string; args : array<string>) {
-        init_args(pfn, pfp, args)
+        super(pfn, pfp, args)
     }
     def override skip_const(name : string) : bool {
         return name == "true" || name == "false"

modules/dasClangBind/bind/bind_opengl.das

@@ -8,7 +8,7 @@ require daslib/fio
 class OpenGLBind : DasGenBind {
     def OpenGLBind(pfn, pfp : string) {
         let args <- array<string>("-DGL_GLEXT_PROTOTYPES")
-        init_args(pfn, pfp, args)
+        super(pfn, pfp, args)
         init_defaults()
     }
     def init_defaults {
@@ -19,10 +19,7 @@ class OpenGLBind : DasGenBind {
         }
     }
     def override skip_const(name : string) : bool {
-        if (name == "true" || name == "false") {
-            return true
-        }
-        return false
+        return name == "true" || name == "false"
     }
     def override functionArgumentRules : TypeRules {
         return (
@@ -47,10 +44,10 @@ class OpenGLBind : DasGenBind {
 [export]
 def main {
     let output_name = "{get_das_root()}/modules/dasOpenGL/opengl/opengl_func.das"
-    fopen(output_name, "wb") <| $(fdf) {
+    fopen(output_name, "wb") $(fdf) {
         fprint(fdf, "require dasbind public\n\n")
         let output_const_name = "{get_das_root()}/modules/dasOpenGL/opengl/opengl_const.das"
-        fopen(output_const_name, "wb") <| $(dcf) {
+        fopen(output_const_name, "wb") $(dcf) {
             let pfn = "glcorearb.h"
             let pfp = "{get_das_root()}/modules/dasOpenGL/opengl/OpenGL/"
             var glbind = new OpenGLBind(pfn, pfp)

modules/dasClangBind/bind/bind_quirrel.das

@@ -35,8 +35,7 @@ class QuirrelGen : CppGenBind {
             "-DCINDEX_EXPORTS"
         )
         func_per_chunk = 20
-        init_args(pfn, pfp, args)
-        setDefaultFiles()
+        super(pfn, pfp, args)
 //        init_enum_prefix()
         openAllFiles()
         for (h in quirrel_c_headers) {
@@ -58,30 +57,21 @@ class QuirrelGen : CppGenBind {
     }
     def override skip_file(fname : string) : bool {
         let ufname = to_upper(fname)
-        if (!any <| [iterator for(h in quirrel_c_headers); ufname |> ends_with(h)]) {
-            return true
-        }
-        return false
+        return !any <| [iterator for(h in quirrel_c_headers); ufname |> ends_with(h)]
     }
     def override skip_alias(var c : CXCursor) {
         let aliasn = string(clang_getCursorSpelling(c))
         if (aliasn == "SQPRINTFUNCTION") {
             return true
         }
         let aliasf = to_upper(clang_getCursorLocationFileName(c))
-        if (!any <| [iterator for(h in quirrel_c_headers); aliasf |> ends_with(h)]) {
-            return true
-        }
-        return false
+        return !any <| [iterator for(h in quirrel_c_headers); aliasf |> ends_with(h)]
     }
     def override skip_enum(ns_en, en : string) {
         return false
     }
     def override skip_struct(sn : string) {
-        if (sn |> starts_with("__crt")) {
-            return true
-        }
-        return false
+        return sn |> starts_with("__crt")
     }
     def override skip_function(var c : CXCursor) : bool {
     /*
@@ -91,13 +81,7 @@ class QuirrelGen : CppGenBind {
             return true
     */
         let funf = to_upper(clang_getCursorLocationFileName(c))
-        if (!any <| [iterator for(h in quirrel_c_headers); funf |> ends_with(h)]) {
-            return true
-        }
-        if (skip_anyFunction(c, false)) {
-            return true
-        }
-        return false
+        return !any <| [iterator for(h in quirrel_c_headers); funf |> ends_with(h)] || skip_anyFunction(c, false)
     }
 }
 

modules/dasClangBind/bind/bind_sfml.das

@@ -31,8 +31,7 @@ class SFMLGen : CppGenBind {
             "-I{get_full_file_name(isfml)}"
         )
         func_per_chunk = 100
-        init_args(pfn, pfp, args)
-        setDefaultFiles()
+        super(pfn, pfp, args)
         init_skip()
         openAllFiles()
     }
@@ -84,10 +83,7 @@ class SFMLGen : CppGenBind {
         return false
     }
     def override skip_struct(name : string) {
-        if (name == "HWND__") {
-            return true
-        }
-        return false
+        return name == "HWND__"
     }
 }