implement set logic

Author: voschezang

src/mash/shell/ast/infix.py

@@ -107,9 +107,9 @@ def run(self, prev_result='', shell: BaseShell = None, lazy=False):
         line = ' '.join(quote_items([a, op, b]))
 
         if op in literals.comparators:
-            if not lazy:
-                return Math.eval(line, shell.env)
-            return a, op, b
+            if lazy:
+                return a, op, b
+            return Math.eval(line, shell.env)
 
         if op in '+-*/':
             # math

src/mash/shell/ast/set_definition.py

@@ -6,6 +6,8 @@
 from mash.shell.ast.term import Term
 from mash.shell.base import BaseShell
 from mash.shell.cmd2 import Mode
+from mash.shell.internals.helpers import enter_new_scope
+from mash.shell.function import InlineFunction
 
 
 class SetDefinition(Node):
@@ -33,6 +35,11 @@ def run(self, prev_result='', shell: BaseShell = None, lazy=False):
         for item in self.items.values:
             key = shell.run_commands(item, '', lazy)[0]
             key = str(item)
+
+            if key.startswith('$'):
+                # SMELL
+                key = key[1:]
+
             with shell.use_mode(Mode.COMPILE):
                 results = shell.run_commands(item, '', not lazy)
 
@@ -81,14 +88,18 @@ def apply(self, data: dict, shell: BaseShell = None):
             yield from (merge(row) for row in product(*columns))
             return
 
-        if 1:
-            # TODO remove
-            yield from product(*data)
-            return
-        for element in product(*data):
-            result = shell.run_commands(self.condition, element)
+        for element in product(*columns):
+            with enter_new_scope(shell):
+                for item in element:
+                    # shell.env.update(item)
+                    for k, v in item.items():
+                        f = InlineFunction(v, [], f'do_{k}' )
+                        shell.env[k] = f
+
+                result = shell.run_commands(self.condition, '', run=True)
+
             if result:
-                yield element
+                yield merge(element)
 
     def __repr__(self):
         if self.condition:

test/shell/test_parse.py

@@ -637,18 +637,4 @@ def test_parse_set_with_filter():
     assert isinstance(result, Map)
     assert isinstance(result.lhs, SetDefinition)
     assert isinstance(result.rhs, Terms)
-    assert isinstance(result.rhs.values[0], NestedVariable)
-
-
-def test_parse_set_with_nested_filter():
-    result = parse_line(r'{groups.members}')
-    assert isinstance(result, SetDefinition)
-    assert result.values[0] == 'groups.members'
-
-    result = parse_line('{ users | users.id == {groups.members}}')
-    assert repr(result) == 'SetDefinition( users | users.id == groups.members )'
-    assert isinstance(result, SetDefinition)
-    assert isinstance(result.condition, BinaryExpression)
-    assert result.condition.op == '=='
-    assert isinstance(result.condition.lhs, Terms)
-    assert isinstance(result.condition.rhs, SetDefinition)
+    assert isinstance(result.rhs.values[0], NestedVariable)

test/shell/test_shell.py

@@ -338,3 +338,40 @@ def test_shell_scope():
     if 0:
         with raises(NotImplementedError):
             run_command('( 1 )')
+
+def test_set_definition():
+    shell = Shell()
+    shell.ignore_invalid_syntax = False
+
+    run_command('a <- range 3', shell=shell)
+    run_command('b <- range 3', shell=shell)
+    run_command('c <- { $a }', shell=shell)
+    assert shell.env['c'] == [{'a': '0'}, {'a': '1'}, {'a': '2'}]
+
+    # TODO
+    # run_command('c <- { a b }', shell=shell)
+    # run_command('c <- { a b | a == b }', shell=shell)
+
+def test_set_notation():
+    shell = Shell()
+    shell.ignore_invalid_syntax = False
+
+    run_command('x <- range 5', shell=shell)
+    run_command('y <- { $x }', shell=shell)
+    assert len(shell.env['y']) == 5
+    assert shell.env['y'][0] == {'x': '0'}
+    assert shell.env['y'][4] == {'x': '4'}
+    
+def test_set_with_condition():
+    shell = Shell()
+    shell.ignore_invalid_syntax = False
+
+    run_command('x <- range 5', shell=shell)
+    run_command('y <- { $x | x > 2 }', shell=shell)
+    assert len(shell.env['y']) == 2
+    assert shell.env['y'][0] == {'x': '3'}
+
+    if 0:
+        result = catch_output('{ users | users.id == {groups.members}}')
+        result = catch_output('{ users groups | x.id == y.id }')
+        result = catch_output('{ users groups } >>= $.users.id')

test/shell/test_shell_rest_client.py

@@ -132,7 +132,8 @@ def test_rest_client_filter_set():
         shell, _ = init()
         shell = shell.shell
 
-        result = catch_output('{users | .id < 1002} >>= get id', shell=shell)
+        # TODO
+        # result = catch_output('{users | .id < 1002} >>= get id', shell=shell)
         # TODO add assertions
         # assert '1000' in result
         # assert '1001' in result

test/shell/test_shell_variables.py

@@ -265,16 +265,3 @@ def test_variable_assignment_with_if_then():
 
     run_command('a <- if "" then echo 10', shell=shell)
     assert shell.env['a'] == ''
-
-def test_set_definition():
-    shell = Shell()
-    shell.ignore_invalid_syntax = False
-
-    run_command('a <- range 3', shell=shell)
-    run_command('b <- range 3', shell=shell)
-    run_command('c <- { $a }', shell=shell)
-    assert shell.env['c'] == [{'$a': '0'}, {'$a': '1'}, {'$a': '2'}]
-
-    # TODO
-    run_command('c <- { a b }', shell=shell)
-    run_command('c <- { a b | a == b }', shell=shell)