Add support for lambdas and "sortedBy"

pyecoreocl/compiler.py

@@ -107,7 +107,12 @@ def visitArgumentsExp(self, ctx):
                 self.inline(", ")
 
     def visitLambdaExp(self, ctx):
-        return self.visitChildren(ctx)
+        # return self.visitChildren(ctx)
+        variables = [arg.text for arg in ctx.varnames]
+        varnames = ", ".join(variables)
+        self.inline(f"(lambda {varnames}: ")
+        self.visit(ctx.oclExp())
+        self.inline(")")
 
     def visitNestedExp(self, ctx):
         self.inline("(")
@@ -496,6 +501,15 @@ def rule_any(emitter, ctx):
     emitter.inline("), None)")
 
 
+@call_rule
+def rule_sorted_by(emitter, ctx):
+    emitter.inline("sorted(")
+    emitter.visit(ctx.expression)
+    emitter.inline(", key=")
+    emitter.visit(ctx.argExp())
+    emitter.inline(")")
+
+
 def default_collection_call(emitter, ctx):
     operation = ctx.attname.text
     emitter.visit(ctx.expression)

tests/test_collection_lib.py

@@ -68,4 +68,9 @@ def test__one():
     l = [3, 4, 5]
     assert !l->one(e | e = 3)! is True
 
-    assert !Bag{3, 4, 5}->collect(e | e + 1)->one(e | e = 3)! is False
+    assert !Bag{3, 4, 5}->collect(e | e + 1)->one(e | e = 3)! is False
+
+
+def test__sorted_by():
+    l = [3, 4, 5]
+    assert !l->sortedBy(e | -e)! == [5, 4, 3]