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

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.2}/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.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.2.1
+Version: 1.2.2
 Summary: PyScript Programming Language
 Home-page: https://github.com/azzammuhyala/pyscript
 Author: azzammuhyala
@@ -32,7 +32,7 @@ Dynamic: summary
 # PyScript Language📖
 
 <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.

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

@@ -1,7 +1,7 @@
 # PyScript Language📖
 
 <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.

pyscript_programming_language-1.2.2/changelog.md

@@ -0,0 +1,12 @@
+# Change Log
+
+## [1.2.2] - 07-10-2025
+### Added
+- _brainfuck_ default library.
+
+### Fixed
+- Lexer or tokenization improvements on parsing unicode strings and numbers.
+- Minor improvements to the parser.
+- Newline system fixes in shell (_REPL_).
+- Improvements `pyscript.core.version.version_info`.
+- Improvements _builtins_ `ce`, `nce`, `increment`, and `decrement`.

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.2}/pyscript/core/interpreter.py

@@ -804,7 +804,7 @@ class PysInterpreter(Pys):
                 PysException(
                     TypeError("exceptions must derive from BaseException"),
                     context,
-                    node.position
+                    node.target.position
                 )
             )
 

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.2}/pyscript/core/lexer.py

@@ -13,13 +13,10 @@ class PysLexer(Pys):
 
     def __init__(self, file, context_parent=None, context_parent_entry_position=None, allowed_comment_token=False):
         self.file = file
-        self.context = context_parent
+        self.context_parent = context_parent
         self.context_parent_entry_position = context_parent_entry_position
         self.allowed_comment_token = allowed_comment_token
 
-    def peak(self, index):
-        return self.file.text[index] if 0 <= index < len(self.file.text) else None
-
     def update_current_char(self):
         self.current_char = self.file.text[self.index] if 0 <= self.index < len(self.file.text) else None
 
@@ -53,29 +50,26 @@ class PysLexer(Pys):
                 PysContext(
                     name=None,
                     file=self.file,
-                    parent=self.context,
+                    parent=self.context_parent,
                     parent_entry_position=self.context_parent_entry_position
                 ),
                 PysPosition(self.file, start, end or self.index)
             )
 
-    def is_triple_quote(self, prefix):
-        return all(self.peak(self.index + i) == prefix for i in range(3))
-
     def not_eof(self):
         return self.current_char is not None
 
     def char_eq(self, character):
-        return self.current_char == character
+        return self.not_eof() and self.current_char == character
 
     def char_ne(self, character):
-        return self.current_char != character
+        return self.not_eof() and self.current_char != character
 
     def char_in(self, characters):
         return self.not_eof() and self.current_char in characters
 
-    def char_are(self, name_string_method, *args, **kwargs):
-        return self.not_eof() and getattr(self.current_char, name_string_method)(*args, **kwargs)
+    def char_are(self, string_method, *args, **kwargs):
+        return self.not_eof() and getattr(self.current_char, string_method)(*args, **kwargs)
 
     def make_tokens(self):
         self.index = -1
@@ -214,8 +208,8 @@ class PysLexer(Pys):
 
     def make_number(self):
         start = self.index
-        number = ''
         format = int
+        number = ''
 
         is_scientific = False
         is_complex = False
@@ -224,8 +218,19 @@ class PysLexer(Pys):
         if self.char_eq('.'):
             format = float
             number = '.'
+
             self.advance()
 
+            if self.file.text[self.index:self.index + 2] == '..':
+                self.advance()
+                self.advance()
+                self.add_token(TOKENS['ELLIPSIS'], start)
+                return
+
+            elif not self.char_in('0123456789'):
+                self.add_token(TOKENS['DOT'], start)
+                return
+
         while self.char_in('0123456789'):
             number += self.current_char
             self.advance()
@@ -238,6 +243,7 @@ class PysLexer(Pys):
 
             elif self.char_eq('.') and not is_scientific and format is int:
                 format = float
