Move some functions to standard library

smnp/module/__init__.py

@@ -1,4 +1,4 @@
 from smnp.module import system, mic, note, iterable, sound, synth, string, util
 
 functions = [ *system.functions, *mic.functions, *note.functions, *iterable.functions, *sound.functions, *synth.functions, *string.functions, *util.functions ]
-methods = [ *system.methods, *mic.methods, *note.methods, *iterable.methods, *sound.methods, *synth.methods, *string.functions, *util.methods ]
+methods = [ *system.methods, *mic.methods, *note.methods, *iterable.methods, *sound.methods, *synth.methods, *string.methods, *util.methods ]

smnp/module/note/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.note.function import tuplet, transpose, semitones, octave, duration, interval
+from smnp.module.note.function import transpose, semitones, interval, note
 
-functions = [ semitones.function, interval.function, transpose.function, tuplet.function ]
+functions = [ semitones.function, interval.function, transpose.function, note.function ]
-methods = [ duration.function, octave.function ]
+methods = []

smnp/module/note/function/duration.py

@@ -1,11 +0,0 @@
-from smnp.function.model import Function
-from smnp.function.signature import signature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.type import ofType
-
-_signature = signature(ofType(Type.NOTE), ofType(Type.INTEGER))
-def _function(env, note, duration):
-    return Type.note(note.value.withDuration(duration.value))
-
-
-function = Function(_signature, _function, 'withDuration')

smnp/module/note/function/note.py

@@ -0,0 +1,11 @@
+from smnp.function.model import 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
+
+_signature = signature(ofType(Type.STRING), ofType(Type.INTEGER), ofType(Type.INTEGER), ofType(Type.BOOL))
+def _function(env, note, octave, duration, dot):
+    return Type.note(Note(note.value, octave.value, duration.value, dot.value))
+
+function = Function(_signature, _function, 'Note')

smnp/module/note/function/octave.py

@@ -1,11 +0,0 @@
-from smnp.function.model import Function
-from smnp.function.signature import signature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.type import ofType
-
-_signature = signature(ofType(Type.NOTE), ofType(Type.INTEGER))
-def _function(env, note, octave):
-    return Type.note(note.value.withOctave(octave.value))
-
-
-function = Function(_signature, _function, 'withOctave')

smnp/module/note/function/tuplet.py

@@ -1,23 +0,0 @@
-from smnp.function.model import CombinedFunction, Function
-from smnp.function.signature import signature, varargSignature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listOf
-from smnp.type.signature.matcher.type import ofTypes
-
-_signature1 = varargSignature(ofTypes(Type.NOTE), ofTypes(Type.INTEGER), ofTypes(Type.INTEGER))
-def _function1(env, n, m, vararg):
-    t = [Type.note(arg.value.withDuration(int(arg.value.duration * n.value / m.value))) for arg in vararg]
-    return Type.list(t).decompose()
-
-
-
-_signature2 = signature(ofTypes(Type.INTEGER), ofTypes(Type.INTEGER), listOf(Type.NOTE))
-def _function2(env, n, m, notes):
-    return _function1(env, n, m, notes.value)
-
-
-function = CombinedFunction(
-    'tuplet',
-    Function(_signature1, _function1),
-    Function(_signature2, _function2)
-)

smnp/module/string/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.string.function import concat
+from smnp.module.string.function import concat, stringify
 
 functions = [ concat.function ]
-methods = []
+methods = [ stringify.function ]

smnp/module/string/function/stringify.py

@@ -0,0 +1,10 @@
+from smnp.function.model import Function
+from smnp.function.signature import signature
+from smnp.type.model import Type
+from smnp.type.signature.matcher.type import allTypes
+
+_signature = signature(allTypes())
+def _function(env, object):
+    return Type.string(object.stringify())
+
+function = Function(_signature, _function, 'toString')

smnp/module/system/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.system.function import sleep, display, debug, exit, type
+from smnp.module.system.function import sleep, display, displayln, debug, exit, type
 
