easycoder 250317.4__py2.py3-none-any.whl → 250403.2__py2.py3-none-any.whl

easycoder/__init__.py

@@ -9,4 +9,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250317.4"
+__version__ = "250403.2"

easycoder/ec_core.py

@@ -1,4 +1,4 @@
-import json, math, hashlib, threading, os, subprocess, sys, requests, time, numbers, base64, binascii
+import json, math, hashlib, threading, os, subprocess, sys, requests, time, numbers, base64, binascii, random
 from psutil import Process
 from datetime import datetime, timezone
 from random import randrange
@@ -144,7 +144,7 @@ class Core(Handler):
         else:
             return self.compileFromHere(['end'])
 
-    # Clear (set False)
+    # Clear (set false)
     # clear {variable}
     def k_clear(self, command):
         if self.nextIsSymbol():
@@ -405,36 +405,40 @@ class Core(Handler):
             else:
                 FatalError(self.compiler, f'Variable "{symbolRecord["name"]}" does not hold a value')
         if self.nextIs('from'):
-            command['url'] = self.nextValue()
-        command['or'] = None
-        get = self.getPC()
-        if self.peek() == 'timeout':
-            self.nextToken()
-            command['timeout'] = self.nextValue()
-        else:
-            timeout = {}
-            timeout['type'] = 'int'
-            timeout['content'] = 5
-            command['timeout'] = timeout
-        self.addCommand(command)
-        if self.peek() == 'or':
-            self.nextToken()
-            self.nextToken()
-            # Add a 'goto' to skip the 'or'
-            cmd = {}
-            cmd['lino'] = command['lino']
-            cmd['domain'] = 'core'
-            cmd['keyword'] = 'gotoPC'
-            cmd['goto'] = 0
-            cmd['debug'] = False
-            skip = self.getPC()
-            self.addCommand(cmd)
-            # Process the 'or'
-            self.getCommandAt(get)['or'] = self.getPC()
-            self.compileOne()
-            # Fixup the skip
-            self.getCommandAt(skip)['goto'] = self.getPC()
-        return True
+            if self.nextIs('url'):
+                url = self.nextValue()
+                if url != None:
+                    command['url'] = url
+                    command['or'] = None
+                    get = self.getPC()
+                    if self.peek() == 'timeout':
+                        self.nextToken()
+                        command['timeout'] = self.nextValue()
+                    else:
+                        timeout = {}
+                        timeout['type'] = 'int'
+                        timeout['content'] = 5
+                        command['timeout'] = timeout
+                    self.addCommand(command)
+                    if self.peek() == 'or':
+                        self.nextToken()
+                        self.nextToken()
+                        # Add a 'goto' to skip the 'or'
+                        cmd = {}
+                        cmd['lino'] = command['lino']
+                        cmd['domain'] = 'core'
+                        cmd['keyword'] = 'gotoPC'
+                        cmd['goto'] = 0
+                        cmd['debug'] = False
+                        skip = self.getPC()
+                        self.addCommand(cmd)
+                        # Process the 'or'
+                        self.getCommandAt(get)['or'] = self.getPC()
+                        self.compileOne()
+                        # Fixup the skip
+                        self.getCommandAt(skip)['goto'] = self.getPC()
+                    return True
+        return False
 
     def r_get(self, command):
         global errorCode, errorReason
@@ -1414,6 +1418,33 @@ class Core(Handler):
 
         return self.nextPC()
 
+    # Shuffle a list
+    def k_shuffle(self, command):
+        if self.nextIsSymbol():
+            symbolRecord = self.getSymbolRecord()
+            if symbolRecord['valueHolder']:
+                command['target'] = self.getToken()
+                self.add(command)
+                return True
+            self.warning(f'Core.negate: Variable "{symbolRecord["name"]}" does not hold a value')
+        return False
+
+    def r_shuffle(self, command):
+        symbolRecord = self.getVariable(command['target'])
+        if not symbolRecord['valueHolder']:
+            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            return None
+        value = self.getSymbolValue(symbolRecord)
+        if value == None:
+            RuntimeError(self.program, f'{symbolRecord["name"]} has not been initialised')
+        content = value['content']
+        if isinstance(content, list):
+            random.shuffle(content)
+            value['content'] = content
+            self.putSymbolValue(symbolRecord, value)
+            return self.nextPC()
+        RuntimeError(self.program, f'{symbolRecord["name"]} is not a list')
+
     # Declare a stack variable
     def k_stack(self, command):
         return self.compileVariable(command)
@@ -1780,8 +1811,8 @@ class Core(Handler):
         token = self.getToken()
         value['type'] = token
 
-        if token in ['args', 'directory']:
-            return value
+        if token == 'args':
+           return value
 
         if token == 'elements':
             if self.nextIs('of'):
@@ -2013,12 +2044,6 @@ class Core(Handler):
             value = v
         return value
 
-    def v_directory(self, v):
-        value = {}
-        value['type'] = 'text'
-        value['content'] = os.getcwd()
-        return value
-
     def v_element(self, v):
         index = self.getRuntimeValue(v['index'])
         target = self.getVariable(v['target'])