+
                 number += '.'
                 self.advance()
 
@@ -248,6 +254,7 @@ class PysLexer(Pys):
 
                 format = str
                 number = ''
+
                 character_base = self.char_are('lower')
 
                 if character_base == 'b':
@@ -303,12 +310,7 @@ class PysLexer(Pys):
         if self.char_eq('.'):
             self.advance()
 
-            if format is float and self.peak(self.index) == '.':
-                self.advance()
-                self.add_token(TOKENS['ELLIPSIS'], start)
-                return
-
-            if number != '.' and (format is float or is_complex or is_scientific):
+            if format is float or is_complex or is_scientific:
                 self.throw(self.index - 1, "invalid decimal literal")
 
             format = float
@@ -320,10 +322,7 @@ class PysLexer(Pys):
                 return complex(0, result) if is_complex else result
 
             if format is float:
-                if number == '.':
-                    self.add_token(TOKENS['DOT'], start)
-                else:
-                    self.add_token(TOKENS['NUMBER'], start, wrap(float))
+                self.add_token(TOKENS['NUMBER'], start, wrap(float))
 
             elif format is str:
                 self.add_token(TOKENS['NUMBER'], start, wrap(int, base))
@@ -353,17 +352,25 @@ class PysLexer(Pys):
 
         prefix = self.current_char
 
-        is_triple_quote = self.is_triple_quote(prefix)
+        def triple_quote():
+            return self.file.text[self.index:self.index + 3] == prefix * 3
+
+        is_triple_quote = triple_quote()
         warning_displayed = False
         decoded_error_message = None
 
+        def decode_error(message):
+            nonlocal decoded_error_message
+            if decoded_error_message is None:
+                decoded_error_message = message
+
         self.advance()
 
         if is_triple_quote:
             self.advance()
             self.advance()
 
-        while self.not_eof() and not (self.is_triple_quote(prefix) if is_triple_quote else self.char_in(prefix + '\n')):
+        while self.not_eof() and not (triple_quote() if is_triple_quote else self.char_in(prefix + '\n')):
 
             if self.char_eq('\\'):
                 self.advance()
@@ -391,62 +398,68 @@ class PysLexer(Pys):
                         string += '\a'
                     elif self.char_eq('v'):
                         string += '\v'
+
                     self.advance()
 
                 elif decoded_error_message is None:
                     escape = ''
 
                     if self.char_in('01234567'):
-                        while self.not_eof() and self.char_in('01234567') and len(escape) < 3:
+
+                        while self.char_in('01234567') and len(escape) < 3:
                             escape += self.current_char
                             self.advance()
 
                         string += chr(int(escape, 8))
 
                     elif self.char_in('xuU'):
-                        if self.current_char == 'x':
+                        base = self.current_char
+
+                        if base == 'x':
                             length = 2
-                        elif self.current_char == 'u':
+                        elif base == 'u':
                             length = 4
-                        elif self.current_char == 'U':
+                        elif base == 'U':
                             length = 8
 
-                        base = self.current_char
-
                         self.advance()
 
-                        while self.not_eof() and self.char_in('0123456789ABCDEFabcdef') and len(escape) < length:
+                        while self.char_in('0123456789ABCDEFabcdef') and len(escape) < length:
                             escape += self.current_char
                             self.advance()
 
                         if len(escape) != length:
-                            decoded_error_message = "codec can't decode bytes, truncated \\{}{} escape".format(
-                                base, 'X' * length
-                            )
+                            decode_error("codec can't decode bytes, truncated \\{}{} escape".format(base, 'X' * length))
+
                         else:
-                            string += chr(int(escape, 16))
+                            try:
+                                string += chr(int(escape, 16))
+                            except:
+                                decode_error("codec can't decode bytes: illegal Unicode character")
 
                     elif self.char_eq('N'):
                         self.advance()
 
                         if self.current_char != '{':
