pyscript-programming-language 1.14.0__py3-none-any.whl → 1.15.0.dev1__py3-none-any.whl

pyscript/core/analyzer.py

@@ -102,18 +102,17 @@ class PysAnalyzer(Pys):
 
         keyword_names = set()
 
-        for element in node.arguments:
+        for argument in node.arguments:
 
-            if element.__class__ is tuple:
-                token, value = element
+            if argument.__class__ is tuple:
+                token, value = argument
                 name = token.value
                 if name in keyword_names:
                     self.throw(f"duplicate argument {name!r} in call definition", token.position)
                     return
                 keyword_names.add(name)
-
             else:
-                value = element
+                value = argument
 
             self.visit(value)
             if self.error:
@@ -163,7 +162,7 @@ class PysAnalyzer(Pys):
         self.visit_declaration_from_AssignmentNode(node.target, f"cannot {operator} literal", operator)
 
     def visit_StatementsNode(self, node: PysStatementsNode) -> None:
-        for element in node.body:
+        for element in node.elements:
             self.visit(element)
             if self.error:
                 return
@@ -179,7 +178,7 @@ class PysAnalyzer(Pys):
         self.visit(node.value)
 
     def visit_IfNode(self, node: PysIfNode) -> None:
-        for condition, body in node.cases_body:
+        for condition, body in node.cases:
             self.visit(condition)
             if self.error:
                 return
@@ -188,8 +187,8 @@ class PysAnalyzer(Pys):
             if self.error:
                 return
 
-        if node.else_body:
-            self.visit(node.else_body)
+        if node.else_:
+            self.visit(node.else_)
 
     def visit_SwitchNode(self, node: PysSwitchNode) -> None:
         self.visit(node.target)
@@ -198,8 +197,8 @@ class PysAnalyzer(Pys):
 
         self.in_switch += 1
 
-        for condition, body in node.case_cases:
-            self.visit(condition)
+        for case, body in node.cases:
+            self.visit(case)
             if self.error:
                 return
 
@@ -207,8 +206,8 @@ class PysAnalyzer(Pys):
             if self.error:
                 return
 
-        if node.default_body:
-            self.visit(node.default_body)
+        if node.default:
+            self.visit(node.default)
             if self.error:
                 return
 
@@ -220,8 +219,8 @@ class PysAnalyzer(Pys):
             if self.error:
                 return
 
-        for condition, value in node.cases:
-            self.visit(condition)
+        for case, value in node.cases:
+            self.visit(case)
             if self.error:
                 return
 
@@ -237,18 +236,18 @@ class PysAnalyzer(Pys):
         if self.error:
             return
 
-        for _, body in node.catch_cases:
+        for _, body in node.catches:
             self.visit(body)
             if self.error:
                 return
 
-        if node.else_body:
-            self.visit(node.else_body)
+        if node.else_:
+            self.visit(node.else_)
             if self.error:
                 return
 
-        if node.finally_body:
-            self.visit(node.finally_body)
+        if node.finally_:
+            self.visit(node.finally_)
 
     def visit_WithNode(self, node: PysWithNode) -> None:
         for context, _ in node.contexts:
@@ -284,8 +283,8 @@ class PysAnalyzer(Pys):
 
         self.in_loop -= 1
 
-        if node.else_body:
-            self.visit(node.else_body)
+        if node.else_:
+            self.visit(node.else_)
 
     def visit_WhileNode(self, node: PysWhileNode) -> None:
         self.visit(node.condition)
@@ -300,8 +299,8 @@ class PysAnalyzer(Pys):
 
         self.in_loop -= 1
 
-        if node.else_body:
-            self.visit(node.else_body)
+        if node.else_:
+            self.visit(node.else_)
 
     def visit_DoWhileNode(self, node: PysDoWhileNode) -> None:
         self.in_loop += 1
@@ -316,11 +315,10 @@ class PysAnalyzer(Pys):
         if self.error:
             return
 
