easycoder 250105.1__py2.py3-none-any.whl → 250106.2__py2.py3-none-any.whl

easycoder/__init__.py

@@ -10,4 +10,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250105.1"
+__version__ = "250106.2"

easycoder/ec_compiler.py

@@ -102,7 +102,7 @@ class Compiler:
 
 	def showWarnings(self):
 		for warning in self.warnings:
-			print(f'Warning at line {self.getLino() + 1} from {warning}')
+			print(f'Warning at line {self.getLino() + 1} of {self.program.name}: {warning}')
 
 	def getSymbolRecord(self):
 		token = self.getToken()

easycoder/ec_core.py

@@ -1900,7 +1900,6 @@ class Core(Handler):
                     return value
             return None
 
-        self.warning(f'Core.compileValue: Unknown token "{token}"')
         return None
 
     #############################################################################

easycoder/ec_graphics.py

@@ -9,6 +9,7 @@ class Graphics(Handler):
 
     def __init__(self, compiler):
         Handler.__init__(self, compiler)
+        self.windowCreated = False
 
     def getName(self):
         return 'graphics'
@@ -36,7 +37,7 @@ class Graphics(Handler):
             FatalError(self.program.compiler, f'There is no screen element with id \'{id}\'')
             return -1
         if element.getType() != keyword:
-            FatalError(self.program.compiler, f'Mismatched element type ({element['type']} and {keyword})')
+            FatalError(self.program.compiler, f'Mismatched element type: \'{element['type']}\' and \'{keyword}\'')
         self.putSymbolValue(targetRecord, {'type': 'text', 'content': id})
         return self.nextPC()
 
@@ -65,11 +66,15 @@ class Graphics(Handler):
             r = self.compileConstant(255)
             g = self.compileConstant(255)
             b = self.compileConstant(255)
+            fullscreen = False
             while True:
                 token = self.peek()
                 if token == 'title':
                     self.nextToken()
                     t = self.nextValue()
+                elif token == 'fullscreen':
+                    fullscreen = True
+                    self.nextToken()
                 elif token == 'at':
                     self.nextToken()
                     left = self.nextValue()
@@ -91,9 +96,10 @@ class Graphics(Handler):
             command['pos'] = (left, top)
             command['size'] = (width, height)
             command['fill'] = (r, g, b)
+            command['fullscreen'] = fullscreen
             self.add(command)
             return True
-        
+
         elif self.isSymbol():
             record = self.getSymbolRecord()
             command['target'] = record['name']
@@ -113,7 +119,7 @@ class Graphics(Handler):
             self.add(command)
             record['elementID'] = command['id']
         return False
-    
+
     def getElementData(self, type, command):
         width = None
         height = None
@@ -170,23 +176,28 @@ class Graphics(Handler):
             command['source'] = source
 
     def r_create(self, command):
+
         try:
             type = command['type']
             if type == 'window':
+                if self.windowCreated == True:
+                    RuntimeError(self.program, 'A window has already been created')
                 self.windowSpec = Object()
                 self.windowSpec.title = command['title']['content']
+                self.windowSpec.fullscreen = command['fullscreen']
                 self.windowSpec.flush = flush
                 self.windowSpec.kill = self.program.kill
                 self.windowSpec.pos = (self.getRuntimeValue(command['pos'][0]), self.getRuntimeValue(command['pos'][1]))
                 self.windowSpec.size = (self.getRuntimeValue(command['size'][0]), self.getRuntimeValue(command['size'][1]))
                 self.windowSpec.fill = (self.getRuntimeValue(command['fill'][0])/255, self.getRuntimeValue(command['fill'][1])/255, self.getRuntimeValue(command['fill'][2])/255)
+                self.windowCreated = True
             else:
                 element = self.ui.createWidget(self.getWidgetSpec(command))
                 print(element)
         except Exception as e:
             RuntimeError(self.program, e)
         return self.nextPC()
-    
+
     def getWidgetSpec(self, command):
         spec = Object()
         spec.id = self.getRuntimeValue(command['id'])
@@ -301,13 +312,22 @@ class Graphics(Handler):
     # render {spec}
     def k_render(self, command):
         command['spec'] = self.nextValue()
+        command['parent'] = None
+        if self.peek() == 'in':
+            self.nextToken()
+            if self.nextIsSymbol():
+                command['parent'] = self.getSymbolRecord()['name']
         self.add(command)
         return True
 
     def r_render(self, command):
+        spec = self.getRuntimeValue(command['spec'])
+        parent = command['parent']
+        if parent !=None:
+            parent = self.getVariable(command['parent'])
         self.ui = self.renderer.getUI()
         try:
-            ScreenSpec().render(self.getRuntimeValue(command['spec']), self.ui)
+            ScreenSpec().render(spec, parent, self.ui)
         except Exception as e:
             RuntimeError(self.program, e)
         return self.nextPC()
