pyscript-programming-language 1.2.1__tar.gz → 1.2.3__tar.gz

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/MANIFEST.in

@@ -1,3 +1,4 @@
+include changelog.md
 include MANIFEST.in
 include PyScript.png
 include setup.py

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.2.1
+Version: 1.2.3
 Summary: PyScript Programming Language
 Home-page: https://github.com/azzammuhyala/pyscript
 Author: azzammuhyala
@@ -29,10 +29,10 @@ Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary
 
-# PyScript Language📖
+# PyScript
 
 <p align="center">
-    <img src="PyScript.png" alt="PyScript Logo" width="200">
+    <img src="https://github.com/azzammuhyala/pyscript/blob/main/PyScript.png?raw=true" alt="PyScript Logo" width="200">
 </p>
 
 PyScript adalah bahasa pemprograman sederhana yang dibuat di atas bahasa Python. Bahasa ini mengabungkan beberapa sintaks dari Python dan JavaScript, jadi bagi Anda yang sudah familiar dengan sintaks Python atau JavaScript atau keduanya pasti seharusnya cukup mudah mempelajari bahasa ini.
@@ -269,7 +269,7 @@ Anda sudah sampai akhir, harusnya Anda sudah cukup bisa menulis dan memahami syn
 2. Buat program untuk mencari nilai faktorial.
 3. Buat program untuk mencari nilai fibonaci.
 4. Buat program gim sederhana yakni tebak angka.
-5. Buat program gim ular menggunakan _egine_ atau modul Python [PyGame](https://pygame.org).
+5. Buat program gim ular menggunakan _egine_ [PyGame](https://pygame.org).
 
 _Good Luck :)_
 

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/README.md

@@ -1,7 +1,7 @@
-# PyScript Language📖
+# PyScript
 
 <p align="center">
-    <img src="PyScript.png" alt="PyScript Logo" width="200">
+    <img src="https://github.com/azzammuhyala/pyscript/blob/main/PyScript.png?raw=true" alt="PyScript Logo" width="200">
 </p>
 
 PyScript adalah bahasa pemprograman sederhana yang dibuat di atas bahasa Python. Bahasa ini mengabungkan beberapa sintaks dari Python dan JavaScript, jadi bagi Anda yang sudah familiar dengan sintaks Python atau JavaScript atau keduanya pasti seharusnya cukup mudah mempelajari bahasa ini.
@@ -238,7 +238,7 @@ Anda sudah sampai akhir, harusnya Anda sudah cukup bisa menulis dan memahami syn
 2. Buat program untuk mencari nilai faktorial.
 3. Buat program untuk mencari nilai fibonaci.
 4. Buat program gim sederhana yakni tebak angka.
-5. Buat program gim ular menggunakan _egine_ atau modul Python [PyGame](https://pygame.org).
+5. Buat program gim ular menggunakan _egine_ [PyGame](https://pygame.org).
 
 _Good Luck :)_
 

pyscript_programming_language-1.2.3/changelog.md

@@ -0,0 +1,28 @@
+# Change Log
+
+## [1.2.3] - 12-10-2025
+
+### Added
+- `qualname` on `pyscript.core.context.PysContext`.
+- Flag `COMMENT` (replace `allowed_comment_token` on `pyscript.core.lexer.PysLexer`).
+
+### Fixed
+- `pyscript.__main__` improvements.
+- `pyscript.core.exceptions` improvements.
+- `pyscript.core.handlers` improvements.
+- `pyscript.core.objects` improvements.
+- `pyscript.core.buffer.PysCode` object are moved to `pyscript.core.objects`
+- `pyscript.core.interpreter.PysInterpreter` improvements.
+- `pyscript.core.lexer.PysLexer` improvements.
+- `pyscript.core.parser.PysParser` improvements.
+- `pyscript.core.position.PysPosition` improvements.
+- `pyscript.core.results.PysExecuteResult` improvements.
+- `pyscript.core.utils.format_highlighted_text_with_arrow` function are moved to `pyscript.core.position.PysPosition`
+  A.K.A function method with name `format_arrow`.
+- `pyscript.core.utils.generate_string_traceback` function are moved to `pyscript.core.exceptions.PysException`
+  A.K.A function method with name `string_traceback`.
+- Name changes on all objects in `pyscript.core.singletons`.
+
+### Removed
+- Function `pyscript.core.utils.get_line_column_by_index`
+- Function `pyscript.code.utils.sanitize_newline`.

pyscript_programming_language-1.2.3/pyscript/__init__.py

@@ -0,0 +1,33 @@
+"""
+PyScript is a programming language written in Python. \
+This language is not isolated and is directly integrated with the Python's library and namespace levels.
+"""
+
+import sys
+
+if sys.version_info < (3, 5):
+    raise ImportError("Python version 3.5 and above is required to run PyScript")
+
+from . import core
+
+from .core.constants import DEFAULT, OPTIMIZE, SILENT, RETRES, COMMENT, REVERSE_POW_XOR
+from .core.highlight import HLFMT_HTML, HLFMT_ANSI, pys_highlight
+from .core.runner import pys_exec, pys_eval
+from .core.version import __version__, __date__
+
+__all__ = [
+    'core',
+    'DEFAULT',
+    'OPTIMIZE',
+    'SILENT',
+    'RETRES',
+    'COMMENT',
+    'REVERSE_POW_XOR',
+    'HLFMT_HTML',
+    'HLFMT_ANSI',
+    'pys_highlight',
+    'pys_exec',
+    'pys_eval'
+]
+
+del sys

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/__init__.pyi

@@ -4,6 +4,7 @@ if TYPE_CHECKING:
     from .core.buffer import PysFileBuffer
     from .core.highlight import _HighlightFormatter
     from .core.position import PysPosition
+    from .core.results import PysExecuteResult
     from .core.symtab import PysSymbolTable
 
     from io import IOBase
@@ -14,6 +15,8 @@ DEFAULT: int
 OPTIMIZE: int
 SILENT: int
 RETRES: int
+COMMENT: int
+REVERSE_POW_XOR: int
 
 HLFMT_HTML: _HighlightFormatter
 HLFMT_ANSI: _HighlightFormatter
@@ -38,13 +41,13 @@ def pys_exec(
     source: Union[str, bytes, bytearray, IOBase, PysFileBuffer],
     globals: Optional[Union[Dict[str, Any], PysSymbolTable]] = None,
     flags: int = DEFAULT
-) -> None: ...
+) -> Union[None, PysExecuteResult]: ...
 
 def pys_eval(
     source: Union[str, bytes, bytearray, IOBase, PysFileBuffer],
     globals: Optional[Union[Dict[str, Any], PysSymbolTable]] = None,
     flags: int = DEFAULT
-) -> Any: ...
+) -> Union[Any, PysExecuteResult]: ...
 
 __version__: str
 __date__: str

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/__main__.py