-                            decoded_error_message = "malformed \\N character escape"
+                            decode_error("malformed \\N character escape")
                             continue
 
                         self.advance()
 
-                        while self.not_eof() and self.char_ne('}'):
+                        while self.char_ne('}'):
                             escape += self.current_char
                             self.advance()
 
                         if self.current_char == '}':
                             try:
                                 string += unicode_lookup(escape)
-                            except KeyError:
-                                decoded_error_message = "codec can't decode bytes, unknown Unicode character name"
+                            except:
+                                decode_error("codec can't decode bytes, unknown Unicode character name")
+
                             self.advance()
+
                         else:
-                            decoded_error_message = "malformed \\N character escape"
+                            decode_error("malformed \\N character escape")
 
                     else:
                         if not self.not_eof():
@@ -467,10 +480,10 @@ class PysLexer(Pys):
                 string += self.current_char
                 self.advance()
 
-        if not (self.is_triple_quote(prefix) if is_triple_quote else self.char_eq(prefix)):
+        if not (triple_quote() if is_triple_quote else self.char_eq(prefix)):
             self.throw(start, "unterminated bytes literal" if is_bytes else "unterminated string literal", start + 1)
 
-        elif decoded_error_message:
+        elif decoded_error_message is not None:
             self.advance()
             self.throw(start, decoded_error_message)
 
@@ -507,7 +520,7 @@ class PysLexer(Pys):
 
         self.advance()
 
-        while self.not_eof() and self.char_ne('\n') and self.char_are('isspace'):
+        while self.char_ne('\n') and self.char_are('isspace'):
             self.advance()
 
         if not self.char_are('isidentifier'):
@@ -744,7 +757,7 @@ class PysLexer(Pys):
 
         self.advance()
 
-        while self.not_eof() and self.char_ne('\n'):
+        while self.char_ne('\n'):
             comment += self.current_char
             self.advance()
 

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.2}/pyscript/core/objects.py

@@ -1,7 +1,10 @@
 from .bases import Pys
 from .buffer import PysCode
 
-class PysModule(Pys):
+class PysObject(Pys):
+    pass
+
+class PysModule(PysObject):
 
     def __init__(self, name, doc=None):
         self.__name__ = name
@@ -17,7 +20,7 @@ class PysModule(Pys):
             '' if file is undefined else ' from {!r}'.format(file)
         )
 
-class PysChainFunction(Pys):
+class PysChainFunction(PysObject):
 
     def __init__(self, func):
         from .constants import DEFAULT
@@ -35,7 +38,7 @@ class PysChainFunction(Pys):
         handle_call(self.__func__, self.__code__.context, self.__code__.position, self.__code__.flags)
         return self.__func__(self, *args, **kwargs)
 
-class PysFunction(Pys):
+class PysFunction(PysObject):
 
     def __init__(self, name, parameters, body, position, context):
         from .constants import DEFAULT

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.2}/pyscript/core/parser.py

@@ -22,6 +22,10 @@ class PysParser(Pys):
 
         self.advance()
 
+    def update_current_token(self):
+        if 0 <= self.token_index < len(self.tokens):
+            self.current_token = self.tokens[self.token_index]
+
     def advance(self):
         self.token_index += 1
         self.update_current_token()
@@ -30,10 +34,6 @@ class PysParser(Pys):
         self.token_index -= amount
         self.update_current_token()
 
-    def update_current_token(self):
-        if 0 <= self.token_index < len(self.tokens):
-            self.current_token = self.tokens[self.token_index]
-
     def error(self, message, position=None):
         return PysException(
             SyntaxError(message),
@@ -89,11 +89,7 @@ class PysParser(Pys):
             PysSequenceNode(
                 'statements',
                 statements,
-                PysPosition(
-                    self.file,
-                    start,
-                    self.current_token.position.end
-                )
+                PysPosition(self.file, start, self.current_token.position.end)
             )
         )
 
@@ -435,7 +431,7 @@ class PysParser(Pys):
                 self.advance()
                 self.skip(result)
 