@@ -316,12 +336,6 @@ class Graphics(Handler):
     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
 
@@ -385,7 +399,7 @@ class Graphics(Handler):
                 value['type'] = 'symbol'
                 return value
             return None
-        
+
         if self.tokenIs('the'):
             self.nextToken()
         kwd = self.getToken()

easycoder/ec_renderer.py

@@ -41,21 +41,21 @@ class Element():
     def setPos(self, pos):
         self.spec.realpos = pos
         self.spec.item.pos = pos
-    
+
     # Called when the parent moves
     def repos(self):
         spec = self.spec
         spec.item.pos = Vector(spec.realpos) + spec.parent.realpos
-            
+
     def getRealSize(self):
         return self.spec.realsize
-            
+
     def getSize(self):
         return self.spec.size
 
     def setSize(self, size):
         self.spec.size = size
-    
+
     def getChildren(self):
         return self.spec.children
 
@@ -68,7 +68,7 @@ class UI(Widget):
         if id in self.elements.keys():
             return self.elements[id]
         return None
-    
+
     def addElement(self, id, spec):
         if id in self.elements.keys():
             raise(Exception(f'Element {id} already exists'))
@@ -133,7 +133,7 @@ class UI(Widget):
                 item = AsyncImage(pos=pos, size=size, source=spec.source)
             spec.item = item
             self.addElement(spec.id, spec)
-    
+
     def moveElementBy(self, id, dist):
         element = self.getElement(id)
         if element != None:
@@ -141,7 +141,7 @@ class UI(Widget):
             for id in element.getChildren():
                 self.getElement(id).repos()
         return
-    
+
     def moveElementTo(self, id, pos):
         element = self.getElement(id)
         if element != None:
@@ -172,7 +172,7 @@ class UI(Widget):
                     if tp[0] >= pos[0] and tp[0] < pos[0] + size[0] and tp[1] >= pos[1] and tp[1] < pos[1] + size[1]:
                         element.cb()
                         break
-    
+
     def setOnClick(self, id, callback):
         self.getElement(id).cb = callback
 
@@ -200,7 +200,7 @@ class UI(Widget):
             return spec.realsize[1]
         else:
             raise Exception(f'Unknown attribute: {attribute}')
-        
+
     def setAttribute(self, id, attribute, value):
         spec = self.getElement(id).spec
         if attribute == 'left':
@@ -222,15 +222,15 @@ class Renderer(App):
 
     def getUI(self):
         return self.ui
-    
+
     def request_close(self):
         print('close window')
         self.kill()
         Window.close()
-    
+
     def flushQueue(self, dt):
         self.flush()
-    
+
     def build(self):
         Clock.schedule_interval(self.flushQueue, 0.01)
         return self.ui
@@ -240,8 +240,11 @@ class Renderer(App):
         self.title = spec.title
         self.flush = spec.flush
         self.kill = spec.kill
-        Window.size = spec.size
-        Window.left = spec.pos[0]
-        Window.top = spec.pos[1]
         Window.clearcolor = spec.fill
         Window.on_request_close=self.request_close
+        if spec.fullscreen:
+            Window.fullscreen = True
+        else:
+            Window.size = spec.size
+            Window.left = spec.pos[0]
+            Window.top = spec.pos[1]

easycoder/ec_screenspec.py

@@ -61,17 +61,14 @@ class ScreenSpec():
             self.createWidget(spec[widgets], parent)
 
     # Render a graphic specification
-    def render(self, spec, ui):
+    def render(self, spec, parent, ui):
         self.ui = ui
 
         # If it'a string, process it
         if isinstance(spec, str):
-            self.renderSpec(loads(spec), None)
+            self.renderSpec(loads(spec), parent)
 
         # If it's a 'dict', extract the spec and the args
-        elif isinstance(spec, dict):
-            spec = loads(spec['spec'])
-            self.renderSpec(spec, None)
-
         else:
-            raise Exception('Spec is an unknown type')
+            self.renderSpec(spec, parent)
+

easycoder/ec_value.py

@@ -51,14 +51,14 @@ class Value:
 			if item != None:
 				return item
 			self.compiler.rewindTo(mark)
-		self.compiler.warning(f'I don\'t understand \'{token}\'')
+		# self.compiler.warning(f'I don\'t understand \'{token}\'')
 		return None
 
 	def compileValue(self):
 		token = self.getToken()
 		item = self.getItem()
 		if item == None:
-			FatalError(self.compiler, f'Cannot get the value of "{token}"')
+			self.compiler.warning(f'ec_value.compileValue: Cannot get the value of "{token}"')
 			return None
 
 		value = {}