-        if node.else_body:
-            self.visit(node.else_body)
+        if node.else_:
+            self.visit(node.else_)
 
     def visit_RepeatNode(self, node: PysRepeatNode) -> None:
-
         if node.body:
             self.in_loop += 1
 
@@ -334,8 +332,8 @@ class PysAnalyzer(Pys):
         if self.error:
             return
 
-        if node.else_body:
-            self.visit(node.else_body)
+        if node.else_:
+            self.visit(node.else_)
 
     def visit_ClassNode(self, node: PysClassNode) -> None:
         for decorator in node.decorators:
@@ -378,9 +376,9 @@ class PysAnalyzer(Pys):
 
         parameter_names = set()
 
-        for element in node.parameters:
-            is_keyword = element.__class__ is tuple
-            token = element[0] if is_keyword else element
+        for parameter in node.parameters:
+            is_keyword = parameter.__class__ is tuple
+            token = parameter[0] if is_keyword else parameter
             name = token.value
 
             if name in parameter_names:
@@ -389,7 +387,7 @@ class PysAnalyzer(Pys):
             parameter_names.add(name)
 
             if is_keyword:
-                self.visit(element[1])
+                self.visit(parameter[1])
                 if self.error:
                     return
 
@@ -464,10 +462,6 @@ class PysAnalyzer(Pys):
                 if self.error:
                     return
 
-            elif type is PysKeywordNode:
-                self.throw(f"cannot delete {target.name.value}", target.position)
-                return
-
             elif type is PysDebugNode:
                 self.throw("cannot delete to __debug__", node.position)
                 return
@@ -537,9 +531,6 @@ class PysAnalyzer(Pys):
                 if self.error:
                     return
 
-        elif type is PysKeywordNode:
-            self.throw(f"cannot {operator_name} to {node.name.value}", node.position)
-
         elif type is PysDebugNode:
             self.throw(f"cannot {operator_name} to __debug__", node.position)
 

pyscript/core/buffer.py

@@ -5,7 +5,7 @@ from .utils.string import normstr
 
 from io import IOBase
 from types import BuiltinMethodType
-from typing import Iterable, Optional, Union
+from typing import Iterable, Optional
 
 @immutable
 class PysBuffer(Pys):
@@ -17,27 +17,23 @@ class PysFileBuffer(PysBuffer):
 
     def __new__(
         cls,
-        text: Union[str, bytes, bytearray, Iterable, BuiltinMethodType, IOBase, 'PysFileBuffer'],
+        text: 'str | bytes | bytearray | Iterable | BuiltinMethodType | IOBase | PysFileBuffer',
         name: Optional[str | bytes] = None
     ) -> 'PysFileBuffer':
 
         if isinstance(text, PysFileBuffer):
             return text
-
         elif isinstance(text, IOBase):
             name = normstr(getattr(text, 'name', '<io>') if name is None else name)
             text = normstr(text)
-
         else:
             name = '<string>' if name is None else normstr(name)
             text = normstr(text)
 
-        instance = super().__new__(cls)
-
-        setimuattr(instance, 'text', text)
-        setimuattr(instance, 'name', name)
-
-        return instance
+        self = super().__new__(cls)
+        setimuattr(self, 'text', text)
+        setimuattr(self, 'name', name)
+        return self
 
     def __repr__(self) -> str:
         return f'<FileBuffer from {self.name!r}>'

pyscript/core/cache.py

@@ -18,6 +18,9 @@ pys_sys = ModuleType(
     "Python sys module."
 )
 