-                on_keyword_state = False
+                seen_kwargs = False
                 args = []
 
                 while self.current_token.type not in parenthesises_map.values():
@@ -454,12 +450,12 @@ class PysParser(Pys):
                         self.advance()
                         self.skip(result)
 
-                        on_keyword_state = True
+                        seen_kwargs = True
 
-                    elif on_keyword_state:
+                    elif seen_kwargs:
                         return result.failure(self.error("expected '=' (follows keyword argument)"))
 
-                    if on_keyword_state:
+                    if seen_kwargs:
                         value = result.register(self.expr(), True)
                         if result.error:
                             return result
@@ -697,11 +693,10 @@ class PysParser(Pys):
 
         return result.failure(self.error("expected expression", token.position), fatal=False)
 
-    def sequence_expr(self, type):
+    def sequence_expr(self, type, should_sequence=False):
         result = PysParserResult()
         start = self.current_token.position.start
 
-        should_sequence = True
         elements = []
 
         left_parenthesis = parenthesises_sequence_map[type]
@@ -755,9 +750,9 @@ class PysParser(Pys):
                     return result.failure(self.error("invalid syntax. Perhaps you forgot a comma?"))
 
         else:
-            should_sequence = False
 
             while self.current_token.type not in parenthesises_map.values():
+
                 elements.append(result.register(self.expr(), True))
                 if result.error:
                     return result
@@ -1009,12 +1004,11 @@ class PysParser(Pys):
 
             return result.success(all_cases)
 
-        else:
-            else_body = result.register(self.else_expr())
-            if result.error:
-                return result
+        else_body = result.register(self.else_expr())
+        if result.error:
+            return result
 
-            return result.success(([], else_body))
+        return result.success(([], else_body))
 
     def if_expr_cases(self, case_keyword):
         result = PysParserResult()
@@ -1148,8 +1142,8 @@ class PysParser(Pys):
                 return result
 
             return result.success(body)
-        else:
-            return result.success(None)
+
+        return result.success(None)
 
     def case_or_default_expr(self):
         result = PysParserResult()
@@ -1161,12 +1155,11 @@ class PysParser(Pys):
 
             return result.success(all_cases)
 
-        else:
-            default_body = result.register(self.default_expr())
-            if result.error:
-                return result
+        default_body = result.register(self.default_expr())
+        if result.error:
+            return result
 
-            return result.success(([], default_body))
+        return result.success(([], default_body))
 
     def try_expr(self):
         result = PysParserResult()
@@ -1316,7 +1309,7 @@ class PysParser(Pys):
             self.advance()
             self.skip(result)
 
-            iterable = result.register(self.expr(), True)
+            iter = result.register(self.expr(), True)
             if result.error:
                 return result
 
