Merge pull request #1537 from arcaneframework/dev/gg-remove-variable-expression

Remove compilation of VariableExpression and associated classes

Author: grospelliergilles

arcane/src/arcane/core/IVariable.h

@@ -33,7 +33,6 @@ class IDataReader;
 class IDataWriter;
 class VariableMng;
 class Module;
-class Expression;
 class IVariableComputeFunction;
 class IObservable;
 class IDataOperation;
@@ -262,15 +261,6 @@ class ARCANE_CORE_EXPORT IVariable
   //! Nombre de références sur cette variable
   virtual Integer nbReference() const =0;
 
-
- public:
-
-//%% ARCANE_BENCH_SUPPRESS_BEGIN
-  virtual Expression expression() =0;
-
- public:
-//%% ARCANE_BENCH_SUPPRESS_END
-
  public:
 
   ARCANE_DEPRECATED_REASON("Y2021: This method is a noop")

arcane/src/arcane/core/Variable.cc

@@ -31,8 +31,6 @@
 #include "arcane/utils/MemoryView.h"
 
 #include "arcane/core/ItemGroupObserver.h"
-#include "arcane/core/expr/Expression.h"
-#include "arcane/core/VariableExpressionImpl.h"
 #include "arcane/core/Variable.h"
 #include "arcane/core/VarRefEnumerator.h"
 #include "arcane/core/IVariableAccessor.h"
@@ -522,15 +520,6 @@ dataType() const
   return m_p->m_infos.dataType();
 }
 
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-Expression Variable::
-expression()
-{
-  return Expression(new VariableExpressionImpl(this));
-}
-
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 /*!

arcane/src/arcane/core/Variable.h

@@ -106,10 +106,6 @@ class ARCANE_CORE_EXPORT Variable
   int property() const override;
   void notifyReferencePropertyChanged() override;
 
- public:
-
-  Expression expression() override;
-
  public:
 
   //! Positionne l'état d'utilisation de la variable

arcane/src/arcane/core/VariableExpressionImpl.h

@@ -1,11 +1,12 @@
 // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
+#error "VariableExpression are no longer available. Do not include this file"
 /*---------------------------------------------------------------------------*/
-/* VariableExpressionImpl.h                                    (C) 2000-2004 */
+/* VariableExpressionImpl.h                                    (C) 2000-2024 */
 /*                                                                           */
 /* Expression traitant une variable.                                         */
 /*---------------------------------------------------------------------------*/

arcane/src/arcane/core/srcs.cmake

@@ -1,4 +1,4 @@
-set(CURRENT_SRC_PATH ${Arcane_SOURCE_DIR}/src)
+set(CURRENT_SRC_PATH ${Arcane_SOURCE_DIR}/src)
 
 set(ARCANE_MATERIALS_SOURCES
   materials/CellToAllEnvCellConverter.h
@@ -621,8 +621,8 @@ set(ARCANE_ORIGINAL_SOURCES
   VariableDependInfo.h
   VariableDiff.h
   VariableDiff.cc
-  VariableExpressionImpl.cc
-  VariableExpressionImpl.h
+  #VariableExpressionImpl.cc
+  #VariableExpressionImpl.h
   VariableFactory.cc
   VariableFactory.h
   VariableFactoryRegisterer.cc
@@ -690,31 +690,31 @@ set(ARCANE_ORIGINAL_SOURCES
   datatype/VariantBase.cc
   datatype/VariantBase.h
 
-  expr/IExpressionImpl.h
-  expr/Expression.h
-  expr/ArrayExpressionImpl.cc
-  expr/ArrayExpressionImpl.h
-  expr/BadExpressionException.cc
-  expr/BadExpressionException.h
-  expr/BadOperandException.cc
-  expr/BadOperandException.h
-  expr/BadOperationException.cc
-  expr/BadOperationException.h
-  expr/Expression.cc
-  expr/ExpressionResult.cc
-  expr/ExpressionResult.h
-  expr/ExpressionImpl.cc
-  expr/ExpressionImpl.h
-  expr/UnaryExpressionImpl.cc
-  expr/UnaryExpressionImpl.h
-  expr/LitteralExpressionImpl.cc
-  expr/LitteralExpressionImpl.h
-  expr/BinaryExpressionImpl.cc
-  expr/BinaryExpressionImpl.h
-  expr/WhereExpressionImpl.cc
-  expr/WhereExpressionImpl.h
-  expr/OperatorMng.cc
-  expr/OperatorMng.h
+  # expr/IExpressionImpl.h
+  # expr/Expression.h
+  # expr/ArrayExpressionImpl.cc
+  # expr/ArrayExpressionImpl.h
+  # expr/BadExpressionException.cc
+  # expr/BadExpressionException.h
+  # expr/BadOperandException.cc
+  # expr/BadOperandException.h
+  # expr/BadOperationException.cc
+  # expr/BadOperationException.h
+  # expr/Expression.cc
+  # expr/ExpressionResult.cc
+  # expr/ExpressionResult.h
+  # expr/ExpressionImpl.cc
+  # expr/ExpressionImpl.h
+  # expr/UnaryExpressionImpl.cc
+  # expr/UnaryExpressionImpl.h
+  # expr/LitteralExpressionImpl.cc
+  # expr/LitteralExpressionImpl.h
+  # expr/BinaryExpressionImpl.cc
+  # expr/BinaryExpressionImpl.h
+  # expr/WhereExpressionImpl.cc
+  # expr/WhereExpressionImpl.h
+  # expr/OperatorMng.cc
+  # expr/OperatorMng.h
 
   anyitem/AnyItem.h
   anyitem/AnyItemGlobal.h

arcane/tools/wrapper/core/ArcaneSwigCore.i

@@ -475,7 +475,6 @@ class IEntryPoint
 %include arcane/core/IApplication.h
 %include arcane/core/IDirectory.h
 %include arcane/core/ItemGroupImpl.h
-%include arcane/core/expr/IExpressionImpl.h
 %include arcane/core/SharedReference.h
 %include arcane/utils/IObserver.h
 %include arcane/utils/Observer.h
@@ -556,7 +555,6 @@ ARCANE_STD_EXHANDLER
 
 %include arcane/core/IVariableMng.h
 %include arcane/core/IVariable.h
-%include arcane/core/expr/Expression.h
 %include arcane/core/IArcaneMain.h
 %include arcane/core/ITimeLoopMng.h
 %include arcane/core/datatype/ScalarVariant.h

arcane/tools/wrapper/core/ArcaneSwigCoreInclude.h

@@ -21,9 +21,6 @@
 #include "arcane/utils/ArrayShape.h"
 #include "arcane/utils/MemoryView.h"
 
-#include "arcane/expr/Expression.h"
-#include "arcane/expr/ArrayExpressionImpl.h"
-
 #include "arcane/core/IApplication.h"
 #include "arcane/core/ISubDomain.h"
 #include "arcane/core/ISession.h"