Improve the virtual python repl

beryllium-org · Sep 11, 2024 · 2d7d60e · 2d7d60e
1 parent b7a9911
commit 2d7d60e
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/base/Beryllium/bin/python.py b/base/Beryllium/bin/python.py
@@ -19,11 +19,11 @@
 dmtex("Staring Python shell")
 term.write(
     "CircuitPython "
-    + be.based.system_vars["IMPLEMENTATION"]
+    + be.based.system_vars["IMPLEMENTATION_RAW"]
     + " on Beryllium "
     + be.based.system_vars["VERSION"]
     + "\n"
-    + "Board: "
+    + "Board ID: "
     + be.based.system_vars["BOARD"]
     + "\n"
     + 'Type "help", "copyright", "credits" or "license" for more information.'
@@ -45,14 +45,19 @@
     elif term.buf[0] == 3:
         try:
             if term.focus is 0 and term.buf[1].endswith("."):
-                exec(
-                    'vr("ljdirtest", dir({}))'.format(
-                        term.buf[1][: term.buf[1].rfind(".")]
+                vr("dirtest", None)
+                exec('vr("dirtest", dir(term.buf[1][: term.buf[1].rfind(".")]))')
+                if not vr("dirtest"):
+                    exec(
+                        'vr("dirtest", dir(term.buf[1][term.buf[1].find(" "): term.buf[1].rfind(".")]))'
                     )
-                )
-                if len(vr("ljdirtest")):
+                if not vr("dirtest"):
+                    exec(
+                        'vr("dirtest", dir(term.buf[1][term.buf[1].find(";"): term.buf[1].rfind(".")]))'
+                    )
+                if vr("dirtest"):
                     term.write()
-                    for pv[get_pid()]["i"] in vr("ljdirtest"):
+                    for pv[get_pid()]["i"] in vr("dirtest"):
                         if not vr("i").startswith("_"):
                             term.nwrite(vr("i") + "    ")
                     term.write()
@@ -176,6 +181,7 @@
     elif term.buf[0] == 2:
         term.write("\nKeyboardInterrupt")
         term.buf[1] = ""
+        term.trigger_dict["prefix"] = ">>> "
         pv[get_pid()]["mass"].clear()
         term.focus = 0
     elif term.buf[0] == 4: