easycoder 250301.1__tar.gz → 250301.3__tar.gz

{easycoder-250301.1 → easycoder-250301.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250301.1
+Version: 250301.3
 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>

{easycoder-250301.1 → easycoder-250301.3}/easycoder/__init__.py

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

{easycoder-250301.1 → easycoder-250301.3}/easycoder/ec_core.py

@@ -308,7 +308,7 @@ class Core(Handler):
                     command['target'] = self.getToken()
                     self.add(command)
                     return True
-                FatalError(self.program.compiler, 'Symbol expected')
+                FatalError(self.compiler, 'Symbol expected')
             else:
                 # First value must be a variable
                 if command['value1']['type'] == 'symbol':
@@ -404,7 +404,6 @@ class Core(Handler):
                 command['target'] = self.getToken()
             else:
                 FatalError(self.compiler, f'Variable "{symbolRecord["name"]}" does not hold a value')
-        else: FatalError(self.compiler, 'Variable expected after \'get\'')
         if self.nextIs('from'):
             command['url'] = self.nextValue()
         command['or'] = None
@@ -705,7 +704,7 @@ class Core(Handler):
                     self.add(command)
                     return True
         else:
-            FatalError(self.program.compiler, f'I don\'t understand \'{self.getToken()}\'')
+            FatalError(self.compiler, f'I don\'t understand \'{self.getToken()}\'')
         return False
 
     def r_load(self, command):
@@ -765,14 +764,14 @@ class Core(Handler):
                     command['target'] = self.getToken()
                     self.add(command)
                     return True
-                FatalError(self.program.compiler, 'Symbol expected')
+                FatalError(self.compiler, 'Symbol expected')
             else:
                 # First value must be a variable
                 if command['value1']['type'] == 'symbol':
                     command['target'] = command['value1']['name']
                     self.add(command)
                     return True
-                FatalError(self.program.compiler, 'First value must be a variable')
+                FatalError(self.compiler, 'First value must be a variable')
         return False
 
     def r_multiply(self, command):
@@ -881,7 +880,7 @@ class Core(Handler):
                     elif token == 'writing':
                         mode = 'w'
                     else:
-                        FatalError(self.program.compiler, 'Unknown file open mode {self.getToken()}')
+                        FatalError(self.compiler, 'Unknown file open mode {self.getToken()}')
                         return False
                     command['mode'] = mode
                 else:
@@ -1004,7 +1003,7 @@ class Core(Handler):
             command['value'] = value
             self.add(command)
             return True
-        FatalError(self.program.compiler, 'I can\'t print this value')
+        FatalError(self.compiler, 'I can\'t print this value')
         return False
 
     def r_print(self, command):
@@ -1058,12 +1057,12 @@ class Core(Handler):
                 symbolRecord = self.getSymbolRecord()
                 command['target'] = symbolRecord['name']
                 if 'valueholder' in symbolRecord and symbolRecord['valueHolder'] == False:
-                    FatalError(self.program.compiler, f'Symbol {symbolRecord["name"]} is not a value holder')
+                    FatalError(self.compiler, f'Symbol {symbolRecord["name"]} is not a value holder')
                 else:
                     self.add(command)
                     return True
             else:
-                FatalError(self.program.compiler, f'Symbol {self.getToken()} is not a variable')
+                FatalError(self.compiler, f'Symbol {self.getToken()} is not a variable')
         return False
 
     def r_put(self, command):
@@ -1097,9 +1096,9 @@ class Core(Handler):
                             command['file'] = fileRecord['name']
                             self.add(command)
                             return True
-            FatalError(self.program.compiler, f'Symbol "{symbolRecord["name"]}" is not a value holder')
+            FatalError(self.compiler, f'Symbol "{symbolRecord["name"]}" is not a value holder')
             return False
-        FatalError(self.program.compiler, f'Symbol "{self.getToken()}" has not been declared')
+        FatalError(self.compiler, f'Symbol "{self.getToken()}" has not been declared')
         return False
 
     def r_read(self, command):
@@ -1444,7 +1443,7 @@ class Core(Handler):
             command['background'] = background
             self.add(command)
             return True
-        FatalError(self.program.compiler, 'I can\'t give this command')
+        FatalError(self.compiler, 'I can\'t give this command')
         return False
 
     def r_system(self, command):
@@ -1487,7 +1486,7 @@ class Core(Handler):
                         self.add(command)
                         return True
                     else:
-                        FatalError(self.program.compiler, f'\'{self.getToken()}\' is not a symbol')
+                        FatalError(self.compiler, f'\'{self.getToken()}\' is not a symbol')
                 else:
                     self.warning(f'Core.take: Expected "giving"')
         return False
@@ -1757,7 +1756,7 @@ class Core(Handler):
                     if symbolRecord['valueHolder']:
                         value['target'] = symbolRecord['name']
                         return value
-                    FatalError(self.program.compiler, 'Variable does not hold a value')
+                    FatalError(self.compiler, 'Variable does not hold a value')
             return None
 
         if token == 'arg':

{easycoder-250301.1 → easycoder-250301.3}/easycoder/ec_gutils.py

@@ -106,7 +106,7 @@ class GUtils:
         return (size[0], size[1])
 
     def getDefaultButton(self, args):
-        args['button_text'] = '(empty)'
+        args['button_text'] = ''
         args['disabled'] = False
         args['size'] = (None, None)
 
@@ -165,7 +165,7 @@ class GUtils:
         return psg.Multiline(default_text=args['default_text'], key=args['key'], size=self.getSize(args))
 
     def getDefaultText(self, args):
-        args['text'] = '(empty)'
+        args['text'] = ''
         args['key'] = None
         args['size'] = (None, None)
         args['expand_x'] = False