rapydscript-ns 0.9.3 → 0.9.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "rapydscript-ns",
   "description": "Pythonic JavaScript that doesn't suck",
   "homepage": "https://github.com/ficocelliguy/rapydscript-ns",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "license": "BSD-2-Clause",
   "engines": {
     "node": ">=0.12.0"

package/publish.py

@@ -1,37 +1,37 @@
-#!/usr/bin/env python
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-
-import subprocess
-import os
-import shutil
-import json
-
-# Load metadata
-base = os.path.dirname(os.path.abspath(__file__))
-subprocess.check_call([os.path.join(base, 'build')])
-with open('package.json', 'rb') as f:
-    m = json.load(f)
-version = m['version']
-
-# Update the files in release/ from dev/
-shutil.rmtree(os.path.join(base, 'release'))
-shutil.copytree(os.path.join(base, 'dev'), os.path.join(base, 'release'))
-subprocess.check_call(['git', 'add', os.path.join(base, 'release')])
-if subprocess.check_output(
-        'git status --porcelain --untracked-files release'.split()).strip():
-    subprocess.check_call([
-        'git', 'commit', '-m', 'Updating release build of compiler'])
-    subprocess.check_call('git push'.split())
-
-# Tag the release
-subprocess.check_call('git tag -s v{0} -m version-{0}'.format(version).split())
-subprocess.check_call(['git', 'push', 'origin', 'v'+version])
-
-# Update the web REPL
-gh_pages = os.path.join(os.path.dirname(base), 'kovidgoyal.github.io')
-subprocess.check_call([os.path.join(gh_pages, 'update-rapyd-repl.py')])
-
-# Publish to NPM
-subprocess.check_call(['npm', 'login'])
-subprocess.check_call(['npm', 'publish', base])
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+
+import subprocess
+import os
+import shutil
+import json
+
+# Load metadata
+base = os.path.dirname(os.path.abspath(__file__))
+subprocess.check_call([os.path.join(base, 'build')])
+with open('package.json', 'rb') as f:
+    m = json.load(f)
+version = m['version']
+
+# Update the files in release/ from dev/
+shutil.rmtree(os.path.join(base, 'release'))
+shutil.copytree(os.path.join(base, 'dev'), os.path.join(base, 'release'))
+subprocess.check_call(['git', 'add', os.path.join(base, 'release')])
+if subprocess.check_output(
+        'git status --porcelain --untracked-files release'.split()).strip():
+    subprocess.check_call([
+        'git', 'commit', '-m', 'Updating release build of compiler'])
+    subprocess.check_call('git push'.split())
+
+# Tag the release
+subprocess.check_call('git tag -s v{0} -m version-{0}'.format(version).split())
+subprocess.check_call(['git', 'push', 'origin', 'v'+version])
+
+# Update the web REPL
+gh_pages = os.path.join(os.path.dirname(base), 'kovidgoyal.github.io')
+subprocess.check_call([os.path.join(gh_pages, 'update-rapyd-repl.py')])
+
+# Publish to NPM
+subprocess.check_call(['npm', 'login'])
+subprocess.check_call(['npm', 'publish', base])

package/session.vim

@@ -1,4 +1,4 @@
-set wildignore+=*.pyj-cached
-set wildignore+=node_modules
-imap <F4> ρσ_
-cmap <F4> ρσ_
+set wildignore+=*.pyj-cached
+set wildignore+=node_modules
+imap <F4> ρσ_
+cmap <F4> ρσ_

package/setup.cfg

@@ -1,2 +1,2 @@
-[rapydscript]
-globals=assert,RapydScript
+[rapydscript]
+globals=assert,RapydScript

package/src/ast.pyj

@@ -1280,6 +1280,12 @@ class AST_Number(AST_Constant):
         'value': "[number] the numeric value"
     }
 
