dekshell 0.1.95__tar.gz → 0.1.97__tar.gz

{dekshell-0.1.95 → dekshell-0.1.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.1.95
+Version: 0.1.97
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/contexts/properties.py

@@ -20,6 +20,7 @@ def make_shell_properties(shell):
             'rf': f'{shell} rf',
             'rfc': f'{shell} rfc',
             'rs': f'{shell} rs',
+            'ext': '.pysh',
         },
     }
 

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/markers/__init__.py

@@ -14,6 +14,7 @@ from .echo import *
 from .pip_ import *
 from .shell import *
 from .redirect import *
+from .input import *
 from .timout import *
 from .empty import *
 
@@ -23,14 +24,16 @@ def generate_markers(*args, **kwargs):
         *args,
         *get_markers_from_modules(**kwargs),
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
+        InputMarker,
         DelVarMarker,
         ExecLinesUpdateMarker, ExecLinesMarker, ExecMarker, ExecCmdcallLinesMarker, ExecCmdcallMarker,
         EnvShellMarker, EnvMarker,
         IfMarker, IfElifMarker, IfElseMarker,
-        WhileMarker,
+        WhileMarker, WhileElseMarker,
         ForMarker, ForElseMarker,
         DefineMarker,
         GotoMarker, InvokeMarker,
+        RaiseMarker,
         FunctionMarker, CallMarker, ReturnMarker, EnvGlobalMarker, EnvNonlocalMarker,
         VarGlobalMarker, VarNonlocalMarker,
         EndMarker, BreakMarker, ContinueMarker,

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/markers/base/__init__.py

@@ -90,6 +90,9 @@ class MarkerBase:
     def ret(self, value):
         raise QuitContextException(value)
 
+    def raise_(self, message):
+        raise RaiseException(message)
+
     def set_var(self, context, array, index, value):
         self.set_var_raw(context, self.get_item(array, index, self.var_name_anonymous), value)
 
@@ -291,7 +294,7 @@ class TransformerMarker(MarkerBase):
 
     def transform(self, parent):
         for target in self.targets:
-            if target.is_type(*parent.final_branch_set):
+            if isinstance(target, tuple(parent.final_branch_set)):
                 return target
         return self.targets[0]
 
@@ -302,13 +305,13 @@ class TransformerMarker(MarkerBase):
         records_target = set()
         for i, marker in enumerate(markers):
             match = marker.get_tag_match()
-            if marker in records_markers:
+            if match in records_markers:
                 records_markers[match].append(marker)
             else:
-                records_markers[match] = []
+                records_markers[match] = [marker]
             if len(records_markers[match]) > 1:
                 records_target.add(match)
-            if marker not in records_index:
+            if match not in records_index:
                 records_index[match] = i
         offset = 0
         for match in sorted(records_target, key=lambda x: records_index[x]):
@@ -321,11 +324,14 @@ class TransformerMarker(MarkerBase):
 class MarkerWithEnd(MarkerBase):
     tag_tail = EndMarker
 
-    def get_inner_content(self, context, marker_node):
+    def get_inner_content(self, context, marker_node, sep='\n', translate=None):
         commands = []
         marker_node.walk(lambda node, depth: commands.extend([] if depth == 0 else [node.command]))
-        text = '\n'.join(commands)
-        return self.translate(context, text)
+        text = sep.join(commands)
+        if translate is None:
+            return self.translate(context, text)
+        else:
+            return self._translate(context, text) if translate else text
 
     def eval_codes(self, context, code):
         if not code:
@@ -382,3 +388,7 @@ class ExitException(ExceptionShell):
 
 class QuitContextException(ExceptionShell):
     pass
+
+
+class RaiseException(ExceptionShell):
+    pass

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/markers/base/core.py

@@ -134,7 +134,7 @@ class MarkerNode:
         return obj2str(walk(self))
 
     def is_type(self, *markers_cls):
-        return isinstance(self.marker, tuple(markers_cls))
+        return isinstance(self.marker, markers_cls)
 
     def add_child(self, node):
         node.parent = self

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/markers/exec.py

@@ -16,7 +16,7 @@ class ExecLinesMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = '=='
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node)
+        code = self.get_inner_content(context, marker_node, translate=False)
         self.eval_lines(context, code)
         return []
 
@@ -25,7 +25,7 @@ class ExecLinesUpdateMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = '==='
 
     def execute(self, context, command, marker_node, marker_set):
-        code = self.get_inner_content(context, marker_node)
+        code = self.get_inner_content(context, marker_node, translate=False)
         context.update_variables(self.eval_lines(context, code))
         return []
 

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/markers/function.py

@@ -63,6 +63,14 @@ class ReturnMarker(MarkerNoTranslator):
         self.ret(self.eval_mixin(context, args[1]))
 
 
+class RaiseMarker(MarkerBase):
+    tag_head = "raise"
+
+    def execute(self, context, command, marker_node, marker_set):
+        args = self.split_raw(command, 1, self.tag_head)
+        self.raise_(args[1])
+
+
 class VarGlobalMarker(MarkerBase):
     tag_head = "global"
 

dekshell-0.1.97/dekshell/core/markers/input.py

@@ -0,0 +1,16 @@
+import subprocess
+from dektools.shell import shell_with_input
+from .base import MarkerWithEnd, MarkerNoTranslator
+
+
+class InputMarker(MarkerWithEnd, MarkerNoTranslator):
+    tag_head = 'input'
+
+    def execute(self, context, command, marker_node, marker_set):
+        command_text = self.get_inner_content(context, marker_node, sep='', translate=True).strip()
+        expression = self.split_raw(command, 1, self.tag_head)[1]
+        inputs = self.eval_mixin(context, expression)
+        rc = shell_with_input(command_text, inputs, env=context.environ_full())
+        if rc:
+            raise subprocess.CalledProcessError(rc, command_text)
+        return []

{dekshell-0.1.95 → dekshell-0.1.97}/dekshell/core/markers/while_.py

@@ -1,8 +1,13 @@
 from .base import MarkerWithEnd, BreakMarker, ContinueMarker, MarkerNoTranslator
 
 
+class WhileElseMarker(MarkerWithEnd):
+    tag_head = "else"
+
+
 class WhileMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = "while"
+    branch_set = {WhileElseMarker}
 
     def bubble_continue(self, context, marker_set, marker_node_self, marker_node_target):
         if marker_node_target.is_type(BreakMarker):
@@ -12,11 +17,13 @@ class WhileMarker(MarkerWithEnd, MarkerNoTranslator):
         return None
 
     def execute(self, context, command, marker_node, marker_set):
+        index_else = self.find_node(marker_node.children, True)
+
         result = self.get_condition_result(context, command)
         if result:
-            return [*marker_node.children, marker_set.node_cls(ContinueMarker(), None, None, marker_node)]
+            return [*marker_node.children[:index_else], marker_set.node_cls(ContinueMarker(), None, None, marker_node)]
         else:
-            return []
+            return marker_node.children[index_else:]
 
     def get_condition_result(self, context, command):
         expression = command.split(self.tag_head, 1)[-1].strip()

{dekshell-0.1.95 → dekshell-0.1.97}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dekshell"
-version = "0.1.95"
+version = "0.1.97"
 description = ""
 authors = [
     { name = "sanzenwin", email = "sanzenwin@gmail.com" },