pyscript-programming-language 1.6.0__tar.gz → 1.6.1__tar.gz

{pyscript_programming_language-1.6.0/pyscript_programming_language.egg-info → pyscript_programming_language-1.6.1}/PKG-INFO

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

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/__init__.py

@@ -8,10 +8,10 @@ if __import__('sys').version_info < (3, 10):
 
 from . import core
 
-from .core.constants import DEFAULT, DEBUG, SILENT, RETRES, COMMENT, NO_COLOR, REVERSE_POW_XOR
+from .core.constants import DEFAULT, DEBUG, SILENT, RETRES, HIGHLIGHT, NO_COLOR, REVERSE_POW_XOR
 from .core.cache import undefined
 from .core.highlight import HLFMT_HTML, HLFMT_ANSI, HLFMT_BBCODE, pys_highlight
-from .core.runner import pys_exec, pys_eval, pys_shell
+from .core.runner import pys_exec, pys_eval, pys_require, pys_shell
 from .core.version import version_info, __version__, __date__
 
 __all__ = (
@@ -20,7 +20,7 @@ __all__ = (
     'DEBUG',
     'SILENT',
     'RETRES',
-    'COMMENT',
+    'HIGHLIGHT',
     'NO_COLOR',
     'REVERSE_POW_XOR',
     'HLFMT_HTML',
@@ -31,5 +31,6 @@ __all__ = (
     'pys_highlight',
     'pys_exec',
     'pys_eval',
+    'pys_require',
     'pys_shell'
 )

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/__init__.pyi

@@ -10,6 +10,7 @@ if TYPE_CHECKING:
     from .core.version import PysVersionInfo
 
     from io import IOBase
+    from types import ModuleType
 
 from . import core as core
 
@@ -17,7 +18,7 @@ DEFAULT: int
 DEBUG: int
 SILENT: int
 RETRES: int
-COMMENT: int
+HIGHLIGHT: int
 NO_COLOR: int
 REVERSE_POW_XOR: int
 
@@ -35,9 +36,9 @@ def pys_highlight(
             [
                 str | Literal[
                     'start',
-                    'bracket-unmatch',
-                    'identifier', 'identifier-const', 'identifier-call', 'identifier-class',
-                    'keyword', 'keyword-identifier',
+                    'invalid',
+                    'identifier', 'identifier-constant', 'identifier-function', 'identifier-type',
+                    'keyword', 'keyword-constant',
                     'number', 'string', 'comment', 'newline',
                     'default',
                     'end'
@@ -48,8 +49,7 @@ def pys_highlight(
             str
         ]
     ] = None,
-    max_parenthesis_level: int = 3,
-    flags: int = DEFAULT
+    max_parenthesis_level: int = 3
 ) -> str: ...
 
 def pys_exec(
@@ -64,6 +64,10 @@ def pys_eval(
     flags: int = DEFAULT
 ) -> Any | PysExecuteResult: ...
 
+def pys_require(
+    name: str | bytes
+) -> ModuleType | Any: ...
+
 def pys_shell(
     globals: Optional[dict[str, Any] | PysSymbolTable | PysUndefined] = None,
     flags: int = DEFAULT

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/__main__.py

@@ -5,16 +5,22 @@ from .core.handlers import handle_execute
 from .core.highlight import HLFMT_HTML, HLFMT_ANSI, HLFMT_BBCODE, pys_highlight
 from .core.runner import pys_runner, pys_shell
 from .core.symtab import new_symbol_table
-from .core.utils.module import get_module_name_from_path, set_python_path
-from .core.utils.path import getcwd, normpath
+from .core.utils.module import get_module_name_from_path
+from .core.utils.path import normpath
 from .core.version import __version__
 
 from argparse import ArgumentParser
 from sys import executable, stderr, version_info, exit, setrecursionlimit
 
+FORMAT_HIGHLIGHT_MAP = {
+    'html': HLFMT_HTML,
+    'ansi': HLFMT_ANSI,
+    'bbcode': HLFMT_BBCODE
+}
+
 parser = ArgumentParser(
-    prog=get_module_name_from_path(executable) + ' -m pyscript',
-    description='PyScript Launcher for Python Version ' + '.'.join(map(str, version_info))
+    prog=f'{get_module_name_from_path(executable)} -m pyscript',
+    description=f'PyScript Launcher for Python Version {".".join(map(str, version_info))}'
 )
 
 parser.add_argument(
@@ -52,7 +58,7 @@ parser.add_argument(
 
 parser.add_argument(
     '-l', '--highlight',
-    choices=('html', 'ansi', 'bbcode'),
+    choices=tuple(FORMAT_HIGHLIGHT_MAP.keys()),
     default=None,
     help='generate PyScript highlight code from a file'
 )
@@ -93,8 +99,6 @@ if args.debug:
 if args.no_color:
     flags |= NO_COLOR
 
-set_python_path(getcwd())
-
 if args.file is not None:
     path = normpath(args.file)
 
@@ -117,16 +121,10 @@ if args.file is not None:
         parser.error(f"file {path!r}: Unexpected error: {e}")
 
     if args.highlight:
-        format_map = {
-            'html': HLFMT_HTML,
-            'ansi': HLFMT_ANSI,
-            'bbcode': HLFMT_BBCODE
-        }
-
         try:
-            print(pys_highlight(file, format_map[args.highlight]))
+            print(pys_highlight(file, FORMAT_HIGHLIGHT_MAP.get(args.highlight, None)))
         except BaseException as e:
-            parser.error(f"file {path!r}: Tokenize error: {e}")
+            parser.error(f"file {path!r}: Highlight error: {e}")
 
     else:
         result = pys_runner(

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/analyzer.py

@@ -2,7 +2,7 @@ from .bases import Pys
 from .checks import is_assign, is_incremental
 from .constants import TOKENS, DEFAULT
 from .context import PysContext
-from .exceptions import PysException
+from .exceptions import PysTraceback
 from .nodes import PysNode, PysKeywordNode, PysIdentifierNode, PysAttributeNode, PysSubscriptNode
 from .position import PysPosition
 from .utils.decorators import typechecked
@@ -27,7 +27,7 @@ class PysAnalyzer(Pys):
 
     def throw(self, message, position):
         if self.error is None:
-            self.error = PysException(
+            self.error = PysTraceback(
                 SyntaxError(message),
                 PysContext(
                     file=self.node.position.file,
@@ -39,7 +39,7 @@ class PysAnalyzer(Pys):
             )
 
     @typechecked
-    def analyze(self) -> PysException | None:
+    def analyze(self) -> PysTraceback | None:
         self.in_loop = 0
         self.in_function = 0
         self.in_switch = 0

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/checks.py

@@ -41,10 +41,10 @@ is_left_parenthesis = frozenset(PARENTHESISES_MAP.keys()).__contains__
 is_right_parenthesis = frozenset(PARENTHESISES_MAP.values()).__contains__
 is_parenthesis = frozenset(PARENTHESISES_MAP.keys() | PARENTHESISES_MAP.values()).__contains__
 
-is_keyword_identifiers = frozenset([
+is_constant_keywords = frozenset([
     KEYWORDS['__debug__'], KEYWORDS['of'], KEYWORDS['in'], KEYWORDS['is'], KEYWORDS['and'], KEYWORDS['or'],
-    KEYWORDS['not'], KEYWORDS['False'], KEYWORDS['None'], KEYWORDS['True'], KEYWORDS['false'], KEYWORDS['none'],
-    KEYWORDS['true']
+    KEYWORDS['not'], KEYWORDS['False'], KEYWORDS['None'], KEYWORDS['True'], KEYWORDS['class'], KEYWORDS['false'],
+    KEYWORDS['func'], KEYWORDS['function'], KEYWORDS['global'], KEYWORDS['none'], KEYWORDS['true']
 ]).__contains__
 
 is_private_attribute = lambda name : name.startswith('_')

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/constants.py

@@ -84,6 +84,7 @@ TOKENS = MappingProxyType({
     'EQUAL-DOUBLE-SLASH': ord('/') + DOUBLE + WITH_EQUAL,
     'EQUAL-DOUBLE-LESS-THAN': ord('<') + DOUBLE + WITH_EQUAL,
     'EQUAL-DOUBLE-GREATER-THAN': ord('>') + DOUBLE + WITH_EQUAL,
+    'NONE': SPECIAL,
     'EXCLAMATION-TILDE': ord('~') + SPECIAL
 })
 
@@ -93,9 +94,6 @@ KEYWORDS = MappingProxyType({
     'False': 'False',
     'None': 'None',
     'True': 'True',
-    'false': 'false',
-    'none': 'none',
-    'true': 'true',
     'and': 'and',
     'as': 'as',
     'assert': 'assert',
@@ -111,6 +109,7 @@ KEYWORDS = MappingProxyType({
     'elif': 'elif',
     'else': 'else',
     'extends': 'extends',
+    'false': 'false',
     'finally': 'finally',
     'for': 'for',
     'from': 'from',
@@ -121,7 +120,9 @@ KEYWORDS = MappingProxyType({
     'import': 'import',
     'in': 'in',
     'is': 'is',
+    'none': 'none',
     'not': 'not',
+    'true': 'true',
     'of': 'of',
     'or': 'or',
     'return': 'return',
@@ -137,6 +138,6 @@ DEFAULT = 0
 DEBUG = 1 << 0
 SILENT = 1 << 1
 RETRES = 1 << 2
-COMMENT = 1 << 3
+HIGHLIGHT = 1 << 3
 NO_COLOR = 1 << 4
 REVERSE_POW_XOR = 1 << 5

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/exceptions.py

@@ -6,7 +6,7 @@ from .utils.generic import setimuattr
 from .utils.string import indent
 
 @immutable
-class PysException(Pys):
+class PysTraceback(Pys):
 
     __slots__ = ('exception', 'context', 'position', 'cause', 'directly')
 
@@ -18,7 +18,7 @@ class PysException(Pys):
         setimuattr(self, 'directly', directly)
 
     def __repr__(self):
-        return f'<Exception of {self.exception!r}>'
+        return f'<traceback of exception {self.exception!r}>'
 
     def string_traceback(self):
         context = self.context
@@ -110,6 +110,5 @@ class PysSignal(Pys, BaseException):
 
         if isinstance(exception, type):
             return exception.__name__
-
         message = str(exception)
         return type(exception).__name__ + (f': {message}' if message else '')

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/handlers.py

@@ -1,6 +1,6 @@
 from .cache import lock, hook
 from .constants import PYSCRIPT_GIL
-from .exceptions import PysException, PysSignal
+from .exceptions import PysTraceback, PysSignal
 from .objects import PysPythonFunction, PysFunction
 from .position import PysPosition
 from .results import PysRunTimeResult
@@ -31,7 +31,7 @@ class handle_exception:
             self.result.register(exc_val.result) \
             if exc_type is PysSignal else \
             self.result.failure(
-                PysException(
+                PysTraceback(
                     exc_type if exc_val is None else exc_val,
                     self.context,
                     self.position

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/highlight.py

@@ -1,7 +1,7 @@
 from .bases import Pys
 from .buffer import PysFileBuffer
-from .checks import is_left_parenthesis, is_right_parenthesis, is_parenthesis, is_keyword_identifiers
-from .constants import TOKENS, KEYWORDS, DEFAULT, SILENT, COMMENT
+from .checks import is_left_parenthesis, is_right_parenthesis, is_parenthesis, is_constant_keywords
+from .constants import TOKENS, KEYWORDS, HIGHLIGHT
 from .lexer import PysLexer
 from .mapping import PARENTHESISES_MAP, HIGHLIGHT_MAP
 from .position import PysPosition
@@ -92,8 +92,7 @@ HLFMT_BBCODE = _HighlightFormatter(
 def pys_highlight(
     source,
     format: Optional[Callable[[str, PysPosition, str], str]] = None,
-    max_parenthesis_level: int = 3,
-    flags: int = DEFAULT
+    max_parenthesis_level: int = 3
 ) -> str:
     """
     Highlight a PyScript code from source given.
@@ -105,8 +104,6 @@ def pys_highlight(
     format: A function to format the code form.
 
     max_parenthesis_level: Maximum difference level of parentheses (with circular indexing).
-
-    flags: A special flags.
     """
 
     file = PysFileBuffer(source)
@@ -119,13 +116,12 @@ def pys_highlight(
 
     lexer = PysLexer(
         file=file,
-        flags=flags | COMMENT
+        flags=HIGHLIGHT
     )
 
-    tokens, error = lexer.make_tokens()
-    if error and not (flags & SILENT):
-        raise error.exception
+    tokens, _ = lexer.make_tokens()
 
+    text = file.text
     result = ''
     last_index_position = 0
     parenthesis_level = 0
@@ -135,8 +131,6 @@ def pys_highlight(
         TOKENS['RIGHT-CURLY']: 0
     }
 
-    text = file.text
-
     for i, token in enumerate(tokens):
         ttype = token.type
         tvalue = token.value
@@ -149,54 +143,58 @@ def pys_highlight(
             type_fmt = 'end'
 
         elif ttype == TOKENS['KEYWORD']:
-            type_fmt = 'keyword-identifier' if is_keyword_identifiers(tvalue) else 'keyword'
-
-        elif ttype == TOKENS['NUMBER']:
-            type_fmt = 'number'
-
-        elif ttype == TOKENS['STRING']:
-            type_fmt = 'string'
+            type_fmt = 'keyword-constant' if is_constant_keywords(tvalue) else 'keyword'
 
         elif ttype == TOKENS['IDENTIFIER']:
             obj = pys_builtins.__dict__.get(tvalue, None)
 
             if isinstance(obj, type):
-                type_fmt = 'identifier-class'
-
+                type_fmt = 'identifier-type'
             elif callable(obj):
-                type_fmt = 'identifier-call'
+                type_fmt = 'identifier-function'
 
             else:
-                type_fmt = 'identifier-const' if tvalue.isupper() else 'identifier'
-
-                j = i + 1
-                if (j < len(tokens) and tokens[j].type == TOKENS['LEFT-PARENTHESIS']):
-                    type_fmt = 'identifier-call'
-
                 j = i - 1
-                while j > 0 and tokens[j].type == TOKENS['NEWLINE']:
+                while j > 0 and tokens[j].type in (TOKENS['NEWLINE'], TOKENS['COMMENT']):
                     j -= 1
 
-                if tokens[j].match(TOKENS['KEYWORD'], KEYWORDS['class']):
-                    type_fmt = 'identifier-class'
-                elif tokens[j].matches(TOKENS['KEYWORD'], (KEYWORDS['func'], KEYWORDS['function'])):
-                    type_fmt = 'identifier-call'
+                previous_token = tokens[j]
+                if previous_token.match(TOKENS['KEYWORD'], KEYWORDS['class']):
+                    type_fmt = 'identifier-type'
+                elif previous_token.matches(TOKENS['KEYWORD'], (KEYWORDS['func'], KEYWORDS['function'])):
+                    type_fmt = 'identifier-function'
+
+                else:
+                    j = i + 1
+                    if (j < len(tokens) and tokens[j].type == TOKENS['LEFT-PARENTHESIS']):
+                        type_fmt = 'identifier-function'
+                    else:
+                        type_fmt = 'identifier-constant' if tvalue.isupper() else 'identifier'
+
+        elif ttype == TOKENS['NUMBER']:
+            type_fmt = 'number'
+
+        elif ttype == TOKENS['STRING']:
+            type_fmt = 'string'
+
+        elif ttype == TOKENS['NEWLINE']:
+            type_fmt = 'newline'
+
+        elif ttype == TOKENS['COMMENT']:
+            type_fmt = 'comment'
 
         elif is_parenthesis(ttype):
-            type_fmt = 'parenthesis-{}'.format(
-                'unmatch'
+            type_fmt = (
+                'invalid'
                 if
                     parenthesises_level[PARENTHESISES_MAP.get(ttype, ttype)] < 0 or
                     parenthesis_level < 0
                 else
-                parenthesis_level % max_parenthesis_level
+                f'brackets-{parenthesis_level % max_parenthesis_level}'
             )
 
-        elif ttype == TOKENS['NEWLINE']:
-            type_fmt = 'newline'
-
-        elif ttype == TOKENS['COMMENT']:
-            type_fmt = 'comment'
+        elif ttype == TOKENS['NONE']:
+            type_fmt = 'invalid'
 
         else:
             type_fmt = 'default'

{pyscript_programming_language-1.6.0 → pyscript_programming_language-1.6.1}/pyscript/core/interpreter.py

@@ -1,8 +1,8 @@
 from .constants import TOKENS, KEYWORDS, DEBUG
 from .cache import undefined
-from .checks import is_assign, is_python_extensions, is_equals, is_incremental, is_public_attribute
+from .checks import is_assign, is_equals, is_incremental, is_public_attribute
 from .context import PysClassContext
-from .exceptions import PysException
+from .exceptions import PysTraceback
 from .handlers import handle_exception, handle_call
 from .mapping import BINARY_FUNCTIONS_MAP, UNARY_FUNCTIONS_MAP, KEYWORDS_TO_VALUES_MAP
 from .nodes import PysNode, PysIdentifierNode, PysAttributeNode, PysSubscriptNode
@@ -14,7 +14,6 @@ from .utils.generic import setimuattr, is_object_of, get_error_args
 from .utils.similarity import get_closest
 
 from collections.abc import Iterable
-from os.path import splitext as split_file_extension
 
 KW__DEBUG__ = KEYWORDS['__debug__']
 KW_AND = KEYWORDS['and']
@@ -65,7 +64,7 @@ def visit_IdentifierNode(node, context):
             closest_symbol = find_closest(symbol_table, name)
 
             return result.failure(
-                PysException(
+                PysTraceback(
                     NameError(
                         f"name {name!r} is not defined" +
                         (
@@ -421,25 +420,18 @@ def visit_ImportNode(node, context):
 
     with handle_exception(result, context, name_position):
         name_module = tname.value
-        file, extension = split_file_extension(name_module)
+        use_python_package = False
 
-        if is_python_extensions(extension):
-            name_module = file
+        require = get_symbol('require')
+
+        if require is undefined:
             use_python_package = True
         else:
-            use_python_package = False
-
-        if not use_python_package:
-            require = get_symbol('require')
-
-            if require is undefined:
+            handle_call(require, context, name_position)
+            try:
+                module = require(name_module)
+            except ImportError:
                 use_python_package = True
-            else:
-                handle_call(require, context, name_position)
-                try:
-                    module = require(name_module)
-                except ImportError:
-                    use_python_package = True
 
         if use_python_package:
             pyimport = get_symbol('pyimport')
@@ -449,7 +441,7 @@ def visit_ImportNode(node, context):
 
                 if pyimport is undefined:
                     return result.failure(
-                        PysException(
+                        PysTraceback(
                             NameError("names 'require', 'pyimport', and '__import__' is not defined"),
                             context,
                             node.position
@@ -473,7 +465,7 @@ def visit_ImportNode(node, context):
 
                 if not isinstance(package, str):
                     return result.failure(
-                        PysException(
+                        PysTraceback(
                             TypeError(f"Item in {module.__name__}.__all__ must be str, not {type(package).__name__}"),
                             context,
                             name_position
@@ -612,7 +604,7 @@ def visit_TryNode(node, context):
 
                 if not (isinstance(error_cls, type) and issubclass(error_cls, BaseException)):
                     return result.failure(
-                        PysException(
+                        PysTraceback(
                             TypeError("catching classes that do not inherit from BaseException is not allowed"),
                             context,
                             nname.position,
@@ -677,7 +669,7 @@ def visit_WithNode(node, context):
 
             if enter is undefined:
                 return result.failure(
-                    PysException(
+                    PysTraceback(
                         TypeError(
                             f"{type(context_value).__name__!r} object does not support the context manager protocol"
                         ),
@@ -688,7 +680,7 @@ def visit_WithNode(node, context):
 
             elif exit is undefined:
                 return result.failure(
-                    PysException(
+                    PysTraceback(
                         TypeError(
                             f"{type(context_value).__name__!r} object does not support the context manager protocol "
                             "(missed __exit__ method)"
@@ -1059,7 +1051,7 @@ def visit_ThrowNode(node, context):
 
     if not is_object_of(target, BaseException):
         return result.failure(
-            PysException(
+            PysTraceback(
                 TypeError("exceptions must derive from BaseException"),
                 context,
                 ntarget.position
@@ -1073,14 +1065,14 @@ def visit_ThrowNode(node, context):
 
         if not is_object_of(cause, BaseException):
             return result.failure(
-                PysException(
+                PysTraceback(
                     TypeError("exceptions must derive from BaseException"),
                     context,
                     ncause.position
                 )
             )
 
-        cause = PysException(
+        cause = PysTraceback(
             cause,
             context,
             ncause.position
@@ -1090,7 +1082,7 @@ def visit_ThrowNode(node, context):
         cause = None
 
     return result.failure(
-        PysException(
+        PysTraceback(
             target,
             context,
             node.position,
@@ -1122,7 +1114,7 @@ def visit_AssertNode(node, context):
                         return result
 
                     return result.failure(
-                        PysException(
+                        PysTraceback(
                             AssertionError(message),
                             context,
                             node.position
@@ -1130,7 +1122,7 @@ def visit_AssertNode(node, context):
                     )
 
                 return result.failure(
-                    PysException(
+                    PysTraceback(
                         AssertionError,
                         context,
                         node.position
@@ -1162,7 +1154,7 @@ def visit_DeleteNode(node, context):
                     closest_symbol = get_closest(symbol_table.symbols.keys(), name)
 
                     return result.failure(
-                        PysException(
+                        PysTraceback(
                             NameError(
                                 (
                                     f"name {name!r} is not defined"
@@ -1286,7 +1278,7 @@ def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
                 closest_symbol = get_closest(symbol_table.symbols.keys(), name)
 
                 result.failure(
-                    PysException(
+                    PysTraceback(
                         NameError(
                             (
                                 f"name {name!r} is not defined"
@@ -1345,7 +1337,7 @@ def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
 
         if not isinstance(value, Iterable):
             return result.failure(
-                PysException(
+                PysTraceback(
                     TypeError(f"cannot unpack non-iterable {type(value).__name__} object"),
                     context,
                     position
@@ -1371,7 +1363,7 @@ def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
 
         if count < length:
             return result.failure(
-                PysException(
+                PysTraceback(
                     ValueError(f"not enough values to unpack (expected {length}, got {count})"),
                     context,
                     node.position
@@ -1380,7 +1372,7 @@ def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
 
         elif count > length:
             return result.failure(
-                PysException(
+                PysTraceback(
                     ValueError(f"to many values to unpack (expected {length})"),
                     context,
                     node.position