{easycoder-250105.1.dist-info → easycoder-250106.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: easycoder
-Version: 250105.1
+Version: 250106.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>
@@ -77,7 +77,7 @@ A couple of demo graphical scripts are included in the `scripts` directory:
 
  - English-like syntax based on vocabulary rather than structure. Scripts can be read as English
  - Comprehensive feature set
- - Runs directly from source scripts, using a fast compiler to create efficient intermediate runtime code that is run immediately
+ - Runs directly from source scripts. A fast compiler creates efficient intermediate code that runs immediately after compilation
  - Low memory requirements
  - Minimim dependency on other 3rd-party packages
  - Built-in co-operative multitasking

easycoder-250106.2.dist-info/RECORD

@@ -0,0 +1,19 @@
+easycoder/README.md,sha256=PYqOc_SkIGiFbyCNs90y7JqoqWe4aO1xYIW-6bOnFKU,573
+easycoder/__init__.py,sha256=CmJ8x5YEEEP1t-zhZ4OLmZKxrPHxUeRdV1hgp3cn-AI,283
+easycoder/ec.py,sha256=Nj5PRl8GsKjfGJKq0FOM1a7FeK3cN68CoIFg8lswQEg,221
+easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
+easycoder/ec_compiler.py,sha256=f3zZRtbNsegBuRHTvTLK8BOdnuRq5p_p-1vtJYb-LiY,4800
+easycoder/ec_condition.py,sha256=WSbONo4zs2sX1icOVpscZDFSCAEFmTsquoc2RGcLx_k,763
+easycoder/ec_core.py,sha256=71rSNOwMrO0Ik1hdgTshOYRo2XVD0Br7gUZfCR7A0OA,86291
+easycoder/ec_graphics.py,sha256=vcI7g3wVUbwbGl5j032tYVWBu9aceThI4ZN8lLMpd5w,17017
+easycoder/ec_handler.py,sha256=IJvxcrJJSR53d6DS_8H5qPHKhp9y5-GV4WXAjhZxu_o,2250
+easycoder/ec_program.py,sha256=sdVPc1c8urLn5icov-NVyNkc78UR930ipDDONlZTge8,9831
+easycoder/ec_renderer.py,sha256=ht_fdC6Yt5PKhTVim_2zg1cCQTHeS1OKzQSRYgL1cT4,8054
+easycoder/ec_screenspec.py,sha256=qNqhbP16gAi2cRUD3W0dpb8tTC4-N4mE2l6HtOG0vbc,2405
+easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
+easycoder/ec_value.py,sha256=7yJovn24pPC3jrURSQyEvZ8m826fXiqxsCpSvxwNrfQ,2403
+easycoder-250106.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250106.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250106.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+easycoder-250106.2.dist-info/METADATA,sha256=zAk-MboXzmDC4mNTpacn7_TKUu0ivHKTclgdJEg0jdI,5817
+easycoder-250106.2.dist-info/RECORD,,

{easycoder-250105.1.dist-info → easycoder-250106.2.dist-info}/WHEEL

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

easycoder-250105.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-easycoder/README.md,sha256=PYqOc_SkIGiFbyCNs90y7JqoqWe4aO1xYIW-6bOnFKU,573
-easycoder/__init__.py,sha256=owNA7S9z8wlR3KRxJytrzPU-s4ngA04Xq8_EUinKwK8,283
-easycoder/ec.py,sha256=Nj5PRl8GsKjfGJKq0FOM1a7FeK3cN68CoIFg8lswQEg,221
-easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
-easycoder/ec_compiler.py,sha256=_xBh2L47mz_WOMYdruMYSHyyz2wfh7Hf28q559AWVSU,4781
-easycoder/ec_condition.py,sha256=WSbONo4zs2sX1icOVpscZDFSCAEFmTsquoc2RGcLx_k,763
-easycoder/ec_core.py,sha256=5woFkLx9divJomakFyeexmhqJeEPI1hUlzyB3MlAruI,86359
-easycoder/ec_graphics.py,sha256=ylkdEOo04g8aOeY9xB1V9mf3aZWkoIUt-caXivuVje4,16427
-easycoder/ec_handler.py,sha256=IJvxcrJJSR53d6DS_8H5qPHKhp9y5-GV4WXAjhZxu_o,2250
-easycoder/ec_program.py,sha256=sdVPc1c8urLn5icov-NVyNkc78UR930ipDDONlZTge8,9831
-easycoder/ec_renderer.py,sha256=oZ56OyJojQq-2ZPlVMFOrEyG_vj91D4yv9Nd5m92RQA,8031
-easycoder/ec_screenspec.py,sha256=TeXgccfYoE--r7Rf9t9drV1V3fU-p-iBnZwtjHzIh8M,2524
-easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
-easycoder/ec_value.py,sha256=KkSIxAum-bnb_qnaRgS1UiVUg_-khVPQrrEPiSXjQs4,2382
-easycoder-250105.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250105.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250105.1.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250105.1.dist-info/METADATA,sha256=hm-vw2r4-nH5eaa8ouO0Qpdx9nyeNFK60iXwS41GDxg,5817
-easycoder-250105.1.dist-info/RECORD,,