@@ -1354,7 +1347,7 @@ class PysParser(Pys):
 
         return result.success(
             PysForNode(
-                (init, iterable) if foreach else (init, condition, update),
+                (init, iter) if foreach else (init, condition, update),
                 body,
                 else_body,
                 position
@@ -1466,11 +1459,12 @@ class PysParser(Pys):
         self.skip(result)
 
         if self.current_token.type == TOKENS['LPAREN']:
-            bases = result.register(self.sequence_expr('tuple'))
+            bases = result.register(self.sequence_expr('tuple', should_sequence=True))
             if result.error:
                 return result
 
-            bases = bases.elements if isinstance(bases, PysSequenceNode) else [bases]
+            end = bases.position.end
+            bases = bases.elements
 
         else:
             bases = []
@@ -1525,7 +1519,7 @@ class PysParser(Pys):
         self.advance()
         self.skip(result)
 
-        on_keyword_state = False
+        seen_kwargs = False
         parameters = []
 
         while self.current_token.type not in parenthesises_map.values():
@@ -1544,12 +1538,12 @@ class PysParser(Pys):
                 self.advance()
                 self.skip(result)
 
-                on_keyword_state = True
+                seen_kwargs = True
 
-            elif on_keyword_state:
+            elif seen_kwargs:
                 return result.failure(self.error("expected '=' (follows keyword argument)"))
 
-            if on_keyword_state:
+            if seen_kwargs:
                 value = result.register(self.expr(), True)
                 if result.error:
                     return result

{pyscript_programming_language-1.2.1 → pyscript_programming_language-1.2.2}/pyscript/core/pysbuiltins.py

@@ -193,14 +193,13 @@ def ce(a, b, *, rel_tol=1e-9, abs_tol=0):
         from math import isclose
         return isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol)
 
-    try:
-        from_a = True
-        func = getattr(a, '__ce__')
-    except AttributeError:
-        from_a = False
-        func = getattr(b, '__ce__', None)
+    from .utils import supported_method
+
+    success, result = supported_method(a, '__ce__', b, rel_tol=rel_tol, abs_tol=abs_tol)
+    if not success:
+        success, result = supported_method(b, '__ce__', a, rel_tol=rel_tol, abs_tol=abs_tol)
 
-    if not callable(func):
+    if not success:
         raise TypeError(
             "unsupported operand type(s) for ~= or ce(): {!r} and {!r}".format(
                 type(a).__name__,
@@ -208,24 +207,26 @@ def ce(a, b, *, rel_tol=1e-9, abs_tol=0):
             )
         )
 
-    return func(b if from_a else a, rel_tol=rel_tol, abs_tol=abs_tol)
+    return result
 
 def nce(a, b, *, rel_tol=1e-9, abs_tol=0):
     if isinstance(a, (int, float)) and isinstance(b, (int, float)):
         from math import isclose
         return not isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol)
 
-    try:
-        from_a = True
-        func = getattr(a, '__nce__')
-    except AttributeError:
-        try:
-            from_a = False
-            func = getattr(b, '__nce__')
-        except AttributeError:
-            return not ce(a, b, rel_tol=rel_tol, abs_tol=abs_tol)
+    from .utils import supported_method
 
-    if not callable(func):
+    success, result = supported_method(a, '__nce__', b, rel_tol=rel_tol, abs_tol=abs_tol)
+    if not success:
+        success, result = supported_method(b, '__nce__', a, rel_tol=rel_tol, abs_tol=abs_tol)
+        if not success:
+            success, result = supported_method(a, '__ce__', b, rel_tol=rel_tol, abs_tol=abs_tol)
+            if not success:
+                success, result = supported_method(b, '__ce__', a, rel_tol=rel_tol, abs_tol=abs_tol)
+
+            result = not result
+
+    if not success:
         raise TypeError(
             "unsupported operand type(s) for ~! or nce(): {!r} and {!r}".format(
                 type(a).__name__,
@@ -233,29 +234,33 @@ def nce(a, b, *, rel_tol=1e-9, abs_tol=0):
             )
         )
 
-    return func(b if from_a else a, rel_tol=rel_tol, abs_tol=abs_tol)
+    return result
 
 def increment(object):
     if isinstance(object, (int, float)):
         return object + 1
 
-    func = getattr(object, '__increment__', None)
+    from .utils import supported_method
 
-    if not callable(func):
+    success, result = supported_method(object, '__increment__')
+
+    if not success:
         raise TypeError("unsupported operand type(s) for ++ or increment(): {!r}".format(type(object).__name__))
 
-    return func()
+    return result
 
 def decrement(object):
     if isinstance(object, (int, float)):
         return object - 1
 
-    func = getattr(object, '__decrement__', None)
+    from .utils import supported_method
+
+    success, result = supported_method(object, '__decrement__')
 
-    if not callable(func):
+    if not success:
         raise TypeError("unsupported operand type(s) for -- or decrement(): {!r}".format(type(object).__name__))
 
-    return func()
+    return result
 
 def comprehension(init, wrap, condition=None):
     if not callable(wrap):