v241231.1

Author: easycoder

README.md

@@ -49,9 +49,17 @@ Here in the repository is a folder called `scripts` containing some sample scrip
 `fizzbuzz.ecs` is a simple programming challenge often given at job interviews
 
 ## Graphical programmming
-**_EasyCoder_** is currently being extended to include a graphical programming environment. A single demo script `graphics-demo.ecs` is included in the `scripts` directory. To run it, first install the Python graphics library if it's not already present on your system. On Linux this is done with `sudo apt install python3-tk`. On Windows it's `pip install tk`. Then give the command `easycoder -g scripts/graphics-demo.ecs`.
+**_EasyCoder_** includes a graphical programming environment that is in the early stages of development. A couple of demo scripts are included in the `scripts` directory. To run them, first install the Python `kivy` graphics library if it's not already present on your system. This is done with `pip install kivy`. Then run a script using `easycoder {scriptname}.ecg`.
 
-As development progresses this demo script will be extended to include new features as they are added. **_EasyCoder_** graphics are handled by a library module, `ec_renderer` that can be used outside of the **_EasyCoder_** environment, in other Python programs.
+Graphical scripts look much like any other script but their file names must use the extension `.ecg` to signal to **_EasyCoder_** that it needs to load the graphics module. This allows the **_EasyCoder_** application to be used wherever Python is installed, in either a command-line or a graphical environment (but graphics will of course not be available in the former).
+
+A couple of demo scripts are included in the `scripts` directory:
+
+`graphics-demo.ecg` shows some of the elements that can be created, and demonstrates a variety of the graphical features of the language such as detecting when elements are clicked.
+
+`wave.ecg` is a "Mexican Wave" simulation.
+
+**_EasyCoder_** graphics are handled by a library module, `ec_renderer` that can be used outside of the **_EasyCoder_** environment, in other Python programs.
 
 ## EasyCoder programming reference
 

dist/easycoder-241230.1-py2.py3-none-any.whl

@@ -10,4 +10,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "241230.1"
+__version__ = "241231.1"

dist/easycoder-241231.1-py2.py3-none-any.whl

@@ -696,6 +696,29 @@ def r_multiply(self, command):
         self.putSymbolValue(target, value)
         return self.nextPC()
 
