Merge pull request #10 from RetiredWizard/v1.10

V1.10

3.aut

@@ -0,0 +1,4 @@
+@echo off
+del autoexec.bat
+if exist autoexec.sav rename autoexec.sav autoexec.bat
+type menu.txt

3.bat

@@ -1,5 +1,11 @@
-@echo off
-cd /PyBasic
-PyBasic startrek.bas
-cd /
-menu.bat
+@echo off
+if not exist /runvm.py goto micropython
+if exist autoexec.bat copy autoexec.bat autoexec.sav
+copy/y 3.aut autoexec.bat
+runvm "PyBasic/PyBasic adventure-fast.pgm"
+:micropython
+cd /PyBasic
+pexec import PyBasic
+pexec PyBasic.main("adventure-fast.pgm")
+cd /
+menu.bat

4.bat

@@ -1,5 +1,5 @@
 @echo off
 cd /PyBasic
-PyBasic eliza.bas
+PyBasic startrek.bas
 cd /
 menu.bat

5.bat

@@ -1,3 +1,5 @@
-@dir/w/p
-@pause
-@menu
+@echo off
+cd /PyBasic
+PyBasic eliza.bas
+cd /
+menu.bat

6.bat

@@ -1,2 +1,3 @@
-@edit %1
+@dir/w/p
+@pause
 @menu

7.bat

@@ -0,0 +1,2 @@
+@edlin %1
+@menu

8.bat

@@ -0,0 +1,2 @@
+@edit %1
+@menu

PyBasic/PyBasic.py

@@ -38,10 +38,10 @@
     from sys import print_exception
 
 gc.collect()
-if implementation.name.upper() == 'MICROPYTHON':
+if 'threshold' in dir(gc):
     gc.threshold(gc.mem_free() // 4 + gc.mem_alloc())
 
-def main():
+def main(passedIn=""):
 
     banner = (
 """
@@ -117,8 +117,7 @@ def main():
                     remove('_pybTmp.tmp')
                     break
 
-                # Add a new program statement, beginning
-                # a line number
+                # Add a new program statement
                 elif tokenlist[0].category == Token.UNSIGNEDINT\
                      and len(tokenlist) > 1:
                     program.add_stmt(tokenlist,-1,tmpfile)
@@ -246,23 +245,20 @@ def main():
                         else:
                             print("Program file not found")
 
-                # Unrecognised input
                 else:
                     print("Unrecognized input")
                     for token in tokenlist:
                         token.print_lexeme()
                     print("")
 
-        # Trap all exceptions so that interpreter
-        # keeps running
+        # Trap all exceptions so that interpreter keeps running
         except Exception as e:
             if implementation.name.upper() == 'MICROPYTHON':
-                #### print(e)
                 print_exception(e)
             else:
                 print(e)
 
-if __name__ != "PyDOS":
-    passedIn = ""
-
-main()
+if __name__ == "PyDOS":
+    main(passedIn)
+else:
+    print("Enter 'PyBasic.main()' in the REPL to run.")

PyBasic/basicparser.py

@@ -281,9 +281,6 @@ def __simplestmt(self,infile,tmpfile,datastmts):
             return None
 
         elif self.__token.category == Token.DIM:
-            #gc.collect()
-            #if implementation.name.upper() == 'MICROPYTHON':
-                #gc.threshold(gc.mem_free() // 4 + gc.mem_alloc())
             self.__dimstmt()
             return None
 
@@ -908,11 +905,8 @@ def __soundstmt(self):
         elif implementation.name.upper() == 'CIRCUITPYTHON':
             try:
                 Pydos_hw.sndGPIO.deinit() # Workaround for ESP32-S2 GPIO issue
-                audioPin = PWMOut(sndPin, duty_cycle=0, frequency=440, variable_frequency=True)
-                audioPin.frequency = freq
-                audioPin.duty_cycle = volume
+                audioPin = PWMOut(sndPin, duty_cycle=volume, frequency=freq, variable_frequency=True)
                 sleep(duration/18.2)
-                audioPin.duty_cycle = 0
                 audioPin.deinit()
                 Pydos_hw.quietSnd() # Workaround for ESP32-S2 GPIO issue
             except:

PyBasic/eliza.bas

@@ -30,7 +30,7 @@
 180 REM *******USER INPUT SECTION********** 
 190 REM *********************************** 
 200 INPUT I$ 
-201 I$ = "  " + I$ + "  " 
+201 I$ = "  " + UPPER$(I$) + "  " 
 210 REM GET RID OF APOSTROPHES 
 220 FOR L = 1 TO LEN ( I$ ) 
 230 REM IF MID$(I$,L,1)="'"THEN I$=MID$(I$, 1 ,L-1)+MID$(I$,L+1,LEN(I$)-L):GOTO 230 

PyBasic/program.py

@@ -300,9 +300,6 @@ def execute(self,infile,tmpfile):
             # sequential statement execution. The index
             # will be incremented by one, unless modified by
             # a jump
-            #gc.collect()
-            #if implementation.name.upper() == 'MICROPYTHON':
-                #gc.threshold(gc.mem_free() // 4 + gc.mem_alloc())
             index = 0
             self.set_next_line_number(line_numbers[index])