-functions = [ debug.function, display.function, exit.function, sleep.function, type.function ]
+functions = [ debug.function, display.function, displayln.function, exit.function, sleep.function, type.function ]
 methods = []

smnp/module/system/function/display.py

@@ -4,7 +4,7 @@ from smnp.type.signature.matcher.type import allTypes
 
 _signature = varargSignature(allTypes())
 def _function(env, vararg):
-    print("".join([arg.stringify() for arg in vararg]))
+    print("".join([arg.stringify() for arg in vararg]), end="")
 
 
 function = Function(_signature, _function, 'print')

smnp/module/system/function/displayln.py

@@ -0,0 +1,10 @@
+from smnp.function.model import Function
+from smnp.function.signature import varargSignature
+from smnp.type.signature.matcher.type import allTypes
+
+_signature = varargSignature(allTypes())
+def _function(env, vararg):
+    print("".join([arg.stringify() for arg in vararg]))
+
+
+function = Function(_signature, _function, 'println')

smnp/module/util/function/rand.py

@@ -1,29 +1,12 @@
-import random as r
+import random
 
-from smnp.error.function import IllegalArgumentException
+from smnp.function.model import Function
-from smnp.function.model import Function, CombinedFunction
+from smnp.function.signature import signature
-from smnp.function.signature import varargSignature
 from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listMatches
+from smnp.type.signature.matcher.type import ofType
-from smnp.type.signature.matcher.type import ofTypes
 
+_signature = signature(ofType(Type.INTEGER), ofType(Type.INTEGER))
+def _function(env, min, max):
+    return Type.integer(random.randint(min.value, max.value))
 
-def forType(t):
+function = Function(_signature, _function, 'rand')
-    _signature = varargSignature(listMatches(ofTypes(Type.PERCENT), ofTypes(t)))
-    def _function(env, vararg):
-        choice = r.random()
-        acc = 0
-        if sum(arg.value[0].value for arg in vararg) != 1.0:
-            raise IllegalArgumentException("Sum of all percentage values must be equal 100%")
-        for arg in vararg:
-            percent, item = arg.value
-            acc += percent.value
-            if choice <= acc:
-                return item
-
-    return Function(_signature, _function)
-
-
-function = CombinedFunction('random', *[ forType(t) for t in Type if t != Type.VOID ])
-
-#TODO: sample

smnp/note/pitch.py

@@ -41,10 +41,14 @@ class NotePitch(Enum):
 
     @staticmethod
     def toPitch(string):
-        try:            
+        if string.lower() in stringToPitch:
             return stringToPitch[string.lower()]
-        except KeyError as e:
+
-            raise NoteException(f"Note '{string}' does not exist")
+        if string.upper() in NotePitch:
+            return NotePitch[string.upper()]
+
+        raise NoteException(f"Note '{string}' does not exist")
+
 
 stringToPitch = {
     'cb': NotePitch.H,

smnp/runtime/evaluators/relation.py

@@ -21,11 +21,11 @@ class RelationEvaluator(Evaluator):
 
     @classmethod
     def equalOperatorEvaluator(cls, left, operator, right):
-        return Type.bool(left.value == right.value)
+        return Type.bool(left.type == right.type and left.value == right.value)
 
     @classmethod
     def notEqualOperatorEvaluator(cls, left, operator, right):
-        return Type.bool(left.value != right.value)
+        return Type.bool(left.type != right.type or left.value != right.value)
 
     @classmethod
     def otherRelationOperatorsEvaluator(cls, left, operator, right):

smnp/type/model.py

@@ -51,7 +51,7 @@ class Type(Enum):
             "pitch": Type.string(str(value.note)),
             "octave": Type.integer(value.octave),
             "duration": Type.integer(value.duration),
-            "dot": Type.string('.' if value.dot else '')
+            "dot": Type.bool(value.dot)
         })
 
     @staticmethod