eval? now does "and" and "or"...

By stripping off the "and" or "or"

Author: rocky

test/unit/test-lib-eval.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-'Unit test for trepan.lib.eval'
+"Unit test for trepan.lib.eval"
 import unittest
 
 from trepan.lib import eval as Meval
@@ -8,18 +8,23 @@
 class TestExtractExpression(unittest.TestCase):
     def test_extract_expression(self):
         for fragment, expect in (
-            ('if condition(x):',     'condition(x)'),
-            ('elif is_magic(name):', 'is_magic(name)'),
-            ('while expression:',    'expression'),
-            ('for i in range(3):',   'range(3)'),
-            ('abc = 123',            '123'),
-            ('assert True',          'True'),
-            ('return return_value',  'return_value'),
-            ('nothing_to_be.done',   'nothing_to_be.done'), ):
-            self.assertEqual(expect , Meval.extract_expression(fragment))
+            ("if condition(x):", "condition(x)"),
+            ("elif is_magic(name):", "is_magic(name)"),
+            ("while expression:", "expression"),
+            ("for i in range(3):", "range(3)"),
+            ("and x > 3", "x > 3"),
+            ("or y < 3", "y < 3"),
+            ("abc = 123", "123"),
+            ("assert True", "True"),
+            ("return return_value", "return_value"),
+            ("nothing_to_be.done", "nothing_to_be.done"),
+        ):
+            self.assertEqual(expect, Meval.extract_expression(fragment))
             pass
         pass
+
     pass
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()

trepan/lib/eval.py

@@ -13,47 +13,56 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-'''Things related to eval/exec'''
+"""Things related to eval/exec"""
 
 # extract the "expression" part of a line of source code.
 #
 import re
 
 
 def extract_expression(text):
-    if re.search('^\s*(?:if|elif)\s+', text):
-        text = re.sub('^\s*(?:if|elif)\s+', '', text)
-        text = re.sub(':(?:\s+.*$|$)', '', text)
-    elif re.search('^\s*assert\s+.*', text):
+    if re.search("^\s*(?:if|elif)\s+", text):
+        text = re.sub("^\s*(?:if|elif)\s+", "", text)
+        text = re.sub(":(?:\s+.*$|$)", "", text)
+    elif re.search("^\s*assert\s+.*", text):
         # EXPR in : assert EXPRESSION:
-        text = re.sub('^\s*assert\s+', '', text)
-    elif re.search('^\s*(?:while)\s+', text):
-        text = re.sub('^\s*(?:while)\s+', '', text)
-        text = re.sub(':(?:\s+.*$|$)', '', text)
-    elif re.search('^\s*return\s+', text):
+        text = re.sub("^\s*assert\s+", "", text)
+    elif re.search("^\s*(?:while)\s+", text):
+        text = re.sub("^\s*(?:while)\s+", "", text)
+        text = re.sub(":(?:\s+.*$|$)", "", text)
+    elif re.search("^\s*return\s+", text):
         # EXPRESION in: return EXPRESSION
-        text = re.sub('^\s*return\s+', '', text)
-    elif re.search('^\s*for\s+.+\s+in\s+.*:', text):
+        text = re.sub("^\s*return\s+", "", text)
+    elif re.search("^\s*for\s+.+\s+in\s+.*:", text):
         # EXPRESION in: for VAR in EXPRESSION:
-        text = re.sub('^\s*for\s+.+\s+in\s+', '', text)
-        text = re.sub(':.*$', '', text)
-    elif re.search('\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=[^=>]', text):
+        text = re.sub("^\s*for\s+.+\s+in\s+", "", text)
+        text = re.sub(":.*$", "", text)
+    elif re.search("^\s*and\s+.*", text):
+        # EXPRESION in: and EXPRESSION
+        text = re.sub("^\s*and\s+", "", text)
+    elif re.search("^\s*or\s+.*", text):
+        # EXPRESION in: and EXPRESSION
+        text = re.sub("^\s*or\s+", "", text)
+    elif re.search("\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=[^=>]", text):
         # RHS of an assignment statement.
-        text = re.sub('^\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=\s*', '', text)
+        text = re.sub("^\s*[A-Za-z_][A-Za-z0-9_\[\]]*\s*=\s*", "", text)
         pass
     return text
 
 
 # Demo it
-if __name__=='__main__':
+if __name__ == "__main__":
     for stmt in (
-        'if condition(x):',
-        'elif _is_magic(name):',
-        'while expression:',
-        'for i in range(3):',
-        'abc = 123',
-        'return return_value',
-        'nothing_to_be.done'):
+        "if condition(x):",
+        "elif _is_magic(name):",
+        "while expression:",
+        "for i in range(3):",
+        "and x > 3",
+        "or y < 3",
+        "abc = 123",
+        "return return_value",
+        "nothing_to_be.done",
+    ):
         print(extract_expression(stmt))
         pass
     pass

trepan/processor/command/eval.py

@@ -22,36 +22,37 @@
 class EvalCommand(DebuggerCommand):
     """**eval** *python-statement*
 
-Run *python-statement* in the context of the current frame.
+    Run *python-statement* in the context of the current frame.
 
-If no string is given, we run the string from the current source code
-about to be run. If the command ends `?` (via an alias) and no string is
-given, the following translations occur:
+    If no string is given, we run the string from the current source code
+    about to be run. If the command ends `?` (via an alias) and no string is
+    given, the following translations occur:
 
-   assert = <expr>       => <expr>
-   {if|elif} <expr> :    => <expr>
-   while <expr> :        => <expr>
-   return <expr>         => <expr>
-   for <var> in <expr> : => <expr>
-   <var> = <expr>        => <expr>
+       assert = <expr>       => <expr>
+       {if|elif} <expr> :    => <expr>
+       while <expr> :        => <expr>
+       return <expr>         => <expr>
+       for <var> in <expr> : => <expr>
+       and <expr>            => <expr>
+       or <expr>             => <expr>
+       <var> = <expr>        => <expr>
 
-The above is done via regular expression matching. No fancy parsing is
-done, say, to look to see if *expr* is split across a line or whether
-var an assignment might have multiple variables on the left-hand side.
+    The above is done via regular expression matching. No fancy parsing is
+    done, say, to look to see if *expr* is split across a line or whether
+    var an assignment might have multiple variables on the left-hand side.
 
-Examples:
----------
+    Examples:
+    ---------
 
-    eval 1+2  # 3
-    eval      # Run current source-code line
-    eval?     # but strips off leading 'if', 'while', ..
-              # from command
+        eval 1+2  # 3
+        eval      # Run current source-code line
+        eval?     # but strips off leading 'if', 'while', ..
+                  # from command
 
-See also:
----------
+    See also:
+    ---------
 
-`deval`, `set autoeval`, `pr`, `pp` and `examine`.
-"""
+    `deval`, `set autoeval`, `pr`, `pp` and `examine`."""
 
     aliases = ("eval?", "?")
     short_help = "Print value of expression EXP"