Partially reverted changes introduced earlier

- arguments to eval() are now 'const&' again

phylanx/execution_tree/primitives/access_argument.hpp

@@ -30,7 +30,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::string const& name, std::string const& codename);
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context) const override;
+            primitive_arguments_type const& params,
+            eval_context) const override;
 
         void store(primitive_arguments_type&& data,
             primitive_arguments_type&& params, eval_context ctx) override;

phylanx/execution_tree/primitives/access_function.hpp

@@ -35,7 +35,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
             primitive_arguments_type&& params, eval_context ctx) override;
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const override;
+            primitive_arguments_type const& params,
+            eval_context ctx) const override;
 
         topology expression_topology(std::set<std::string>&& functions,
             std::set<std::string>&& resolve_children) const override;

phylanx/execution_tree/primitives/access_variable.hpp

@@ -38,7 +38,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
             primitive_arguments_type&& params, eval_context ctx) override;
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const override;
+            primitive_arguments_type const& params,
+            eval_context ctx) const override;
 
         topology expression_topology(std::set<std::string>&& functions,
             std::set<std::string>&& resolve_children) const override;

phylanx/execution_tree/primitives/assert_condition.hpp

@@ -39,7 +39,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
     };
 
     PHYLANX_EXPORT primitive create_assert_condition(

phylanx/execution_tree/primitives/call_function.hpp

@@ -37,7 +37,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::set<std::string>&& resolve_children) const override;
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const override;
+            primitive_arguments_type const& params,
+            eval_context ctx) const override;
 
         void store(primitive_arguments_type&& data,
             primitive_arguments_type&& params, eval_context ctx) override;

phylanx/execution_tree/primitives/console_output.hpp

@@ -33,7 +33,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     private:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
     };
 
     PHYLANX_EXPORT primitive create_console_output(hpx::id_type const& locality,

phylanx/execution_tree/primitives/debug_output.hpp

@@ -25,7 +25,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
         using args_type = primitive_arguments_type;
 
@@ -49,8 +50,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     extern match_pattern_type const locality_match_data;
 
     hpx::future<primitive_argument_type> locality_id(
-        phylanx::execution_tree::primitive_arguments_type,
-        phylanx::execution_tree::primitive_arguments_type,
+        phylanx::execution_tree::primitive_arguments_type const&,
+        phylanx::execution_tree::primitive_arguments_type const&,
         std::string const&, std::string const&, eval_context);
 }}}
 

phylanx/execution_tree/primitives/define_variable.hpp

@@ -41,7 +41,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
         // Create a new instance of the variable and initialize it with the
         // value as returned by evaluating the given body.
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
         // return the topology for this variable definition
         topology expression_topology(std::set<std::string>&& functions,

phylanx/execution_tree/primitives/enable_tracing.hpp

@@ -29,7 +29,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
     };
 
     PHYLANX_EXPORT primitive create_enable_tracing(hpx::id_type const& locality,

phylanx/execution_tree/primitives/format_string.hpp

@@ -34,7 +34,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     private:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
     };
 
     PHYLANX_EXPORT primitive create_format_string(hpx::id_type const& locality,

phylanx/execution_tree/primitives/function.hpp

@@ -31,9 +31,10 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::string const& name, std::string const& codename);
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const override;
+            primitive_arguments_type const& params,
+            eval_context ctx) const override;
 
-        bool bind(primitive_arguments_type&& params,
+        bool bind(primitive_arguments_type const& params,
             eval_context ctx) const override;
 
         void store(primitive_argument_type&& data,

phylanx/execution_tree/primitives/generic_function.hpp

@@ -36,10 +36,11 @@ namespace phylanx { namespace execution_tree { namespace primitives
         {}
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& args, eval_context ctx) const override
+            primitive_arguments_type const& args,
+            eval_context ctx) const override
         {
-            return hpx::async(Action(), hpx::find_here(), operands_,
-                std::move(args), name_, codename_, std::move(ctx));
+            return hpx::async(Action(), hpx::find_here(), operands_, args,
+                name_, codename_, std::move(ctx));
         }
     };
 

phylanx/execution_tree/primitives/lambda.hpp

@@ -35,7 +35,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::set<std::string>&& resolve_children) const override;
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const override;
+            primitive_arguments_type const& params,
+            eval_context ctx) const override;
 
         void store(primitive_arguments_type&& data,
             primitive_arguments_type&& params, eval_context ctx) override;

phylanx/execution_tree/primitives/primitive_component.hpp

@@ -61,7 +61,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         // eval_action
         PHYLANX_EXPORT hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const;
+            primitive_arguments_type const& params,
+            eval_context ctx) const;
 
         PHYLANX_EXPORT hpx::future<primitive_argument_type> eval_single(
             primitive_argument_type&& param, eval_context ctx) const;
@@ -80,7 +81,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         // bind an invocable object
         PHYLANX_EXPORT bool bind(
-            primitive_arguments_type params, eval_context ctx) const;
+            primitive_arguments_type const& params, eval_context ctx) const;
 
         HPX_DEFINE_COMPONENT_ACTION(
             primitive_component, eval, eval_action);

phylanx/execution_tree/primitives/primitive_component_base.hpp