@@ -60,6 +60,7 @@ args = parser.parse_args()
 if args.highlight and args.file is None:
     parser.error("file path require")
 
+code = 0
 flags = DEFAULT
 
 if args.optimize:
@@ -113,9 +114,10 @@ if args.file is not None:
         code = handle_execute(result)
 
         if args.inspect:
-            pys_shell(flags=flags, future=result.future, symbol_table=result.context.symbol_table)
-        else:
-            exit(code)
+            code = pys_shell(
+                symbol_table=result.context.symbol_table,
+                flags=result.flags
+            )
 
 elif args.command is not None:
     file = PysFileBuffer(args.command)
@@ -123,16 +125,16 @@ elif args.command is not None:
     symtab = build_symbol_table(file)
     symtab.set('__name__', '__main__')
 
-    exit(
-        handle_execute(
-            pys_runner(
-                file=file,
-                mode='exec',
-                symbol_table=symtab,
-                flags=flags
-            )
+    code = handle_execute(
+        pys_runner(
+            file=file,
+            mode='exec',
+            symbol_table=symtab,
+            flags=flags
         )
     )
 
 else:
-    pys_shell(flags=flags)
+    code = pys_shell(flags=flags)
+
+sys.exit(code)

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/core/buffer.py

@@ -22,10 +22,4 @@ class PysFileBuffer(PysBuffer):
             self.name = '<string>' if name is None else to_str(name)
 
     def __repr__(self):
-        return '<FileBuffer from {!r}>'.format(self.name)
-
-class PysCode(PysBuffer):
-
-    def __init__(self, **kwargs):
-        for key, value in kwargs.items():
-            setattr(self, key, value)
+        return '<FileBuffer from {!r}>'.format(self.name)

pyscript_programming_language-1.2.3/pyscript/core/cache.py

@@ -0,0 +1,8 @@
+from .singletons import PysHook
+
+loading_modules = set()
+library = set()
+modules = {}
+hook = PysHook()
+
+del PysHook

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/core/constants.py

@@ -128,9 +128,13 @@ HIGHLIGHT = {
     'comment': '#549952'
 }
 
+# python extensions file
+PYTHON_EXTENSIONS = {'.ipy', '.py', '.pyc', '.pyi', '.pyo', '.pyp', '.pyw', '.pyz', '.pyproj', '.rpy', '.xpy'}
+
 # flags
 DEFAULT = 0
 OPTIMIZE = 1 << 1
 SILENT = 1 << 2
 RETRES = 1 << 3
-REVERSE_POW_XOR = 1 << 25
+COMMENT = 1 << 4
+REVERSE_POW_XOR = 1 << 20

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/core/context.py

@@ -2,9 +2,10 @@ from .bases import Pys
 
 class PysContext(Pys):
 
-    def __init__(self, name, file, symbol_table=None, parent=None, parent_entry_position=None):
-        self.name = name
+    def __init__(self, file, name=None, qualname=None, symbol_table=None, parent=None, parent_entry_position=None):
         self.file = file
+        self.name = name
+        self.qualname = qualname
         self.symbol_table = symbol_table
         self.parent = parent
         self.parent_entry_position = parent_entry_position

pyscript_programming_language-1.2.3/pyscript/core/exceptions.py

@@ -0,0 +1,79 @@
+from .bases import Pys
+from .utils import space_indent
+
+class PysException(Pys):
+
+    def __init__(self, exception, context, position):
+        self.exception = exception
+        self.context = context
+        self.position = position
+
+    def __str__(self):
+        return str(self.exception)
+
+    def __repr__(self):
+        return '<Exception of {!r}>'.format(self.exception)
+
+    def string_traceback(self):
+        frames = []
+
+        context = self.context
+        position = self.position
+
+        while context:
+            frames.append(
+                '  File "{}", line {}{}\n{}'.format(
+                    position.file.name,
+                    position.start_line,
+                    '' if context.name is None else ', in {}'.format(context.name),
+                    space_indent(position.format_arrow(), 4)
+                )
+            )
+
+            position = context.parent_entry_position
+            context = context.parent
+
+        found_duplicated_frame = 0
+        strings_traceback = ''
+        last_frame = ''
+
+        for frame in reversed(frames):
+            if frame == last_frame:
+                found_duplicated_frame += 1
+
+            else:
+                if found_duplicated_frame > 0:
+                    strings_traceback += '  [Previous line repeated {} more times]\n'.format(found_duplicated_frame)
+                    found_duplicated_frame = 0
+
+                strings_traceback += frame + '\n'
+                last_frame = frame
+
+        if found_duplicated_frame > 0:
+            strings_traceback += '  [Previous line repeated {} more times]\n'.format(found_duplicated_frame)
+
+        result = 'Traceback (most recent call last):\n' + strings_traceback
+
+        if isinstance(self.exception, type):
+            return result + self.exception.__name__
+        else:
+            message = str(self.exception)
+            return '{}{}{}'.format(result, type(self.exception).__name__, ': ' + message if message else '')
+
+class PysShouldReturn(Pys, BaseException):
+
+    def __init__(self, result):
+        super().__init__()
+        self.result = result
+
+    def __str__(self):
+        if self.result.error is None:
+            return '<signal>'
+
+        exception = self.result.error.exception
+
+        if isinstance(exception, type):
+            return exception.__name__
+        else:
+            message = str(exception)
+            return type(exception).__name__ + (': ' + message if message else '')

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/core/handlers.py

@@ -1,7 +1,9 @@
 from .cache import hook
 from .exceptions import PysException, PysShouldReturn
-from .objects import PysChainFunction, PysFunction
-from .utils import is_object_of
+from .objects import PysPythonFunction, PysFunction
+from .position import PysPosition
+from .results import PysRunTimeResult
+from .utils import is_object_of, print_traceback
 
 from contextlib import contextmanager
 from types import MethodType
@@ -21,28 +23,22 @@ def handle_call(object, context, position, flags):
         object.__code__.position = position
         object.__code__.flags = flags
 
-    elif isinstance(object, PysChainFunction):
+    elif isinstance(object, PysPythonFunction):
         object.__code__.context = context
         object.__code__.position = position
         object.__code__.flags = flags
 
-    elif isinstance(object, MethodType) and isinstance(object.__func__, PysFunction):
-        object.__func__.__code__.call_context = context
-        object.__func__.__code__.position = position
-        object.__func__.__code__.flags = flags
-
     elif isinstance(object, type):
+        for call in ('__new__', '__init__'):
+            handle_call(getattr(object, call, None), context, position, flags)
 
-        for call in ('__init__', '__new__'):
-            fn = getattr(object, call, None)
-
-            if isinstance(fn, PysFunction):
-                fn.__code__.call_context = context
-                fn.__code__.position = position
-                fn.__code__.flags = flags
+    elif isinstance(object, MethodType):
+        handle_call(object.__func__, context, position, flags)
 
 def handle_execute(result):
-    try:
+    result_runtime = PysRunTimeResult()
+
+    with handle_exception(result_runtime, result.context, PysPosition(result.context.file, 0, 0)):
 
         if result.error:
             if is_object_of(result.error.exception, SystemExit):
@@ -51,10 +47,15 @@ def handle_execute(result):
                 hook.exception(result.error)
             return 1
 
-        elif len(result.result) == 1 and hook.display is not None:
-            hook.display(result.result[0])
+        elif hook.display is not None:
+            if result.mode == 'exec' and len(result.value) == 1:
+                hook.display(result.value[0])
+            elif result.mode == 'eval':
+                hook.display(result.value)
 
-    except:
+    if result_runtime.should_return():
+        if result_runtime.error:
+            print_traceback(result_runtime.error)
         return 1
 
     return 0

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.3}/pyscript/core/highlight.py

@@ -1,10 +1,10 @@
 from .bases import Pys
 from .buffer import PysFileBuffer
-from .constants import TOKENS, KEYWORDS, HIGHLIGHT, DEFAULT, SILENT
+from .constants import TOKENS, KEYWORDS, HIGHLIGHT, SILENT, COMMENT
 from .lexer import PysLexer
 from .position import PysPosition
 from .pysbuiltins import pys_builtins
-from .utils import parenthesises_map, sanitize_newline
+from .utils import parenthesises_map
 
 from html import escape as html_escape
 
@@ -19,10 +19,7 @@ class _HighlightFormatter(Pys):
         self._type = 'start'
         self._open = False
 
-    def __call__(self, *args, **kwargs):
-        return self.formater(*args, **kwargs)
-
-    def formater(self, type, position, content):
+    def __call__(self, type, position, content):
         contented = self.content_block(position, content)
         result = ''
 
@@ -38,6 +35,8 @@ class _HighlightFormatter(Pys):
                 result += self.close_block(position, self._type)
                 self._open = False
 
+            type = 'start'
+
         elif type == self._type and self._open:
             result += contented
 
@@ -63,20 +62,20 @@ def _ansi_open_block(position, type):
     )
 
 HLFMT_HTML = _HighlightFormatter(
-    lambda position, content: sanitize_newline('<br>', html_escape(content)),
+    lambda position, content: '<br>'.join(html_escape(content).splitlines()),
     lambda position, type: '<span style="color:{}">'.format(HIGHLIGHT.get(type, 'default')),
     lambda position, type: '</span>',
     lambda position: '<br>'
 )
 
 HLFMT_ANSI = _HighlightFormatter(
-    lambda position, content: sanitize_newline('\n', content),
+    lambda position, content: content,
     _ansi_open_block,
     lambda position, type: '\x1b[0m',
     lambda position: '\n'
 )
 
-def pys_highlight(source, format=None, max_parenthesis_level=3, flags=DEFAULT):
+def pys_highlight(source, format=None, max_parenthesis_level=3, flags=COMMENT):
     """
     Highlight a PyScript code from source given.
 
@@ -103,7 +102,10 @@ def pys_highlight(source, format=None, max_parenthesis_level=3, flags=DEFAULT):
     elif max_parenthesis_level < 0:
         raise ValueError("pys_highlight(): max_parenthesis_level must be grather than 0")
 
-    lexer = PysLexer(file, allowed_comment_token=True)
+    if not isinstance(flags, int):
+        raise TypeError("pys_highlight(): flags must be integer")
+
+    lexer = PysLexer(file=file, flags=flags)
     tokens, error = lexer.make_tokens()
 
     if error and not (flags & SILENT):