pyscript-programming-language 1.10.1__tar.gz → 1.10.2__tar.gz

{pyscript_programming_language-1.10.1/pyscript_programming_language.egg-info → pyscript_programming_language-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.10.1
+Version: 1.10.2
 Summary: PyScript Programming Language
 Home-page: https://azzammuhyala.github.io/pyscript
 Author: azzammuhyala

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.2}/pyscript/__main__.py

@@ -79,7 +79,7 @@ parser.add_argument(
 parser.add_argument(
     '-d', '--debug',
     action='store_true',
-    help="Set a debug flag, this will remove the assert statement"
+    help="Set a debug flag, this will ignore assert statement"
 )
 
 parser.add_argument(
@@ -121,7 +121,7 @@ def argument_error(argument, message):
 args = parser.parse_args(split_argv())
 
 if args.highlight and args.file is None:
-    argument_error("-l/--highlight", "argument 'file' required")
+    argument_error("-l/--highlight", "argument 'file' is required")
 
 if args.py_recursion is not None:
     try:
@@ -189,14 +189,17 @@ if args.file is not None:
             flags=flags
         )
 
-        if args.inspect:
-            code = pys_shell(
-                globals=result.context.symbol_table,
-                flags=result.context.flags,
-                parser_flags=result.parser_flags
-            )
-        else:
-            code = result.end_process()[0]
+        code, _ = result.end_process()
+
+        if args.inspect and not (sys.stdout.closed or sys.stderr.closed):
+            if sys.stdin.closed:
+                print("Can't run interactive shell: sys.stdin closed", file=sys.stderr)
+            else:
+                code = pys_shell(
+                    globals=result.context.symbol_table,
+                    flags=result.context.flags,
+                    parser_flags=result.parser_flags
+                )
 
 elif args.command is not None:
     file = PysFileBuffer(args.command)

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.2}/pyscript/core/exceptions.py

@@ -43,9 +43,9 @@ class PysTraceback(Pys):
         position = self.position
 
         if colored := not (context.flags & NO_COLOR):
-            reset = ACOLORS['reset']
-            magenta = ACOLORS['magenta']
-            bmagenta = ACOLORS['bold-magenta']
+            reset = ACOLORS('reset')
+            magenta = ACOLORS('magenta')
+            bmagenta = ACOLORS('bold-magenta')
         else:
             reset = ''
             magenta = ''

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.2}/pyscript/core/highlight.py

@@ -57,7 +57,7 @@ try:
     ])
 
     _keywords = '|'.join(_set_keywords)
-    _unicode_name = f'[{xid_start}][{xid_continue}]'
+    _unicode_name = f'[{xid_start}][{xid_continue}]*'
     _dollar_prefix = r'(?:\$(?:[^\S\r\n]*))?'
     _raw_string_prefixes = r'((?:R|r|BR|RB|Br|rB|Rb|bR|br|rb))'
     _string_prefixes = r'((?:B|b)?)'
@@ -184,14 +184,14 @@ try:
 
                 # Class definition
                 (
-                    rf'\b({KEYWORDS["class"]})\b(\s*)(?!{_keywords})({_dollar_prefix}\b{_unicode_name}*)\b',
+                    rf'\b({KEYWORDS["class"]})\b(\s+)(?!{_keywords})({_dollar_prefix}{_unicode_name})',
                     bygroups(Keyword.Constant, Whitespace, Name.Class)
                 ),
 
                 # Function definition
                 (
-                    rf'\b({KEYWORDS["def"]}|{KEYWORDS["define"]}|{KEYWORDS["func"]}|{KEYWORDS["function"]})\b(\s*)'
-                    rf'(?!{_keywords})({_dollar_prefix}\b{_unicode_name}*)\b',
+                    rf'\b({KEYWORDS["def"]}|{KEYWORDS["define"]}|{KEYWORDS["func"]}|{KEYWORDS["function"]})\b(\s+)'
+                    rf'(?!{_keywords})({_dollar_prefix}{_unicode_name})',
                     bygroups(Keyword.Constant, Whitespace, Name.Function)
                 ),
 
@@ -200,21 +200,27 @@ try:
 
                 # Built-in types and exceptions
                 (
-                    rf'{_dollar_prefix}(?:{"|".join(_builtin_types)})\b',
+                    rf'{_dollar_prefix}(?:{"|".join(_builtin_types)})',
                     Name.Class.Builtin
                 ),
 
                 # Built-in functions
                 (
-                    rf'{_dollar_prefix}{_unicode_name}*(?=\s*\()|\b(?:{"|".join(_builtin_functions)})\b',
+                    rf'{_dollar_prefix}(?:{"|".join(_builtin_functions)})',
                     Name.Function.Builtin
                 ),
 
+                # Function calls
+                (
+                    rf'{_dollar_prefix}{_unicode_name}(?=\s*\()',
+                    Name.Function
+                ),
+
                 # Constants
-                (rf'{_dollar_prefix}\b(?:[A-Z_]*[A-Z][A-Z0-9_]*)\b', Name.Constant),
+                (rf'{_dollar_prefix}(?:[A-Z_]*[A-Z][A-Z0-9_]*)', Name.Constant),
 
                 # Variables
-                (rf'{_dollar_prefix}\b{_unicode_name}*\b', Name.Variable),
+                (rf'{_dollar_prefix}{_unicode_name}', Name.Variable),
 
                 # Whitespaces
                 (r'\s+', Whitespace),
@@ -229,7 +235,7 @@ try:
 
                 # Invalid tokens
                 (r'\\.', Error),
-                (rf'{_dollar_prefix[:-1]}.', Error)
+                (r'\$(?:[^\S\r\n]*)(.?)', Error)
             ],
 
             'code-tags': [