@@ -2387,26 +2412,23 @@ class Core(Handler):
     # Compile a condition
     def compileCondition(self):
         condition = Condition()
-        condition.negate = False
 
         if self.getToken() == 'not':
             condition.type = 'not'
             condition.value = self.nextValue()
-            return not condition
+            return condition
 
         if self.getToken() == 'file':
             path = self.nextValue()
+            condition.path = path
+            condition.type = 'exists'
             token = self.nextToken()
             if token == 'exists':
-                condition.type = 'exists'
-                condition.path = path
                 return condition
-            if token == 'does':
+            elif token == 'does':
                 if self.nextIs('not'):
                     if self.nextIs('exist'):
-                        condition.type = 'exists'
-                        condition.path = path
-                        condition.negate = True
+                        condition.negate = not condition.negate
                         return condition
             return None
 
@@ -2501,13 +2523,10 @@ class Core(Handler):
 
     def c_empty(self, condition):
         value = self.getRuntimeValue(condition.value1)
-        if type(value) == dict:
-            comparison = len(value) == 0
+        if value == None:
+            comparison = True
         else:
-            if value == None:
-                comparison = True
-            else:
-                comparison = len(value) == 0
+            comparison = len(value) == 0
         return not comparison if condition.negate else comparison
 
     def c_ends(self, condition):
@@ -2520,8 +2539,7 @@ class Core(Handler):
 
     def c_exists(self, condition):
         path = self.getRuntimeValue(condition.path)
-        comparison = os.path.exists(path)
-        return comparison <= 0 if condition.negate else comparison > 0
+        return os.path.exists(path)
 
     def c_greater(self, condition):
         comparison = self.program.compare(condition.value1, condition.value2)

easycoder/ec_graphics.py

@@ -161,6 +161,41 @@ class Graphics(Handler):
     def r_frame(self, command):
         return self.nextPC()
 
