Workaround macro lookup failure with gInterpreter -> gCling in Python

aaronj0 · aaronj0 · commit 1f9de1ce1768 · 2025-10-27T16:37:13.000+01:00
diff --git a/bindings/distrdf/python/DistRDF/Backends/Base.py b/bindings/distrdf/python/DistRDF/Backends/Base.py
@@ -49,7 +49,7 @@ def setup_mapper(initialization_fn: Callable, code_to_declare: str) -> None:
     initialization_fn()
     
     # Declare all user code in one call
-    ROOT.gInterpreter.Declare(code_to_declare)
+    ROOT.gCling.Declare(code_to_declare)
 
 
 def get_mergeable_values(starting_node: ROOT.RDF.RNode, range_id: int,
@@ -215,7 +215,7 @@ def register_declaration(cls, code_to_declare):
             code_with_guard = f"#ifndef {hex}\n#define {hex}\n{stripped}\n#endif"
             cls.strings_to_declare[hex] = code_with_guard
 
-        ROOT.gInterpreter.Declare(cls.strings_to_declare[hex])
+        ROOT.gCling.Declare(cls.strings_to_declare[hex])
 
     @classmethod
     def register_shared_lib(cls, paths_to_shared_libraries):
diff --git a/bindings/distrdf/python/DistRDF/Backends/Utils.py b/bindings/distrdf/python/DistRDF/Backends/Utils.py
@@ -39,10 +39,10 @@ def extend_include_path(include_path: str) -> None:
             needed for the analysis.
     """
     root_path = "-I{}".format(include_path)
-    ROOT.gInterpreter.AddIncludePath(root_path)
+    ROOT.gCling.AddIncludePath(root_path)
 
     # Retrieve ROOT internal list of include paths and add debug statement
-    root_includepath = ROOT.gInterpreter.GetIncludePath()
+    root_includepath = ROOT.gCling.GetIncludePath()
     logger.debug("ROOT include paths:\n{}".format(root_includepath))
 
 
@@ -62,7 +62,7 @@ def distribute_headers(headers_to_include: Iterable[str]) -> None:
         # Create C++ include code
         include_code = "#include \"{}\"\n".format(header)
         try:
-            ROOT.gInterpreter.Declare(include_code)
+            ROOT.gCling.Declare(include_code)
         except Exception as e:
             msg = "There was an error in including \"{}\" !".format(header)
             raise e(msg)
diff --git a/bindings/distrdf/test/backend/test_common.py b/bindings/distrdf/test/backend/test_common.py
@@ -70,7 +70,7 @@ def test_initialization_runs_in_current_environment(self):
         """
         def defineIntVariable(name, value):
             import ROOT
-            ROOT.gInterpreter.ProcessLine("int %s = %s;" % (name, value))
+            ROOT.gCling.ProcessLine("int %s = %s;" % (name, value))
 
         varvalue = 2
         DistRDF.initialize(defineIntVariable, "myInt", varvalue)
diff --git a/bindings/pyroot/cppyy/cppyy/python/cppyy/__pyinstaller/hook-cppyy.py b/bindings/pyroot/cppyy/cppyy/python/cppyy/__pyinstaller/hook-cppyy.py
@@ -21,7 +21,7 @@ def datafile(path):
 def _api_files():
     import cppyy, os
 
-    paths = str(cppyy.gbl.gInterpreter.GetIncludePath()).split('-I')
+    paths = str(cppyy.gbl.gCling.GetIncludePath()).split('-I')
     for p in paths:
         if not p: continue
 
diff --git a/bindings/pyroot/cppyy/cppyy/test/assert_interactive.py b/bindings/pyroot/cppyy/cppyy/test/assert_interactive.py
@@ -14,4 +14,4 @@
     assert g.std
 except ImportError:
  # full lazy lookup available
-    assert gInterpreter
+    assert gCling
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_crossinheritance.py b/bindings/pyroot/cppyy/cppyy/test/test_crossinheritance.py
@@ -1200,7 +1200,7 @@ def test27_interfaces(self):
 
         import cppyy
 
-        cppyy.gbl.gInterpreter.Declare("""\
+        cppyy.gbl.gCling.Declare("""\
         namespace NonStandardOffset {
         struct Calc1 {
           virtual int calc1() = 0;
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_datatypes.py b/bindings/pyroot/cppyy/cppyy/test/test_datatypes.py
@@ -14,7 +14,7 @@ def setup_class(cls):
         cls.datatypes = cppyy.load_reflection_info(cls.test_dct)
         cls.N = cppyy.gbl.N
 
-        at_least_17 = 201402 < cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;")
+        at_least_17 = 201402 < cppyy.gbl.gCling.ProcessLine("__cplusplus;")
         cls.has_byte     = at_least_17
         cls.has_optional = at_least_17
 
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_fragile.py b/bindings/pyroot/cppyy/cppyy/test/test_fragile.py
@@ -789,7 +789,7 @@ def test01_abortive_signals(self):
 class TestSTDNOTINGLOBAL:
     def setup_class(cls):
         import cppyy
-        cls.has_byte = 201402 < cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;")
+        cls.has_byte = 201402 < cppyy.gbl.gCling.ProcessLine("__cplusplus;")
 
     @mark.xfail()
     def test01_stl_in_std(self):
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_lowlevel.py b/bindings/pyroot/cppyy/cppyy/test/test_lowlevel.py
@@ -15,7 +15,7 @@ def setup_class(cls):
         cls.datatypes = cppyy.load_reflection_info(cls.test_dct)
         cls.N = cppyy.gbl.N
 
-        at_least_17 = 201402 < cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;")
+        at_least_17 = 201402 < cppyy.gbl.gCling.ProcessLine("__cplusplus;")
         cls.has_nested_namespace = at_least_17
 
     def test00_import_all(self):
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_regression.py b/bindings/pyroot/cppyy/cppyy/test/test_regression.py
@@ -56,11 +56,11 @@ def test02_dir(self):
 
         import cppyy, pydoc
 
-        assert not '__abstractmethods__' in dir(cppyy.gbl.gInterpreter)
-        assert '__class__' in dir(cppyy.gbl.gInterpreter)
+        assert not '__abstractmethods__' in dir(cppyy.gbl.gCling)
+        assert '__class__' in dir(cppyy.gbl.gCling)
 
         self.__class__.helpout = []
-        pydoc.doc(cppyy.gbl.gInterpreter)
+        pydoc.doc(cppyy.gbl.gCling)
         helptext = ''.join(self.__class__.helpout)
         assert 'TInterpreter' in helptext
         assert 'CPPInstance' in helptext
@@ -1020,7 +1020,7 @@ def test35_filesytem(self):
 
         import cppyy
 
-        if cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;") > 201402:
+        if cppyy.gbl.gCling.ProcessLine("__cplusplus;") > 201402:
             cppyy.cppdef("""\
             #include <filesystem>
             std::string stack_std_path() {
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_stltypes.py b/bindings/pyroot/cppyy/cppyy/test/test_stltypes.py
@@ -1697,7 +1697,7 @@ def test01_string_through_string_view(self):
         """Usage of std::string_view as formal argument"""
 
         import cppyy
-        if cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;") <= 201402:
+        if cppyy.gbl.gCling.ProcessLine("__cplusplus;") <= 201402:
             # string_view exists as of C++17
             return
 
@@ -1718,7 +1718,7 @@ def test02_string_view_from_unicode(self):
         """Life-time management of converted unicode strings"""
 
         import cppyy, gc
-        if cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;") <= 201402:
+        if cppyy.gbl.gCling.ProcessLine("__cplusplus;") <= 201402:
             # string_view exists as of C++17
             return
 
diff --git a/bindings/pyroot/cppyy/cppyy/test/test_templates.py b/bindings/pyroot/cppyy/cppyy/test/test_templates.py
@@ -13,7 +13,7 @@ def setup_class(cls):
         import cppyy
         cls.templates = cppyy.load_reflection_info(cls.test_dct)
 
-        at_least_17 = 201402 < cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;")
+        at_least_17 = 201402 < cppyy.gbl.gCling.ProcessLine("__cplusplus;")
         cls.has_integral_v    = at_least_17
         cls.has_disjunction_v = at_least_17
         cls.has_pack_fold     = at_least_17
@@ -299,16 +299,16 @@ def test12_template_aliases(self):
         assert iavec[5] == 5
 
       # with variadic template
-        if cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;") > 201402:
+        if cppyy.gbl.gCling.ProcessLine("__cplusplus;") > 201402:
             assert nsup.matryoshka[int, 3].type
             assert nsup.matryoshka[int, 3, 4].type
             assert nsup.make_vector[int , 3]
             assert nsup.make_vector[int , 3]().m_val == 3
             assert nsup.make_vector[int , 4]().m_val == 4
 
       # with inner types using
-        if cppyy.gbl.gInterpreter.ProcessLine("__cplusplus;") > 201402:
-            assert cppyy.gbl.gInterpreter.CheckClassTemplate("using_problem::Bar::Foo")
+        if cppyy.gbl.gCling.ProcessLine("__cplusplus;") > 201402:
+            assert cppyy.gbl.gCling.CheckClassTemplate("using_problem::Bar::Foo")
             assert nsup.Foo
             assert nsup.Bar.Foo        # used to fail
 
diff --git a/bindings/pyroot/pythonizations/python/ROOT/_application.py b/bindings/pyroot/pythonizations/python/ROOT/_application.py
@@ -11,7 +11,7 @@
 import sys
 import time
 
-from cppyy.gbl import gSystem, gInterpreter, gEnv
+from cppyy.gbl import gSystem, gCling, gEnv
 
 from ROOT.libROOTPythonizations import InitApplication, InstallGUIEventInputHook
 
@@ -69,7 +69,7 @@ def displayhook(v):
             # in an interactive Python session.
             # Therefore, this function will call EndOfLineAction after each interactive
             # command (to update display etc.)
-            gInterpreter.EndOfLineAction()
+            gCling.EndOfLineAction()
             return orig_dhook(v)
 
         sys.displayhook = displayhook
diff --git a/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py b/bindings/pyroot/pythonizations/python/ROOT/_numbadeclare.py
@@ -507,7 +507,7 @@ def pywrapper({SIGNATURE}):
         )
 
         # Jit wrapper C++ code
-        err = gbl_namespace.gInterpreter.Declare(cppwrappercode)
+        err = gbl_namespace.gCling.Declare(cppwrappercode)
         if not err:
             raise Exception("Failed to jit C++ wrapper code with cling:\n{}".format(cppwrappercode))
         func.__cpp_wrapper__ = cppwrappercode
diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdataframe.py
@@ -34,7 +34,7 @@
 
 ~~~{.py}
 # JIT a C++ function from Python
-ROOT.gInterpreter.Declare("""
+ROOT.gCling.Declare("""
 bool myFilter(float x) {
     return x > 10;
 }
@@ -51,7 +51,7 @@
 
 ~~~{.py}
 ROOT.gSystem.Load("path/to/myLibrary.so") # Library with the myFilter function
-ROOT.gInterpreter.Declare('#include "myLibrary.h"') # Header with the declaration of the myFilter function
+ROOT.gCling.Declare('#include "myLibrary.h"') # Header with the declaration of the myFilter function
 df = ROOT.RDataFrame("myTree", "myFile.root")
 sum = df.Filter("myFilter(x)").Sum("y")
 print(sum.GetValue())
@@ -208,7 +208,7 @@ def pypowarray(numpyvec, pow):
 The ROOT::RDF::AsRNode function casts an RDataFrame node to the generic ROOT::RDF::RNode type. From Python, it can be used to pass any RDataFrame node as an argument of a C++ function, as shown below:
 
 ~~~{.py}
-ROOT.gInterpreter.Declare("""
+ROOT.gCling.Declare("""
 ROOT::RDF::RNode MyTransformation(ROOT::RDF::RNode df) {
     auto myFunc = [](float x){ return -x;};
     return df.Define("y", myFunc, {"x"});
@@ -578,7 +578,7 @@ def _ensure_deleter_declared():
         except AttributeError:
             pass
 
-        ROOT.gInterpreter.Declare(
+        ROOT.gCling.Declare(
             r"""
     #include <Python.h>
 
diff --git a/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py b/bindings/pyroot/pythonizations/python/ROOT/_pythonization/_ttree.py
@@ -76,7 +76,7 @@
     # Struct as leaflist. This is interpreted on the fly,
     # but could be known to ROOT by other means, such as
     # header inclusion or dictionary load.
-    ROOT.gInterpreter.Declare('''
+    ROOT.gCling.Declare('''
     struct MyStruct {
     int myint;
     float myfloat;
@@ -144,7 +144,7 @@
     # Struct as leaflist. This is interpreted on the fly,
     # but could be known to ROOT by other means, such as
     # header inclusion or dictionary load.
-    ROOT.gInterpreter.Declare('''
+    ROOT.gCling.Declare('''
     struct MyStruct {
     int myint;
     float myfloat;
diff --git a/bindings/pyroot/pythonizations/test/pythonization_decorator.py b/bindings/pyroot/pythonizations/test/pythonization_decorator.py
@@ -19,9 +19,9 @@ class PythonizationDecorator(unittest.TestCase):
     # Helpers
     def _define_class(self, class_name, namespace=None):
         if namespace is None:
-            ROOT.gInterpreter.ProcessLine('class {cn} {{ }};'.format(cn=class_name))
+            ROOT.gCling.ProcessLine('class {cn} {{ }};'.format(cn=class_name))
         else:
-            ROOT.gInterpreter.ProcessLine('''
+            ROOT.gCling.ProcessLine('''
             namespace {ns} {{
             class {cn} {{}};
             }}'''.format(ns=namespace, cn=class_name))
@@ -466,7 +466,7 @@ def test_instantiated_classes(self):
         self._define_class(class_name)
         self._define_class(class_name, ns)
         class_template = 'ClassTemplate'
-        ROOT.gInterpreter.ProcessLine('template <class T> class {ct} {{ }};'
+        ROOT.gCling.ProcessLine('template <class T> class {ct} {{ }};'
                                       .format(ct=class_template))
         templ_type = 'int'
 
diff --git a/bindings/pyroot/pythonizations/test/rdataframe_asnumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_asnumpy.py
@@ -99,7 +99,7 @@ def test_read_array(self):
         """
         Testing reading a std::array
         """
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         std::array<unsigned int, 3> create_array(unsigned int n) {
             return std::array<unsigned int, 3>({n, n, n});
         }
@@ -114,7 +114,7 @@ def test_read_th1f(self):
         """
         Testing reading a TH1F
         """
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         TH1F create_histo(unsigned int n) {
             const auto str = TString::Format("h%i", n);
             return TH1F(str, str, 4, 0, 1);
@@ -129,7 +129,7 @@ def test_read_vector_constantsize(self):
         """
         Testing reading a std::vector with constant size
         """
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         std::vector<unsigned int> create_vector_constantsize(unsigned int n) {
             return std::vector<unsigned int>({n, n, n});
         }
@@ -144,7 +144,7 @@ def test_read_vector_variablesize(self):
         """
         Testing reading a std::vector with variable size
         """
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         std::vector<unsigned int> create_vector_variablesize(unsigned int n) {
             return std::vector<unsigned int>(n);
         }
@@ -161,10 +161,10 @@ def test_read_tlorentzvector(self):
         """
 
         # The global module index does not have it preloaded and
-        # gInterpreter.Declare is not allowed to load libPhysics for
+        # gCling.Declare is not allowed to load libPhysics for
         # TLorentzVector. Preload the library now.
         ROOT.gSystem.Load("libPhysics")
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         TLorentzVector create_tlorentzvector() {
             auto v = TLorentzVector();
             v.SetPtEtaPhiM(1, 2, 3, 4);
@@ -180,7 +180,7 @@ def test_read_custom_class(self):
         """
         Testing reading a custom class injected in the interpreter
         """
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         struct CustomClass {
             unsigned int fMember = 42;
         };
diff --git a/bindings/pyroot/pythonizations/test/rdf_define_pyz.py b/bindings/pyroot/pythonizations/test/rdf_define_pyz.py
@@ -89,7 +89,7 @@ def test_cpp_functor(self):
         Define operation.
         """
 
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         struct MyFunctor
         {
             ULong64_t operator()(ULong64_t l) { return l*l; };
@@ -109,7 +109,7 @@ def test_std_function(self):
         Define operation.
         """
 
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
         std::function<ULong64_t(ULong64_t)> myfun = [](ULong64_t l) { return l*l; };
         """)
 
@@ -185,7 +185,7 @@ def test_cpp_free_function(self):
 
         for case in test_cases:
             with self.subTest(case=case["name"]):
-                ROOT.gInterpreter.Declare(case["decl"])
+                ROOT.gCling.Declare(case["decl"])
                 rdf = ROOT.RDataFrame(5)
 
                 if "setup_columns" in case:
@@ -206,7 +206,7 @@ def test_cpp_free_function_overload(self):
         Define operation with overloads.
         """
 
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
             ULong64_t my_free_function_overload(ULong64_t l) { return l; }
             ULong64_t my_free_function_overload(ULong64_t l, ULong64_t m) { return l * m; }
         """)
@@ -227,7 +227,7 @@ def test_cpp_free_function_template(self):
         Define operation.
         """
 
-        ROOT.gInterpreter.Declare("""
+        ROOT.gCling.Declare("""
             template <typename T>
             T my_free_function_template(T l) { return l; }
         """)
diff --git a/bindings/pyroot/pythonizations/test/rdf_filter_pyz.py b/bindings/pyroot/pythonizations/test/rdf_filter_pyz.py
