Minor improvements: "Constant" is now the pivot point to convert anything to lambda-friendly. It has a new alias make_lambda_friendly.

 * Fixed #2 that was a bug happening when using lambda-friendly methods with non-lambda arguments
 * This actually required to refactor a bit the methods: a few methods in base.py are now classmethods of _LambdaExpressionBase. This also required the code generation mechanism to generate a new file 'generated2.py' because the generated methods were now dependent upon main.py

Author: smarie

code_generation/goodies_template.mako

@@ -1,8 +1,7 @@
 # ----
 # This file is generated by mini_lambda_methods_generation.py - do not modify it !
 # ----
-from mini_lambda.base import make_lambda_friendly_method
-from mini_lambda.main import C, make_lambda_friendly_class
+from mini_lambda.main import C, make_lambda_friendly_class, make_lambda_friendly_method
 
 % for o in import_lines:
 ${o}
@@ -12,7 +11,9 @@ ${o}
     % if o.constant_name:
 ${o.item_name} = C(${o.constant_name}, '${o.constant_name}')
     % elif o.function_name:
+        % if o.function_name != 'Format':
 ${o.item_name} = make_lambda_friendly_method(${o.function_name}, '${o.function_name}')
+        % endif
     % else:
 ## CLASS
 ${o.item_name} = make_lambda_friendly_class(${o.class_name})

code_generation/mini_lambda_methods_generation.py

@@ -128,6 +128,8 @@ def generate_code():
     # generate
     generate_from_template('mini_lambda_template.mako', 'generated.py',
                            dict(to_override=to_override, to_override_with_exception=to_override_with_exception))
+    generate_from_template('mini_lambda_template_2.mako', 'generated2.py',
+                           dict(to_override=to_override, to_override_with_exception=to_override_with_exception))
 
     # (2) to-do list for the second template
     import_lines, to_create = define_goodies()

code_generation/mini_lambda_template.mako

@@ -4,11 +4,10 @@
 from typing import Any
 
 from mini_lambda.base import _LambdaExpressionBase, evaluate, get_repr, FunctionDefinitionError, \
-    _get_expr_or_result_for_method, _get_root_var
+    _get_root_var
 from mini_lambda.base import _PRECEDENCE_ADD_SUB, _PRECEDENCE_MUL_DIV_ETC, _PRECEDENCE_COMPARISON, \
     _PRECEDENCE_EXPONENTIATION, _PRECEDENCE_SHIFTS, _PRECEDENCE_POS_NEG_BITWISE_NOT, \
     _PRECEDENCE_SUBSCRIPTION_SLICING_CALL_ATTRREF
-from sys import getsizeof
 
 
 class _LambdaExpressionGenerated(_LambdaExpressionBase):
@@ -158,19 +157,3 @@ class _LambdaExpressionGenerated(_LambdaExpressionBase):
                                       'details.')
 
     % endfor
-
-# ******* All replacement methods for the magic methods throwing exceptions ********
-% for o in to_override_with_exception:
-    % if o.unbound_method:
-def ${o.module_method_name}(*args, **kwargs):
-    """ This is a replacement method for _LambdaExpression '${o.method_name}' magic method """
-    ## return evaluator.add_unbound_method_to_stack(${o.unbound_method.__name__})
-    return _get_expr_or_result_for_method(${o.unbound_method.__name__}, *args, **kwargs)
-    % else:
-def ${o.module_method_name}(expr: _LambdaExpressionGenerated, *args, **kwargs):
-    """ This is a replacement method for _LambdaExpression '${o.method_name}' magic method """
-    return expr.add_bound_method_to_stack('${o.method_name}', *args, **kwargs)
-    % endif
-
-
-% endfor

code_generation/mini_lambda_template_2.mako

@@ -0,0 +1,25 @@
+# ----
+# This file is generated by mini_lambda_methods_generation.py - do not modify it !
+# ----
+from mini_lambda.main import _LambdaExpression
+from sys import getsizeof
+
+
+# ******* All replacement methods for the magic methods throwing exceptions ********
+% for o in to_override_with_exception:
+    % if o.module_method_name == 'Format':
+    ## skip this one
+
+    % elif o.unbound_method:
+def ${o.module_method_name}(*args, **kwargs):
+    """ This is a replacement method for _LambdaExpression '${o.method_name}' magic method """
+    ## return evaluator.add_unbound_method_to_stack(${o.unbound_method.__name__})
+    return _LambdaExpression._get_expression_for_method_with_args(${o.unbound_method.__name__}, *args, **kwargs)
+    % else:
+def ${o.module_method_name}(expr: _LambdaExpression, *args, **kwargs):
+    """ This is a replacement method for _LambdaExpression '${o.method_name}' magic method """
+    return expr.add_bound_method_to_stack('${o.method_name}', *args, **kwargs)
+    % endif
+
+
+% endfor

docs/changelog.md

@@ -1,3 +1,8 @@
+### 1.2.0 - New alias and bugfix for constant functions 
+
+ * added alias `make_lambda_friendly` for `Constant`, since it is able to convert anything (constants, functions and classes) to lambda-friendly objects usable in expressions.
+ * Fixed [#2](https://github.com/smarie/python-mini-lambda/issues/2) that was a bug happening when using lambda-friendly methods with non-lambda arguments
+
 ### 1.1.0 - Compatibility with standard functions
 
  * It is now possible to use any function in a lambda expression, through use of the `make_lambda_friendly_...` methods (see [documentation](./usage#supporting-any-other-methods-and-classes))

docs/usage.md

@@ -236,7 +236,7 @@ from math import e
 str(_(x + e))  # 'x + 2.718281828459045'
 ``` 
 
-For this reason `mini_lambda` provides a `Constant()` method with alias `C()` to define a constant and assign it with a symbol.
+For this reason `mini_lambda` provides a `Constant()` method with aliases `C()` and `make_lambda_friendly()` to define a constant and assign it with a symbol.
 
 ```python
 from mini_lambda import x, _, C
@@ -357,7 +357,7 @@ str(expr)               # 'DataFrame(X).max().values[0]'
 
 ### Anything
 
-Actually the `Constant()` (alias `C()`) function that we saw above to convert constants, is also able to convert methods ans classes. So if there is only a single conversion operator to remember, remember this one.
+Actually the `Constant()` (alias `C()` or `make_lambda_friendly()`) function that we saw above to convert constants, is also able to convert methods ans classes. So if there is only a single conversion operator to remember, remember this one.
 
 ```python
 from mini_lambda import _, C, X

mini_lambda/__init__.py

@@ -5,8 +5,9 @@
 from mini_lambda.goodies_generated import *
 from mini_lambda.main import *
 from mini_lambda.main import _
+from mini_lambda.generated2 import *
 from mini_lambda.goodies import *
 
 # allow users to do
 #     import mini_lambda as v
-__all__ = ['base', 'generated', 'goodies_generated', 'main', 'goodies']
+__all__ = ['base', 'generated', 'goodies_generated', 'main', 'generated2', 'goodies']