+    # get {variable} from popup {type} {message} {title}
+    def k_get(self, command):
+        if self.nextIsSymbol():
+            symbolRecord = self.getSymbolRecord()
+            if symbolRecord['valueHolder']:
+                command['target'] = self.getToken()
+            else:
+                FatalError(self.compiler, f'Variable "{symbolRecord["name"]}" does not hold a value')
+            if symbolRecord['valueHolder']:
+                if self.nextIs('from'):
+                    if self.nextIs('popup'):
+                        command['ptype'] = self.nextToken()
+                        command['message'] = self.nextValue()
+                        command['title'] = self.nextValue()
+                        self.addCommand(command)
+                        return True
+        return False
+
+    def r_get(self, command):
+        target = self.getVariable(command['target'])
+        ptype = command['ptype']
+        if ptype == 'text':
+            text = psg.popup_get_text(self.getRuntimeValue(command['message']), title=self.getRuntimeValue(command['title']))
+        elif ptype == 'ok-cancel':
+            text = psg.popup_ok_cancel(self.getRuntimeValue(command['message']), title=self.getRuntimeValue(command['title']))
+        elif ptype == 'yes-no':
+            text = psg.popup_yes_no(self.getRuntimeValue(command['message']), title=self.getRuntimeValue(command['title']))
+        else:
+            return None
+        v = {}
+        v['type'] = 'text'
+        v['content'] = text
+        self.program.putSymbolValue(target, v)
+        return self.nextPC()
+
     def k_init(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
@@ -219,13 +254,15 @@ class Graphics(Handler):
         window['eventHandlers'][key] = lambda: self.run(command['goto'])
         return self.nextPC()
 
+    # popup {message} {title}
     def k_popup(self, command):
         command['message'] = self.nextValue()
+        command['title'] = self.nextValue()
         self.addCommand(command)
         return True
 
     def r_popup(self, command):
-        psg.popup(self.getRuntimeValue(command['message']))
+        psg.popup(self.getRuntimeValue(command['message']), title=self.getRuntimeValue(command['title']))
         return self.nextPC()
 
     def k_refresh(self, command):

easycoder/ec_program.py

@@ -375,9 +375,6 @@ class Program:
 		if type(v2) == int:
 			if type(v1) != int:
 				v2 = f'{v2}'
-		if type(v1) == dict and type(v2) == dict:
-			v1 = json.dumps(v1)
-			v2 = json.dumps(v2)
 		if v1 > v2:
 			return 1
 		if v1 < v2:

{easycoder-250317.4.dist-info → easycoder-250403.2.dist-info}/METADATA

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: easycoder
-Version: 250317.4
+Version: 250403.2
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
+License-File: LICENSE
 Requires-Dist: pytz
 Project-URL: Home, https://github.com/easycoder/easycoder-py
 
@@ -44,32 +45,37 @@ fi
 Now write a test script, 'hello.ecs', containing the following:
 ```
 print `Hello, world!`
+exit
 ```
 (Note the backticks.) This is traditionally the first program to be written in virtually any language. To run it, use `easycoder hello.ecs`.
 
-The output will look like this (the version number will differ):
+The output will look like this (the version number will likely differ):
 ```
-EasyCoder version 250101.1
+EasyCoder version 250403.1
 Compiled <anon>: 1 lines (2 tokens) in 0 ms
 Run <anon>
-1-> Hello, world!
+Hello, world!
 ```
 
+Why the `exit`? Because EasyCoder can't tell that the program is finished. It might contain elements that are waiting for outside events, so without `exit` it just stops and waits. You can kill it by typing Control-C.
+
 It's conventional to add a program title to a script:
 ```
 !   Test script
     script Test
-    print `Hello, world!`
+    log `Hello, world!`
+    exit
 ```
-The first line here is just a comment and has no effect on the running of the script.   The second line gives the script a name, which is useful in debugging as it says which script was running. When run, the output is now
+
+The first line here is just a comment and has no effect on the running of the script.   The second line gives the script a name, which is useful in debugging as it says which script was running. I've also changed `print` to `log` to get more information from the script. When run, the output is now
 ```
-EasyCoder version 250101.1
+EasyCoder version 250403.1
 Compiled Test: 3 lines (4 tokens) in 0 ms
 Run Test
-3-> Hello, world!
+16:37:39.132311:    3-> Hello, world!
 ```
 
-As you might guess from the above, the print command shows the line in the script it was called from. This is very useful in tracking down debugging print commands in large scripts.
+As you might guess from the above, the `log` command shows the time and the line in the script it was called from. This is very useful in tracking down debugging print commands in large scripts.
 
 Here in the repository is a folder called `scripts` containing some sample scripts:
 
@@ -77,7 +83,7 @@ Here in the repository is a folder called `scripts` containing some sample scrip
 `tests.ecs` is a test program containing many of the **_EasyCoder_** features  
 `benchmark.ecs` allows the performance of **_EasyCoder_** to be compared to other languages if a similar script is written for each one.
 
-## Graphical programmming
+## Graphical programming
 **_EasyCoder_** includes a graphical programming environment that is in the early stages of development. Some demo scripts will be included in the `scripts` directory; these can be recognised by the extension`.ecg`. To run them, first install `tkinter`. On Linux this is done with
 ```
     sudo apt install python3-tk

easycoder-250403.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
+easycoder/__init__.py,sha256=pk5KcaeSSqFM8gNQsBKwFnRWtTaZbrUhpghX8PtwLRk,262
+easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
+easycoder/ec_compiler.py,sha256=rtxFEWnhW0550MtWEDvYHOw9cYkeTcR0oG3t-kmgnBk,4795
+easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
+easycoder/ec_core.py,sha256=fBfi6BvOqcmjqMvsKHPQLi-x4-CnuJlXldfRjGm4LzM,90287
+easycoder/ec_graphics.py,sha256=ScGLNxW_sxu0WyoO-Od-9MM0bhpVvf-vGa5UmoHYRCA,16073
+easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
+easycoder/ec_handler.py,sha256=K7nBuQTH8l0k8hX1o2b4KhTnhZHGdf2fkEuX4FJXJs8,2277
+easycoder/ec_program.py,sha256=BDwU7aGHiaw6WdbQvVFDhGVaHsvwQ1CWa4wb5MPmOe8,10013
+easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
+easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
+easycoder-250403.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250403.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250403.2.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+easycoder-250403.2.dist-info/METADATA,sha256=aavGnyy5UUUQLxzFAdJI4eUS-r1C_9CasJkZGIfS1eA,6520
+easycoder-250403.2.dist-info/RECORD,,

{easycoder-250317.4.dist-info → easycoder-250403.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: flit 3.10.1
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

easycoder-250317.4.dist-info/RECORD

@@ -1,17 +0,0 @@
-easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=Pu1BNwq6pDEu7S4vA2SrZfUJ3jCtyUTA9n6v51HF3w8,262
-easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
-easycoder/ec_compiler.py,sha256=rtxFEWnhW0550MtWEDvYHOw9cYkeTcR0oG3t-kmgnBk,4795
-easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
-easycoder/ec_core.py,sha256=q6bHq26_AsaoCi6roQeacclhhBv3H6b6ii4AZi48iyw,89127
-easycoder/ec_graphics.py,sha256=sOQlSDpMMjwilLzGkC57-iHdaRqIUWl1SJxc0NbLs1M,14377
-easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
-easycoder/ec_handler.py,sha256=K7nBuQTH8l0k8hX1o2b4KhTnhZHGdf2fkEuX4FJXJs8,2277
-easycoder/ec_program.py,sha256=Ms-GOtd22TjqvxXkNtfNer725WgQmZiHXlNHLlwMGvs,10103
-easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
-easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250317.4.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250317.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250317.4.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250317.4.dist-info/METADATA,sha256=ULfbfg_rxDcgz3gbpvahx4r6mchZMXVK4iN7cS_u5Vc,6155
-easycoder-250317.4.dist-info/RECORD,,