From 17ef5be057256db6f76b30b3425aa05c30f36756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Mon, 15 Jul 2019 21:10:05 +0200 Subject: [PATCH] Remove unnecessary functions from module --- smnp/module/iterable/__init__.py | 4 +-- smnp/module/iterable/function/combine.py | 18 ------------ smnp/module/iterable/function/range.py | 36 ------------------------ smnp/module/string/__init__.py | 4 +-- smnp/module/string/function/concat.py | 11 -------- 5 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 smnp/module/iterable/function/combine.py delete mode 100644 smnp/module/iterable/function/range.py delete mode 100644 smnp/module/string/function/concat.py diff --git a/smnp/module/iterable/__init__.py b/smnp/module/iterable/__init__.py index d302af9..da210ea 100644 --- a/smnp/module/iterable/__init__.py +++ b/smnp/module/iterable/__init__.py @@ -1,4 +1,4 @@ -from smnp.module.iterable.function import combine, map, get +from smnp.module.iterable.function import map, get -functions = [ combine.function, map.function ] +functions = [ map.function ] methods = [ get.function ] \ No newline at end of file diff --git a/smnp/module/iterable/function/combine.py b/smnp/module/iterable/function/combine.py deleted file mode 100644 index e007909..0000000 --- a/smnp/module/iterable/function/combine.py +++ /dev/null @@ -1,18 +0,0 @@ -from functools import reduce - -from smnp.function.model import Function -from smnp.function.signature import varargSignature -from smnp.type.model import Type -from smnp.type.signature.matcher.type import ofTypes - -_signature = varargSignature(ofTypes(Type.LIST)) -def _function(env, vararg): - if len(vararg) == 1: - return vararg[0] - - combined = reduce(lambda x, y: x.value + y.value, vararg) - return Type.list(combined) - - -function = Function(_signature, _function, 'combine') - diff --git a/smnp/module/iterable/function/range.py b/smnp/module/iterable/function/range.py deleted file mode 100644 index 8f0198e..0000000 --- a/smnp/module/iterable/function/range.py +++ /dev/null @@ -1,36 +0,0 @@ -from smnp.function.model import CombinedFunction, Function -from smnp.function.signature import signature -from smnp.note.model import Note -from smnp.type.model import Type -from smnp.type.signature.matcher.type import ofType - -_signature1 = signature(ofType(Type.INTEGER)) -def _function1(env, upper): - return Type.list([ Type.integer(i) for i in range(upper.value + 1)]) - - -_signature2 = signature(ofType(Type.INTEGER), ofType(Type.INTEGER)) -def _function2(env, lower, upper): - return Type.list([ Type.integer(i) for i in range(lower.value, upper.value + 1)]) - - -_signature3 = signature(ofType(Type.INTEGER), ofType(Type.INTEGER), ofType(Type.INTEGER)) -def _function3(env, lower, upper, step): - return Type.list([ Type.integer(i) for i in range(lower.value, upper.value + 1, step.value)]) - - -_signature4 = signature(ofType(Type.NOTE), ofType(Type.NOTE)) -def _function4(env, lower, upper): - return Type.list([Type.note(n) for n in Note.range(lower.value, upper.value)]) - - -# TODO -# signature5 = range(note lower, note upper, integer step) OR step = "diatonic" | "chromatic" | "augmented" | "diminish" - -function = CombinedFunction( - 'range', - Function(_signature1, _function1), - Function(_signature2, _function2), - Function(_signature3, _function3), - Function(_signature4, _function4), -) diff --git a/smnp/module/string/__init__.py b/smnp/module/string/__init__.py index 3ba0e49..1910f8f 100644 --- a/smnp/module/string/__init__.py +++ b/smnp/module/string/__init__.py @@ -1,4 +1,4 @@ -from smnp.module.string.function import concat, stringify +from smnp.module.string.function import stringify -functions = [ concat.function ] +functions = [] methods = [ stringify.function ] \ No newline at end of file diff --git a/smnp/module/string/function/concat.py b/smnp/module/string/function/concat.py deleted file mode 100644 index e82b892..0000000 --- a/smnp/module/string/function/concat.py +++ /dev/null @@ -1,11 +0,0 @@ -from smnp.function.model import Function -from smnp.function.signature import varargSignature -from smnp.type.model import Type -from smnp.type.signature.matcher.type import ofType - -_signature = varargSignature(ofType(Type.STRING)) -def _function(env, vararg): - return Type.string("".join([ arg.value for arg in vararg ])) - - -function = Function(_signature, _function, 'concat') \ No newline at end of file