+class AST_BigInt(AST_Constant):
+    "A BigInt literal (e.g. 42n)"
+    properties = {
+        'value': "[string] the raw numeric string (without n suffix)"
+    }
+
 class AST_RegExp(AST_Constant):
     "A regexp literal"
     properties = {

package/src/baselib-containers.pyj

@@ -122,9 +122,22 @@ def ρσ_list_sort_key(value):
     t = jstype(value)
     if t is 'string' or t is 'number':
         return value
+    # Keep objects that define __lt__ unchanged so ρσ_list_sort_cmp can
+    # dispatch the dunder; everything else falls back to a string key.
+    if value is not None and value is not undefined and jstype(value.__lt__) is 'function':
+        return value
     return value.toString()
 
 def ρσ_list_sort_cmp(a, b, ap, bp):
+    # When the elements define __lt__, order them the Pythonic way via
+    # ρσ_op_lt (which also handles a reflected __gt__); otherwise compare
+    # the precomputed primitive keys directly.
+    if a is not None and a is not undefined and jstype(a.__lt__) is 'function':
+        if ρσ_op_lt(a, b):
+            return -1
+        if ρσ_op_lt(b, a):
+            return 1
+        return ap - bp
     if a < b:
         return -1
     if a > b:
@@ -132,8 +145,17 @@ def ρσ_list_sort_cmp(a, b, ap, bp):
     return ap - bp
 
 def ρσ_list_sort(key=None, reverse=False):
-    key = key or ρσ_list_sort_key
     mult = -1 if reverse else 1
+    if key is not None and key is not undefined and jstype(key) is 'function' and key.length is 2:
+        # A two-argument function is treated as a comparator (à la
+        # functools.cmp_to_key) rather than a key function, so a JS-style
+        # `.sort((a, b) => ...)` callback works as expected.
+        cmpposmap = dict()
+        for v'var i=0; i < this.length; i++':
+            cmpposmap.set(this[i], i)  # noqa:undef
+        Array.prototype.sort.call(this, def (a, b): return (mult * key(a, b)) or (cmpposmap.get(a) - cmpposmap.get(b));)
+        return
+    key = key or ρσ_list_sort_key
     keymap = dict()
     posmap = dict()
     for v'var i=0; i < this.length; i++':

package/src/baselib-str.pyj

@@ -111,8 +111,19 @@ define_str_func = def(name, func):
     if func.__argnames__:
         Object.defineProperty(f, '__argnames__', {'value':v"['string']".concat(func.__argnames__)})
 
-ρσ_orig_split = String.prototype.split.call.bind(String.prototype.split)
-ρσ_orig_replace = String.prototype.replace.call.bind(String.prototype.replace)
+# Guard against multiple evaluations of the baselib in the same JS context
+# (e.g. web_repl()/create_compiler() being called repeatedly).  Without this,
+# each eval captures the PREVIOUS patched String.prototype.split as ρσ_orig_split,
+# creating a chain that eventually overflows the call stack.
+if v'typeof globalThis !== "undefined" && globalThis._ρσ_orig_split':
+    ρσ_orig_split = v'globalThis._ρσ_orig_split'
+    ρσ_orig_replace = v'globalThis._ρσ_orig_replace'
+else:
+    ρσ_orig_split = String.prototype.split.call.bind(String.prototype.split)
+    ρσ_orig_replace = String.prototype.replace.call.bind(String.prototype.replace)
+    if v'typeof globalThis !== "undefined"':
+        v'globalThis._ρσ_orig_split = ρσ_orig_split'
+        v'globalThis._ρσ_orig_replace = ρσ_orig_replace'
 
 # format()  {{{
 define_str_func('format', def ():

package/src/compiler.pyj

@@ -1,36 +1,36 @@
-# vim:fileencoding=utf-8
-# License: BSD
-# Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
-# globals: console
-
-from utils import DefaultsError, string_template
-from errors import ImportError, SyntaxError
-from tokenizer import ALL_KEYWORDS, IDENTIFIER_PAT, tokenizer
-from parse import parse, NATIVE_CLASSES, compile_time_decorators
-from output.stream import OutputStream
-from output.codegen import generate_code
-from output.treeshake import tree_shake
-
-generate_code()  # create the print methods on the AST nodes
-
-# The following allows this module to be used from a pure javascript, require()
-# based environment like Node.js
-if jstype(exports) is 'object':
-    exports.DefaultsError = DefaultsError
-    exports.parse = parse
-    exports.compile_time_decorators = compile_time_decorators
-    exports.OutputStream = OutputStream
-    exports.string_template = string_template  # noqa:undef
-    # Needed for REPL and linter
-    exports.ALL_KEYWORDS = ALL_KEYWORDS
-    exports.IDENTIFIER_PAT = IDENTIFIER_PAT
-    exports.NATIVE_CLASSES = NATIVE_CLASSES
-    exports.ImportError = ImportError
-    exports.SyntaxError = SyntaxError
-    exports.tokenizer = tokenizer
-    exports.tree_shake = tree_shake
-    # Magic! Export all the AST_* nodes
-    ast = ρσ_modules['ast']
-    for ast_node in ast:
-        if ast_node.substr(0, 4) is 'AST_':
-            exports[ast_node] = ast[ast_node]  # noqa:undef
+# vim:fileencoding=utf-8
+# License: BSD
+# Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
+# globals: console
+
+from utils import DefaultsError, string_template
+from errors import ImportError, SyntaxError
+from tokenizer import ALL_KEYWORDS, IDENTIFIER_PAT, tokenizer
+from parse import parse, NATIVE_CLASSES, compile_time_decorators
+from output.stream import OutputStream
+from output.codegen import generate_code
+from output.treeshake import tree_shake
+
+generate_code()  # create the print methods on the AST nodes
+
+# The following allows this module to be used from a pure javascript, require()
+# based environment like Node.js
+if jstype(exports) is 'object':
+    exports.DefaultsError = DefaultsError
+    exports.parse = parse
+    exports.compile_time_decorators = compile_time_decorators
+    exports.OutputStream = OutputStream
+    exports.string_template = string_template  # noqa:undef
+    # Needed for REPL and linter
+    exports.ALL_KEYWORDS = ALL_KEYWORDS
+    exports.IDENTIFIER_PAT = IDENTIFIER_PAT
+    exports.NATIVE_CLASSES = NATIVE_CLASSES
+    exports.ImportError = ImportError
+    exports.SyntaxError = SyntaxError
+    exports.tokenizer = tokenizer
+    exports.tree_shake = tree_shake
+    # Magic! Export all the AST_* nodes
+    ast = ρσ_modules['ast']
+    for ast_node in ast:
+        if ast_node.substr(0, 4) is 'AST_':
+            exports[ast_node] = ast[ast_node]  # noqa:undef

package/src/errors.pyj

@@ -1,30 +1,30 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-from __python__ import hash_literals
-
-class SyntaxError(Error):
-
-    def __init__(self, message, filename, line, col, pos, is_eof):
-        self.stack = Error().stack
-        self.message = message
-        self.line = line
-        self.col = col
-        self.pos = pos
-        self.is_eof = is_eof
-        self.filename = filename
-        # The "standard" form for these error attributes
-        self.lineNumber = line
-        self.fileName = filename
-
-    def toString(self):
-        ans = self.message + " (line: " + self.line + ", col: " + self.col + ", pos: " + self.pos + ")"
-        if self.filename:
-            ans = self.filename + ':' + ans
-        if self.stack:
-            ans += "\n\n" + self.stack
-        return ans
-
-
-class ImportError(SyntaxError):
-    pass
-
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
+
+class SyntaxError(Error):
+
+    def __init__(self, message, filename, line, col, pos, is_eof):
+        self.stack = Error().stack
+        self.message = message
+        self.line = line
+        self.col = col
+        self.pos = pos
+        self.is_eof = is_eof
+        self.filename = filename
+        # The "standard" form for these error attributes
+        self.lineNumber = line
+        self.fileName = filename
+
+    def toString(self):
+        ans = self.message + " (line: " + self.line + ", col: " + self.col + ", pos: " + self.pos + ")"
+        if self.filename:
+            ans = self.filename + ':' + ans
+        if self.stack:
+            ans += "\n\n" + self.stack
+        return ans
+
+
+class ImportError(SyntaxError):
+    pass
+