@@ -50,15 +50,15 @@ namespace phylanx { namespace execution_tree
 
             // eval_action
             virtual hpx::future<primitive_argument_type> eval(
-                primitive_arguments_type&& params, eval_context ctx) const;
+                primitive_arguments_type const& params, eval_context ctx) const;
 
             virtual hpx::future<primitive_argument_type> eval(
                 primitive_argument_type&& param, eval_context ctx) const;
 
             // eval implementation
             virtual hpx::future<primitive_argument_type> eval(
                 primitive_arguments_type const& operands,
-                primitive_arguments_type&& args, eval_context ctx) const;
+                primitive_arguments_type const& args, eval_context ctx) const;
 
             // store_action
             virtual void store(primitive_arguments_type&&,
@@ -74,7 +74,7 @@ namespace phylanx { namespace execution_tree
 
             // bind_action
             virtual bool bind(
-                primitive_arguments_type&& params, eval_context ctx) const;
+                primitive_arguments_type const& params, eval_context ctx) const;
 
             // initialize evaluation context (used by target-reference only)
             virtual void set_eval_context(eval_context ctx);
@@ -84,7 +84,8 @@ namespace phylanx { namespace execution_tree
 
             // helper functions to invoke eval functionalities
             hpx::future<primitive_argument_type> do_eval(
-                primitive_arguments_type&& params, eval_context ctx) const;
+                primitive_arguments_type const& params,
+                eval_context ctx) const;
 
             hpx::future<primitive_argument_type> do_eval(
                 primitive_argument_type&& param, eval_context ctx) const;

phylanx/execution_tree/primitives/primitive_name.hpp

@@ -33,7 +33,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     private:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
     };
 
     PHYLANX_EXPORT primitive create_primitive_name(hpx::id_type const& locality,

phylanx/execution_tree/primitives/primitive_type.hpp

@@ -33,7 +33,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     private:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
     };
 
     PHYLANX_EXPORT primitive create_primitive_type(hpx::id_type const& locality,

phylanx/execution_tree/primitives/store_operation.hpp

@@ -31,7 +31,8 @@ namespace phylanx {namespace execution_tree { namespace primitives
             std::string const& name, std::string const& codename);
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context) const override;
 
         hpx::future<primitive_argument_type> eval(
             primitive_argument_type&& arg, eval_context ctx) const override;

phylanx/execution_tree/primitives/string_output.hpp

@@ -28,7 +28,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
 
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
     public:
         static match_pattern_type const match_data;

phylanx/execution_tree/primitives/target_reference.hpp

@@ -30,11 +30,12 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::string const& name, std::string const& codename);
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context) const override;
+            primitive_arguments_type const& params,
+            eval_context) const override;
         hpx::future<primitive_argument_type> eval(
             primitive_argument_type&& param, eval_context) const override;
 
-        bool bind(primitive_arguments_type&& args,
+        bool bind(primitive_arguments_type const& args,
             eval_context ctx) const override;
 
         void store(primitive_arguments_type&& data,

phylanx/execution_tree/primitives/variable.hpp

@@ -30,11 +30,12 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::string const& name, std::string const& codename);
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& params, eval_context ctx) const override;
+            primitive_arguments_type const& params,
+            eval_context) const override;
         hpx::future<primitive_argument_type> eval(
             primitive_argument_type&& arg, eval_context ctx) const override;
 
-        bool bind(primitive_arguments_type&& params,
+        bool bind(primitive_arguments_type const& params,
             eval_context ctx) const override;
 
         void store(primitive_arguments_type&& data,

phylanx/execution_tree/primitives/variable_factory.hpp

@@ -30,7 +30,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
             std::string const& name, std::string const& codename);
 
         hpx::future<primitive_argument_type> eval(
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
         void store(primitive_argument_type&& data,
             primitive_arguments_type&& params, eval_context ctx) override;

phylanx/plugins/algorithms/als.hpp

@@ -26,7 +26,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
     public:
         static match_pattern_type const match_data;

phylanx/plugins/algorithms/lra.hpp

@@ -26,7 +26,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
     public:
         static match_pattern_type const match_data;

phylanx/plugins/arithmetics/add_operation.hpp

@@ -33,7 +33,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const;
+            primitive_arguments_type const& args, eval_context ctx) const;
 
     public:
         static match_pattern_type const match_data;

phylanx/plugins/arithmetics/cumulative.hpp

@@ -30,7 +30,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
     public:
         cumulative() = default;

phylanx/plugins/arithmetics/cumulative_impl.hpp

@@ -409,7 +409,7 @@ namespace phylanx { namespace execution_tree { namespace primitives
     template <typename Op, typename Derived>
     hpx::future<primitive_argument_type> cumulative<Op, Derived>::eval(
         primitive_arguments_type const& operands,
-        primitive_arguments_type&& args, eval_context ctx) const
+        primitive_arguments_type const& args, eval_context ctx) const
     {
         if (operands.empty() || operands.size() > 3)
         {
@@ -477,8 +477,9 @@ namespace phylanx { namespace execution_tree { namespace primitives
                     this_->generate_error_message(
                         "target operand has unsupported type"));
             }),
-            detail::map_operands(operands, functional::value_operand{},
-                std::move(args), name_, codename_, std::move(ctx)));
+            detail::map_operands(
+                operands, functional::value_operand{}, args,
+                name_, codename_, std::move(ctx)));
     }
 }}}
 

phylanx/plugins/arithmetics/generic_operation.hpp

@@ -31,7 +31,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
         template <typename T>
         using arg_type = ir::node_data<T>;

phylanx/plugins/arithmetics/generic_operation_bool.hpp

@@ -30,7 +30,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
         template <typename T>
         using arg_type = ir::node_data<T>;

phylanx/plugins/arithmetics/numeric.hpp

@@ -41,7 +41,8 @@ namespace phylanx { namespace execution_tree { namespace primitives
     protected:
         hpx::future<primitive_argument_type> eval(
             primitive_arguments_type const& operands,
-            primitive_arguments_type&& args, eval_context ctx) const override;
+            primitive_arguments_type const& args,
+            eval_context ctx) const override;
 
         template <typename T>
         using arg_type = ir::node_data<T>;