+def intern_object(object: Any) -> Any:
+    return pys_sys.interns.setdefault((type(object), object), object)
+
 pys_sys.__running_shell__ = False
 pys_sys.__running_breakpoint__ = False
 pys_sys.builtin_module_names = tuple(
@@ -33,6 +36,7 @@ pys_sys.singletons = {}
 pys_sys.argv = ['']
 pys_sys.encoding = 'utf-8'
 pys_sys.flags = DEFAULT
+pys_sys.intern_object = intern_object
 pys_sys.displayhook = print_display
 pys_sys.excepthook = print_traceback
 pys_sys.clearhook = clear_shell
@@ -58,9 +62,6 @@ for name in (
     if hasattr(sys, name):
         setattr(pys_sys, name, getattr(sys, name))
 
-def intern_object(object: Any) -> Any:
-    return pys_sys.interns.setdefault((type(object), object), object)
-
 # sentinel
 @singleton
 @inheritable

pyscript/core/checks.py

@@ -4,10 +4,9 @@ from .nodes import *
 from .token import TOKENS
 
 is_expression = frozenset([
-    PysNumberNode, PysStringNode, PysKeywordNode, PysDebugNode, PysIdentifierNode, PysDictionaryNode, PysSetNode,
-    PysListNode, PysTupleNode, PysAttributeNode, PysSubscriptNode, PysCallNode, PysChainOperatorNode,
-    PysTernaryOperatorNode, PysBinaryOperatorNode, PysUnaryOperatorNode, PysIncrementalNode, PysMatchNode,
-    PysFunctionNode, PysEllipsisNode
+    PysConstantNode, PysDebugNode, PysIdentifierNode, PysDictionaryNode, PysSetNode, PysListNode, PysTupleNode,
+    PysAttributeNode, PysSubscriptNode, PysCallNode, PysChainOperatorNode, PysTernaryOperatorNode,
+    PysBinaryOperatorNode, PysUnaryOperatorNode, PysIncrementalNode, PysMatchNode, PysFunctionNode, PysEllipsisNode
 ]).__contains__
 
 is_statement = frozenset([
@@ -16,31 +15,16 @@ is_statement = frozenset([
     PysAssertNode, PysDeleteNode, PysContinueNode, PysBreakNode
 ]).__contains__
 
-is_sequence = frozenset([
-    PysSetNode, PysListNode, PysTupleNode
-]).__contains__
-
-is_literal = frozenset([
-    PysNumberNode, PysStringNode
-]).__contains__
-
+is_sequence = frozenset([PysSetNode, PysListNode, PysTupleNode]).__contains__
 is_keyword = frozenset(KEYWORDS).__contains__
 is_constant_keyword = frozenset(CONSTANT_KEYWORDS).__contains__
-
-is_equal = frozenset([
-    TOKENS['EQUAL'], TOKENS['EQUAL_COLON']
-]).__contains__
+is_equal = frozenset([TOKENS['EQUAL'], TOKENS['EQUAL_COLON']]).__contains__
 
 is_blacklist_python_builtin = frozenset([
     'IndentationError', 'TabError', 'breakpoint', 'compile', 'copyright', 'credits', 'dir', 'eval', 'exec', 'help',
     'globals', 'license', 'locals', 'vars'
 ]).__contains__
 
-is_python_extension = frozenset([
-    '.cgi', '.fcgi', '.gyp', '.gypi', '.ipy', '.lmi', '.pxd', '.pxi', '.py', '.py3', '.pyc', '.pyd', '.pyde', '.pyi',
-    '.pyo', '.pyp', '.pyproj', '.pyt', '.pyw', '.pyx', '.pyz', '.rpy', '.spec', '.tac', '.wsgi', '.xpy'
-]).__contains__
-
 is_left_bracket = frozenset(BRACKETS_MAP.keys()).__contains__
 is_right_bracket = frozenset(BRACKETS_MAP.values()).__contains__
 is_bracket = frozenset(BRACKETS_MAP.keys() | BRACKETS_MAP.values()).__contains__

pyscript/core/constants.py

@@ -17,7 +17,7 @@ ENV_PYSCRIPT_NO_COLOR_PROMPT = 'PYSCRIPT_NO_COLOR_PROMPT'
 ENV_PYSCRIPT_MAXIMUM_TRACEBACK_LINE = 'PYSCRIPT_MAXIMUM_TRACEBACK_LINE'
 ENV_PYSCRIPT_CLASSIC_LINE_SHELL = 'PYSCRIPT_CLASSIC_LINE_SHELL'
 ENV_PYSCRIPT_HISTORY_PATH = 'PYSCRIPT_HISTORY_PATH'
-ENV_PYSCRIPT_MAXIMUM_HISTORY_LINE = 'PYSCRIPT_MAXIMUM_HISTORY_LINE'
+ENV_PYSCRIPT_HISTORY_LIMIT = 'PYSCRIPT_HISTORY_LIMIT'
 
 KEYWORDS = (
     '__debug__', 'False', 'None', 'True', 'and', 'as', 'assert', 'break', 'case', 'catch', 'class', 'constructor',

pyscript/core/editor/bases.py

@@ -15,8 +15,8 @@ class PysEditor(Pys):
     @typecheck
     def __init__(self, file: PysFileBuffer, colored: bool = True) -> None:
         self.file = file
-        self.colored = bool(colored)
         self.basename = basename(self.file.name)
+        self.colored = bool(colored)
         self.used = False
         self.modified = False
 

pyscript/core/editor/gui.py

@@ -6,8 +6,17 @@ from ..utils.generic import boundary
 from ..version import __version__
 
 try:
-    from tkinter import Tk, Scrollbar, Text, messagebox
-    from tkinter.font import Font
+    from tkinter import Tk, Scrollbar, Text, Canvas, messagebox
+    from tkinter.font import families, Font
+
+    MONO_FALLBACKS = (
+        'Fira Code',
+        'Cascadia Code', 'SF Mono', 'Ubuntu Mono', 'Liberation Mono',
+        'Consolas', 'Menlo', 'DejaVu Sans Mono',
+        'Courier New', 'Lucida Console', 'Monaco', 'Andale Mono',
+        'Courier', 'Terminal',
+        'monospace'
+    )
 
     class PysGUIEditor(PysEditor, Tk):
 
@@ -45,6 +54,7 @@ try:
                 if self.text.edit_modified():
                     self.modified = True
                     update()
+                    refresh_line_numbers()
                     self.text.edit_modified(False)
 
             def on_change_font(value):
@@ -53,6 +63,7 @@ try:
                     size = boundary(font.cget('size') + value, 1, 127)
                     font.config(size=size)
                     update_tab_size()
+                    refresh_line_numbers()
                     self.set_configuration('gui-size-font', size)
                     return 'break'
                 return wrapper
@@ -61,6 +72,7 @@ try:
                 text = self.text
                 wrap = text.cget('wrap') != 'char'
                 text.configure(wrap='char' if wrap else 'none')
+                refresh_line_numbers()
                 self.set_configuration('wrap', wrap)
                 return 'break'
 
@@ -86,9 +98,64 @@ try:
                 text.see('insert')
                 return 'break'
 
+            def draw_line_numbers():
+                self.line_job = None
+                text = self.text
+                canvas = self.line_numbers
+                font = self.font
+
+                bold = (font.cget('family'), font.cget('size'), 'bold')
+                digits = len(text.index('end-1c').split('.')[0])
+                padding = font.measure(' ')
+                width = font.measure('0' * digits) + padding * 2
+
+                canvas.delete('all')
+                canvas.configure(width=width, bg='#1f1f1f')
+
+                current = text.index('insert').split('.')[0]
+                index = text.index('@0,0')
+                previous = None
+
+                while True:
+                    info = text.dlineinfo(index)
+                    if info is None:
+                        break
+
+                    number = index.split('.')[0]
+                    if number == previous:
+                        break
+
+                    canvas.create_text(
+                        width - padding, info[1],
+                        anchor='ne',
+                        text=number,
+                        font=bold if number == current else font,
+                        fill='#ffffff'
+                    )
+
+                    previous = number
+                    index = text.index(f'{index} +1 lines')
+
+            def refresh_line_numbers(event=None):
+                if self.line_job is None:
+                    self.line_job = self.after_idle(draw_line_numbers)
+
+            def on_scroll(first, last):
+                self.scrollbar.set(first, last)
+                refresh_line_numbers()
+
+            installed = frozenset(families())
+            for font_name in MONO_FALLBACKS:
+                if font_name in installed:
+                    break
+            else:
+                font_name = 'monospace'
+
             self.lexer = PygmentsPyScriptLexer()
-            self.font = Font(family='Consolas', size=boundary(self.get_configuration('gui-size-font', 10), 1, 127))
+            self.font = Font(family=font_name, size=boundary(self.get_configuration('gui-size-font', 10), 1, 127))
+            self.line_job = None
             self.scrollbar = Scrollbar(self)
+            self.line_numbers = Canvas(self, width=0, highlightthickness=0, bd=0)
             self.text = Text(
                 self,
                 undo=True,
@@ -98,7 +165,7 @@ try:
                 bg='#000000',
                 fg='#ffffff',
                 insertbackground='white',
-                yscrollcommand=self.scrollbar.set
+                yscrollcommand=on_scroll
             )
 
             update_tab_size()
@@ -106,6 +173,8 @@ try:
             self.scrollbar.pack_configure(side='right', fill='y')
             self.scrollbar.configure(command=self.text.yview)
 
+            self.line_numbers.pack_configure(side='left', fill='y')
+            self.text.pack_configure(side='left', expand=True, fill='both')
             self.text.pack_configure(side='left', expand=True, fill='both')
 
             self.text.insert('1.0', self.file.text)
@@ -115,6 +184,9 @@ try:
             self.text.bind('<Return>', on_enter)
             self.text.bind('<Prior>', on_page_up)
             self.text.bind('<Next>', on_page_down)
+            self.text.bind('<KeyRelease>', refresh_line_numbers)
+            self.text.bind('<ButtonRelease-1>', refresh_line_numbers)
+            self.text.bind('<Configure>', refresh_line_numbers)
 
             self.bind('<Configure>', on_configure)
             self.bind_all('<Control-S>', on_save)
@@ -145,14 +217,16 @@ try:
             self.wm_protocol('WM_DELETE_WINDOW', on_close)
 
             if PYGMENTS and colored:
+                self.update_job = None
+
                 tag_configure = self.text.tag_configure
                 for token, style in PygmentsPyScriptStyle.list_styles():
                     color = style['color']
                     if color:
                         tag_configure(str(token), foreground=f'#{color}')
 
-                def update():
-                    self.title(f'PyScript {__version__} - {self.basename}{"*" if self.modified else ""}')
+                def refresh_highlight():
+                    self.update_job = None
 
                     index = '1.0'
 
@@ -172,11 +246,18 @@ try:
                         text_tag_add(to_string(type), index, end_index)
                         index = end_index
 
+                def update():
+                    self.title(f'PyScript {__version__} - {self.basename}{"*" if self.modified else ""}')
+                    if self.update_job is not None:
+                        self.after_cancel(self.update_job)
+                    self.update_job = self.after(500, refresh_highlight)
+
             else:
                 def update():
                     self.title(f'PyScript {__version__} - {self.basename}{"*" if self.modified else ""}')
 
             update()
+            refresh_line_numbers()
 
         def run(self) -> None:
             PysEditor.run(self)

pyscript/core/editor/terminal.py

@@ -65,6 +65,13 @@ try:
                         title = file
                     return ANSI(f'\x1b[7m{title}{" " * max(0, columns - len(title))}\x1b[0m')
 
+                def create_line_prefix(line_number, wrap_count):
+                    width = len(str(self.text.document.line_count))
+                    number = str(line_number + 1) if wrap_count == 0 else ''
+                    is_current = line_number == self.text.document.cursor_position_row
+                    style = 'bg:#ffffff fg:#000000' + (' bold' if is_current else '')
+                    return [(style, f' {number:>{width}} '), ('', ' ')]
+
             else:
                 app_other_keyword.update({
                     'color_depth': ColorDepth.DEPTH_1_BIT
@@ -85,10 +92,16 @@ try:
                         title = file
                     return title + ' ' * max(0, columns - len(title))
 
+                def create_line_prefix(line_number, wrap_count):
+                    width = len(str(self.text.document.line_count))
+                    number = str(line_number + 1) if wrap_count == 0 else ''
+                    return f' {number:>{width}} | '
+
             self.text = TextArea(
                 multiline=True,
                 wrap_lines=on_wrap,
                 input_processors=[TabsProcessor(tabstop=4)],
+                get_line_prefix=create_line_prefix,
                 **text_other_keyword
             )
 
@@ -188,7 +201,7 @@ try:
             )
 
             self.text.text = self.file.text
-            self.text.buffer.on_text_changed += on_change
+            self.text.buffer.on_text_changed.add_handler(on_change)
 
             Application.__init__(
                 self,

pyscript/core/highlight.py

@@ -9,10 +9,11 @@ from .pysbuiltins import pys_builtins
 from .token import TOKENS
 from .utils.ansi import acolor
 from .utils.decorators import typecheck
+from .utils.generic import dfrozen
 from .utils.string import normstr
 
 from html import escape as html_escape
-from typing import Callable, Optional
+from typing import Callable, Iterator, Optional
 
 BUILTIN_TYPES = frozenset(
     name
@@ -31,10 +32,11 @@ try:
     from pygments.lexer import RegexLexer, include, bygroups
     from pygments.style import Style
     from pygments.token import (
-        Comment, Error, Escape, Generic, Keyword, Name, Number, Operator, Punctuation, String, Whitespace
+        _TokenType, Comment, Error, Escape, Generic, Keyword, Name, Number, Operator, Punctuation, String, Whitespace
     )
     from pygments.unistring import xid_start, xid_continue
 
+    _brackets_tokens = dfrozen({index: getattr(Punctuation, f'Brackets{index}') for index in range(3)})
     _set_constant_keywords = frozenset(CONSTANT_KEYWORDS)
     _keywords = '|'.join(KEYWORDS)
     _unicode_name = f'[{xid_start}][{xid_continue}]*'
@@ -112,6 +114,10 @@ try:
             Comment.Single: HIGHLIGHT_MAP['comment'],
             Error: HIGHLIGHT_MAP['invalid'],
             Generic.Prompt: HIGHLIGHT_MAP['keyword-other'],
+
+            Punctuation.Brackets0: HIGHLIGHT_MAP['brackets-0'],
+            Punctuation.Brackets1: HIGHLIGHT_MAP['brackets-1'],
+            Punctuation.Brackets2: HIGHLIGHT_MAP['brackets-2']
         }
 
     class PygmentsPyScriptLexer(Pys, RegexLexer):
@@ -324,6 +330,20 @@ try:
 
         }
 
+        def get_tokens_unprocessed(self, *args, **kwargs) -> Iterator[tuple[int, _TokenType, str]]:
+            brackets_stack = []
+
+            for index, token, value in super().get_tokens_unprocessed(*args, **kwargs):
+                if token is Punctuation and len(value) == 1 and is_bracket(ttype := ord(value)):
+                    if is_left_bracket(ttype):
+                        token = _brackets_tokens[len(brackets_stack) % 3]
+                        brackets_stack.append(ttype)
+                    elif not (brackets_stack and BRACKETS_MAP[brackets_stack.pop()] == ttype):
+                        token = Error
+                    else:
+                        token = _brackets_tokens[len(brackets_stack) % 3]
+                yield index, token, value
+
     class PygmentsPyScriptShellLexer(PygmentsPyScriptLexer):
 
         """
@@ -521,8 +541,8 @@ def pys_highlight(
             type_format = 'comment'
 
         elif is_bracket(ttype):
-            type_format = f'brackets-{len(brackets_stack) % max_bracket_level}'
             if is_left_bracket(ttype):
+                type_format = f'brackets-{len(brackets_stack) % max_bracket_level}'
                 brackets_stack.append(ttype)
             elif not (brackets_stack and BRACKETS_MAP[brackets_stack.pop()] == ttype):
                 type_format = 'invalid'