+    # Negate a variable
+    def k_negate(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_negate(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')
+        value['content'] *= -1
+        self.putSymbolValue(symbolRecord, value)
+        return self.nextPC()
+
     # Define an object variable
     def k_object(self, command):
         return self.compileVariable(command)
@@ -976,7 +999,7 @@ def r_replace(self, command):
         content = self.getSymbolValue(templateRecord)['content']
         original = self.getRuntimeValue(command['original'])
         replacement = self.getRuntimeValue(command['replacement'])
-        content = content.replace(original, replacement)
+        content = content.replace(original, str(replacement))
         value = {}
         value['type'] = 'text'
         value['numeric'] = False
@@ -1417,7 +1440,7 @@ def incdec(self, command, mode):
     # Compile a value in this domain
     def compileValue(self):
         value = {}
-        value['domain'] = 'core'
+        value['domain'] = self.getName()
         token = self.getToken()
         if self.isSymbol():
             value['name'] = token

dist/easycoder-241230.1.tar.gz renamed to dist/easycoder-241231.1.tar.gz

@@ -9,7 +9,7 @@ def __init__(self, compiler):
         Handler.__init__(self, compiler)
 
     def getName(self):
-        return 'kivy'
+        return 'graphics'
 
     #############################################################################
     # Keyword handlers
@@ -204,12 +204,47 @@ def k_ellipse(self, command):
     def r_ellipse(self, command):
         return self.nextPC()
 
+    def r_getui(self, command):
+        self.ui = self.renderer.getUI()
+        return self.nextPC()
+
     def k_image(self, command):
         return self.compileVariable(command)
 
     def r_image(self, command):
         return self.nextPC()
 
+    # move an element
+    def k_move(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            type = record['keyword']
+            if type in ['ellipse', 'rectangle']:
+                command['target'] = record['id']
+                token = self.nextToken()
+                if token == 'to':
+                    command['x'] = self.nextValue()
+                    command['y'] = self.nextValue()
+                    self.add(command)
+                    return True
+                elif token == 'by':
+                    command['keyword'] = 'moveBy'
+                    command['dx'] = self.nextValue()
+                    command['dy'] = self.nextValue()
+                    self.add(command)
+                    return True
+        return False
+
+    def r_move(self, command):
+        pos = (self.getRuntimeValue(command['x']), self.getRuntimeValue(command['y']))
+        self.ui.moveElementTo(self.getRuntimeValue(command['target']), pos)
+        return self.nextPC()
+
+    def r_moveBy(self, command):
+        dist = (self.getRuntimeValue(command['dx']), self.getRuntimeValue(command['dy']))
+        self.ui.moveElementBy(self.getRuntimeValue(command['target']), dist)
+        return self.nextPC()
+
     def k_on(self, command):
         token = self.nextToken()
         if token in ['click', 'tap']:
@@ -255,37 +290,6 @@ def r_on(self, command):
                 RuntimeError(self.program, f'{record['name']} is not a clickable object')
         return self.nextPC()
 
-    # move an element
-    def k_move(self, command):
-        if self.nextIsSymbol():
-            record = self.getSymbolRecord()
-            type = record['keyword']
-            if type in ['ellipse', 'rectangle']:
-                command['target'] = record['id']
-                token = self.nextToken()
-                if token == 'to':
-                    command['x'] = self.nextValue()
-                    command['y'] = self.nextValue()
-                    self.add(command)
-                    return True
-                elif token == 'by':
-                    command['keyword'] = 'moveBy'
-                    command['dx'] = self.nextValue()
-                    command['dy'] = self.nextValue()
-                    self.add(command)
-                    return True
-        return False
-
-    def r_move(self, command):
-        pos = (self.getRuntimeValue(command['x']), self.getRuntimeValue(command['y']))
-        self.ui.moveElementTo(self.getRuntimeValue(command['target']), pos)
-        return self.nextPC()
-
-    def r_moveBy(self, command):
-        dist = (self.getRuntimeValue(command['dx']), self.getRuntimeValue(command['dy']))
-        self.ui.moveElementBy(self.getRuntimeValue(command['target']), dist)
-        return self.nextPC()
-
     def k_rectangle(self, command):
         return self.compileVariable(command)
 
@@ -306,13 +310,22 @@ def k_render(self, command):
 
     def r_render(self, command):
         self.ui = self.renderer.getUI()
-        ScreenSpec().render(self.getRuntimeValue(command['spec']), self.ui)
+        try:
+            ScreenSpec().render(self.getRuntimeValue(command['spec']), self.ui)
+        except Exception as e:
+            RuntimeError(self.program, e)
         return self.nextPC()
 
     # run graphics
     def k_run(self, command):
         if self.nextIs('graphics'):
             self.add(command)
+            cmd = {}
+            cmd['domain'] = 'graphics'
+            cmd['lino'] = command['lino'] + 1
+            cmd['keyword'] = 'getui'
+            cmd['debug'] = False
+            self.addCommand(cmd)
             return True
         return False
 
@@ -323,6 +336,33 @@ def r_run(self, command):
         self.program.run(self.nextPC())
         self.renderer.run()
 
+    # Set something
+    def k_set(self, command):
+        if self.nextIs('attribute'):
+            command['attribute'] = self.nextValue()
+            if self.nextIs('of'):
+                if self.nextIsSymbol():
+                    record = self.getSymbolRecord()
+                    if record['keyword'] in ['ellipse', 'rectangle', 'text', 'image']:
+                        command['target'] = record['name']
+                        if self.nextIs('to'):
+                            command['value'] = self.nextValue()
+                            self.addCommand(command)
+                            return True
+                    else:
+                        FatalError(self.program.compiler, f'Invalid type: {record['keyword']}')
+                else:
+                    FatalError(self.program.compiler, f'\'{self.getToken()}\' is not a variable')
+        return False
+
+    def r_set(self, command):
+        attribute = self.getRuntimeValue(command['attribute'])
+        target = self.getVariable(command['target'])
+        id = target['value'][target['index']]['content']
+        value = self.getRuntimeValue(command['value'])
+        self.ui.setAttribute(id, attribute, value)
+        return self.nextPC()
+
     #############################################################################
     # Modify a value or leave it unchanged.
     def modifyValue(self, value):
@@ -333,16 +373,24 @@ def modifyValue(self, value):
     def compileValue(self):
         value = {}
         value['domain'] = self.getName()
-        if self.tokenIs('attribute'):
+        if self.tokenIs('the'):
+            self.nextToken()
+        kwd = self.getToken()
+        value['type'] = kwd
+        if kwd == 'attribute':
             attribute = self.nextValue()
             if self.nextIs('of'):
                 if self.nextIsSymbol():
                     record = self.getSymbolRecord()
                     if record['keyword'] in ['ellipse', 'rectangle']:
-                        value['type'] = 'attribute'
                         value['attribute'] = attribute
                         value['target'] = record['name']
                         return value
+        elif kwd == 'window':
+            attribute = self.nextToken()
+            if attribute in ['left', 'top', 'width', 'height']:
+                value['attribute'] = attribute
+                return value
         return None
 
     #############################################################################
@@ -361,6 +409,16 @@ def v_attribute(self, v):
         except Exception as e:
             RuntimeError(self.program, e)
 
+    def v_window(self, v):
+        try:
+            attribute = v['attribute']
+            value = {}
+            value['type'] = 'int'
+            value['content'] = int(round(self.ui.getWindowAttribute(attribute)))
+            return value
+        except Exception as e:
+            RuntimeError(self.program, e)
+
     #############################################################################
     # Compile a condition
     def compileCondition(self):

easycoder/__init__.py

@@ -97,7 +97,6 @@ def getReal(val):
                     return val * n / 100
             return val
 
-        print(spec.id)
         with self.canvas:
             if hasattr(spec, 'fill'):
                 c = spec.fill
@@ -177,6 +176,18 @@ def on_touch_down(self, touch):
     def setOnClick(self, id, callback):
         self.getElement(id).cb = callback
 
+    def getWindowAttribute(self, attribute):
+        if attribute == 'left':
+            return Window.left
+        elif attribute == 'top':
+            return Window.top
+        elif attribute == 'width':
+            return Window.size[0]
+        elif attribute == 'height':
+            return Window.size[1]
+        else:
+            raise Exception(f'Unknown attribute: {attribute}')
+
     def getAttribute(self, id, attribute):
         spec = self.getElement(id).spec
         if attribute == 'left':
@@ -189,16 +200,23 @@ def getAttribute(self, id, attribute):
             return spec.realsize[1]
         else:
             raise Exception(f'Unknown attribute: {attribute}')
-
-    def getWindowAttribute(self, attribute):
+        
+    def setAttribute(self, id, attribute, value):
+        spec = self.getElement(id).spec
         if attribute == 'left':
-            return Window.left
-        elif attribute == 'top':
-            return Window.top
+            spec.realpos = (value, spec.realsize[0])
+            spec.item.pos = (value, spec.realsize[0])
+        elif attribute == 'bottom':
+            spec.realpos = (spec.realsize[0], value)
+            spec.item.pos = (spec.realsize[0], value)
         elif attribute == 'width':
-            return Window.size[0]
+            spec.realsize = (value, spec.realsize[0])
+            spec.item.size = (value, spec.realsize[0])
         elif attribute == 'height':
-            return Window.size[1]
+            spec.realsize = (spec.realsize[0], value)
+            spec.item.size = (spec.realsize[0], value)
+        else:
+            raise Exception(f'Unknown attribute: {attribute}')
 
 class Renderer(App):
 
@@ -213,7 +231,7 @@ def flushQueue(self, dt):
         self.flush()
 
     def build(self):
-        Clock.schedule_interval(self.flushQueue, 0.05)
+        Clock.schedule_interval(self.flushQueue, 0.01)
         self.ui = UI()
         return self.ui
 

easycoder/ec_core.py

@@ -75,4 +75,3 @@ def render(self, spec, ui):
 
         else:
             raise Exception('Spec is an unknown type')
-