diff options
| author | Ian Johnson <ian.johnson@appliedlanguage.com> | 2012-10-15 18:41:44 +0400 |
|---|---|---|
| committer | Ian Johnson <ian.johnson@appliedlanguage.com> | 2012-10-15 18:41:44 +0400 |
| commit | 8ef9aeecabcfe944eb492623c6cbf8b93751bcad (patch) | |
| tree | e7e2972451d1bbd892d3ed51cbf0a2284442f667 | |
| parent | 2eadc2754c7c6eb2d4ba2b2abc0aa2b0a2516933 (diff) | |
| parent | b9ebbb9455332ee5c5b024a3c9378081c62225d2 (diff) | |
Merge branch 'master' of github.com:ianj-als/pypeline
Conflicts:
src/pypeline/helpers/helpers.py
| -rw-r--r-- | src/pypeline/core/arrows/function_arrow.py | 2 | ||||
| -rw-r--r-- | src/pypeline/helpers/helpers.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pypeline/core/arrows/function_arrow.py b/src/pypeline/core/arrows/function_arrow.py index 17e282d..15b880e 100644 --- a/src/pypeline/core/arrows/function_arrow.py +++ b/src/pypeline/core/arrows/function_arrow.py @@ -29,7 +29,7 @@ from pypeline.core.arrows.arrow import Arrow # input (&&&) is the bitwise and operator (&). # WATCH OUT FOR OPERATOR PRECEDENCE!!! # -# ** is higher than >> is higher than than & +# ** is higher than >> is higher than & # # # See: diff --git a/src/pypeline/helpers/helpers.py b/src/pypeline/helpers/helpers.py index d00f575..a8c1359 100644 --- a/src/pypeline/helpers/helpers.py +++ b/src/pypeline/helpers/helpers.py @@ -111,7 +111,7 @@ def cons_function_component(function, input_forming_function = None, output_forming_function = None, state_mutator = None): - """Construct a component based on a function. Any input or output forming functions shall be called if provided. A Kleisli arrow is returned.""" + """Construct a pipeline component whose computation will be achieved using a function. Optional input and output forming functions pre- and post-process the input and output values to and from the function. An optional state mutator function can be provided to alter the state object passed into one of the pipeline run/evaluating/executing functions. A Kleisli arrow is returned.""" if type(function) is not types.FunctionType and \ type(function) is not types.MethodType: raise ValueError("Must be a function or method") |