rapydscript-ng 0.7.18 → 0.7.22

package/test/functions.pyj

@@ -105,7 +105,23 @@ def hello(something):
     return "hello " + something
 
 assrt.equal(hello("world"), "<b><i>hello world</i></b>")
+assrt.equal(hello.__module__, '__main__')
+assrt.equal(hello.__argnames__.length, 1)
+assrt.equal(hello.__argnames__[0], 'arg')
 
+
+def simple_wrapper(f):
+    f.test_attr = 'test'
+    return f
+
+
+@simple_wrapper
+def fw(x):
+    pass
+
+assrt.equal(fw.__module__, '__main__')
+assrt.equal(fw.__argnames__.length, 1)
+assrt.equal(fw.__argnames__[0], 'x')
 # just because something is a reserved keyword in RapydScript, doesn't mean other libraries won't attempt to use it
 # let's make sure we parse that correctly
 five = {}

package/test/generic.pyj

@@ -7,6 +7,11 @@ def throw_test(code):
         RapydScript.parse(code, {'filename':code}).body[0]
     , RapydScript.SyntaxError)
 
+# unary operators
+assrt.equal(-(1), -1)
+assrt.equal(-(-1), 1)
+assrt.equal(+(+1), 1)
+
 # arithmetic
 assrt.equal(3**4, Math.pow(3, 4))
 assrt.equal(100**-2, Math.pow(100, -2))
@@ -20,9 +25,14 @@ a = 100
 a //= 3
 assrt.equal(a, 33)
 assrt.equal(0b11, 3)
+assrt.ok(42 / "x" is NaN)
+assrt.ok(42 is not NaN)
+assrt.ok(NaN is parseInt('asd', 10))
+assrt.ok('NaN' is not 42 / 'x')
 
 # comparisons
 assrt.ok(3<5<7)
+assrt.equal(-1 < 0 == 1 < 0, False)
 
 # Empty tuple
 assrt.deepEqual((), [])
@@ -84,6 +94,9 @@ throw_test('while 1:\npass')
 throw_test('def f():\n while 1:\n pass')
 throw_test('1 1')
 throw_test('z = x y')
+throw_test('while a = 1: pass')
+throw_test('while 1\n   pass')
+throw_test('for a in [1]\n   pass')
 
 # object literals
 {1:
@@ -131,6 +144,9 @@ for v'var i = 0; i < 1; i++':
     a[i] = 1  # noqa: undef
 assrt.deepEqual(a, [1])
 
+# String literals
+a = '\u00ad'
+assrt.equal(a.charCodeAt(0), 0xad)
 # String literal concatenation
 
 assrt.equal('1' '2', '12')
@@ -256,7 +272,9 @@ def errf():
 try:
     errf()
 except MyException as e:
-    assrt.ok(str.strip(traceback.format_exception(ρσ_last_exception)[-2]).startsWith('at errf'))
+    fe = traceback.format_exception()
+    assrt.ok(str.strip(fe[-2]).startsWith('at errf'))
+
 
 def stackf():
     return traceback.format_stack()
@@ -330,3 +348,23 @@ assrt.equal(undef ? 1, 0)
 ml = 1, '''
 '''
 assrt.deepEqual(ml, [1, '\n'])
+
+
+# localvars in conditions
+
+gv = 1
+(def ():
+    if (gv = 2):
+        pass
+    assrt.equal(gv, 2)
+)()
+assrt.equal(gv, 1)
+
+assrt.ok(1 not in [2, 3])
+assrt.ok(1 in [1, 2])
+assrt.ok("1" + "2" in ["12", "x"])
+assrt.ok("1" + "2" not in ["1", "2"])
+if "1" + "2" not in ["1", "2"]:
+    assrt.ok(1)
+else:
+    assrt.ok(0)

package/test/internationalization.pyj

@@ -22,7 +22,7 @@ test_string('''a = _("""one
 two""")''', '#: <test>:1\nmsgid "one\\ntwo"\nmsgstr ""')
 test_string('a = _("{}one")', '#: <test>:1\n#, python-brace-format\nmsgid "{}one"\nmsgstr ""')
 test_string('a = _("{one}")', '#: <test>:1\n#, python-brace-format\nmsgid "{one}"\nmsgstr ""')
-test_string('ngettext("one", "two", 1)', '#: <test>:1\nmsgid "one"\nmsgid_plural "two"\nmsgstr ""')
+test_string('ngettext("one", "two", 1)', '#: <test>:1\nmsgid "one"\nmsgid_plural "two"\nmsgstr[0] ""\nmsgstr[1] ""')
 test_string('''_('o"ne')''', '#: <test>:1\nmsgid "o\\"ne"\nmsgstr ""')
 
 m = require('../tools/msgfmt.js')
@@ -43,11 +43,14 @@ msgid_plural "three"
 msgstr[0] "a"
 "bc"
 msgstr[1] "def"
+
+msgid "test \"quote\" escape"
+msgstr "good"
 ''')
 
 assrt.equal(2, catalog['nplurals'])
 assrt.equal('en', catalog['language'])
-assrt.equal(catalog['entries'].length, 2)
+assrt.equal(catalog['entries'].length, 3)
 item = catalog['entries'][0]
 assrt.equal(item['msgid'], 'one\ncontinued')
 assrt.deepEqual(item['msgstr'], v"['ONE']")
@@ -56,6 +59,9 @@ item = catalog['entries'][1]
 assrt.equal(item['msgid'], 'two')
 assrt.deepEqual(item['msgstr'], v"['abc', 'def']")
 assrt.ok(not item['fuzzy'], 'item not fuzzy')
+item = catalog['entries'][2]
+assrt.equal(item['msgid'], 'test "quote" escape')
+assrt.deepEqual(item['msgstr'], v"['good']")
 
 install({'entries': {
     'one':['ONE'],

package/test/regexp.pyj

@@ -36,9 +36,11 @@ assrt.equal(re.sub('a(b)', r'\g<1>', 'ab'), r'b')
 assrt.equal(re.sub('a(b)', def(m):return m.group(1);, 'ab'), r'b')
 assrt.equal(']', re.match('[]]', ']').group())
 
-assrt.throws(def():re.search(r'(?<=a)b', 'ab');, re.error)
 assrt.throws(def():re.search(r'(?(1)a|b)b', 'ab');, re.error)
 
+# Test lookbehind assertions
+assrt.equal('acdb', re.sub(r'(?<=a)b', 'c', 'abdb'))
+
 # Test named groups
 assrt.equal('aa', re.sub(r'(?P<a>a)b', r'\g<a>\1', 'ab'))
 assrt.equal('bb', re.sub(r'(?P<a>a)(?P=a)', r'bb', 'aa'))
@@ -51,4 +53,3 @@ assrt.equal(re.search(///
     .  # anything
     b
     ///, ' axb').group(), 'axb')
-

package/test/scoped_flags.pyj

@@ -10,6 +10,8 @@ assrt.ok(isinstance(a, dict))
 assrt.equal(a[1], 1)
 a[2] = 2
 assrt.equal(a[2], 2)
+a[2] += 4
+assrt.equal(a[2], 6)
 assrt.deepEqual(list(a.keys()), [1, 2])
 from __python__ import no_dict_literals, no_overload_getitem
 

package/test/starargs.pyj

@@ -297,3 +297,46 @@ p1, p2 = Pr(), Pr(a=1)
 eq(p1.prototype, p2.prototype)
 de(dir(p1), dir(p2))
 
+class Prn:
+
+    def __init__(self, x):
+        self.x = x
+
+class Prn1(Prn):
+
+    def __init__(self, x, *a):
+        Prn.__init__(self, [x, a])
+
+class Prn2(Prn):
+
+    def __init__(self, *a):
+        Prn.__init__(self, a)
+
+
+class Prn3(Prn):
+
+    def __init__(self, *a):
+        Prn.__init__(self, *a)
+
+p = Prn1(1, 2, 3)
+eq(p.x[0], 1)
+de(p.x[1], [2, 3])
+p = Prn2(1, 2)
+de(p.x, [1, 2])
+p = Prn3(1, 2)
+eq(p.x, 1)
+
+
+class Prnb:
+
+    def __init__(self, a, k):
+        self.a, self.k = a, k
+
+class Prnb1(Prnb):
+
+    def __init__(self, *a, **kw):
+        Prnb.__init__(self, a, kw)
+
+p = Prnb1(1, 2, x=1, y=2)
+de(p.a, [1, 2])
+de(p.k, {'x': 1, 'y':2})

package/test/str.pyj

@@ -42,11 +42,18 @@ def test_interpolation():
     ae(f'0{a}', '01')
     ae(f'0{a}2', '012')
     ae(f'{a}{b[-1]}', '1x')
-    ae(f'{c:,d}', '30,000')
+    ae(f'{c:,d}', (30000).toLocaleString())
     ae(f'\n', '\n')
     ae(f'{a}\\{b[0]}', '1\\x')
     ae(f'x\n\ny', 'x\n\ny')
+    ae(f'{a=}', 'a=1')
+    somevar = {'x': 1}
+    ae(f'{somevar.x=}', 'somevar.x=1')
 
+somevar = 33
+test('somevar=33', '{somevar=}', somevar=somevar)
+somevar = {'v': 'x'}
+test('somevar.v=x', '{somevar.v=}', somevar=somevar)
 test(' 1 2', ' {} {}', 1, 2)
 test('{ a ', '{{ {0} ', 'a')
 test('11', '{0}{0}', 1)
@@ -58,18 +65,22 @@ test('1', '{0[a][b]}', {'a':{'b':1}})
 test('x', '{}', def (): return 'x';)
 test('11', '{:b}', 3)
 test('0b11', '{:#b}', 3)
-test('30,000', '{:,d}', 30000)
+test((30000).toLocaleString(), '{:,d}', 30000)
+# in e.g. the indian number system, this is 3,00,000
+test((300000).toLocaleString(), '{:,d}', 300000)
 test('1.234568e+8', '{:e}', 123456789)
 test('1.23E+8', '{:.2E}', 123456789)
 test('12.35%', '{:.2%}', .123456789)
-test('1,234', '{:,}', 1234)
+test((1234).toLocaleString(), '{:,}', 1234)
 test('1_234', '{:_d}', 1234)
-test('1,234.000000', '{:,f}', 1234)
-test('1,234.0%', '{:,.1%}', 12.34)
-test('1,234.57', '{:,g}', 1234.567)
-test('1,234', '{:,g}', 1234)
+# 6 is the default: 1234.000000% or 1234,000000%
+test((1234).toLocaleString(undefined, {'minimumFractionDigits': 6}), '{:,f}', 1234)
+# 1234.0% or 1234,0%
+test((1234).toLocaleString(undefined, {'minimumFractionDigits': 1}) + '%', '{:,.1%}', 12.34)
+test((1234.57).toLocaleString(), '{:,g}', 1234.567)
+test((1234).toLocaleString(), '{:,g}', 1234)
 fnum = 1234
-ae(f'{fnum:,}', '1,234')
+ae(f'{fnum:,}', (1234).toLocaleString())
 test('left aligned                  ', '{:<30}', 'left aligned')
 test('                 right aligned', '{:>30}', 'right aligned')
 test('           centered           ', '{:^30}', 'centered')

package/tools/cli.js

@@ -350,7 +350,7 @@ it.
 create_group('lint', "[input1.pyj input2.pyj ...]", function(){/*
 Run the RapydScript linter. This will find various 
 possible problems in the .pyj files you specify and 
-write messages about them to stdout.
+write messages about them to stdout. Use - to read from STDIN.
 The main check it performs is for unused/undefined 
 symbols, like pyflakes does for python.
 */}, function() {/*
@@ -421,6 +421,11 @@ List all available linter checks, with a brief
 description, and exit.
 */});
 
+opt('stdin_filename', '', 'string', 'STDIN', function(){/*
+The filename for data read from STDIN. If not specified
+STDIN is used. 
+*/});
+
 create_group('test', '[test1 test2...]', function(){/*
 Run RapydScript tests. You can specify the name of 
 individual test files to only run tests from those 

package/tools/compiler.js

@@ -48,9 +48,9 @@ function regenerate(code, beautify) {
     } else {
         // Return the runtime
         ans = regenerator.compile('', {includeRuntime:true}).code;
-        start = ans.indexOf('!');
-        end = ans.lastIndexOf('})(');
-        end = ans.lastIndexOf('})(', end - 1);
+        start = ans.indexOf('=') + 1;
+        end = ans.lastIndexOf('typeof');
+        end = ans.lastIndexOf('}(', end);
         ans = ans.slice(start + 1, end);
         if (!beautify) {
             var extra = '})()';

package/tools/embedded_compiler.js

@@ -14,8 +14,8 @@ module.exports = function(compiler, baselib, runjs, name) {
     runjs(print_ast(compiler.parse(''), true));
     runjs('var __name__ = "' + (name || '__embedded__') + '";');
 
-    function print_ast(ast, keep_baselib, keep_docstrings, js_version) {
-        var output_options = {omit_baselib:!keep_baselib, write_name:false, private_scope:false, beautify:true, js_version: (js_version || 6), keep_docstrings:keep_docstrings};
+    function print_ast(ast, keep_baselib, keep_docstrings, js_version, private_scope, write_name) {
+        var output_options = {omit_baselib:!keep_baselib, write_name:!!write_name, private_scope:!!private_scope, beautify:true, js_version: (js_version || 6), keep_docstrings:keep_docstrings};
         if (keep_baselib) output_options.baselib_plain = baselib;
         var output = new compiler.OutputStream(output_options);
         ast.print(output);
@@ -36,7 +36,7 @@ module.exports = function(compiler, baselib, runjs, name) {
                 'scoped_flags': scoped_flags,
                 'discard_asserts': opts.discard_asserts,
             });
-            var ans = print_ast(this.toplevel, false, opts.keep_docstrings, opts.js_version);
+            var ans = print_ast(this.toplevel, opts.keep_baselib, opts.keep_docstrings, opts.js_version, opts.private_scope, opts.write_name);
             if (classes) {
                 var exports = {};
                 var self = this;

package/tools/export.js

@@ -176,9 +176,9 @@ function regenerate(code, beautify) {
     } else {
         // Return the runtime
         ans = regenerator.compile('', {includeRuntime:true}).code;
-        start = ans.indexOf('!');
-        end = ans.lastIndexOf('})(');
-        end = ans.lastIndexOf('})(', end - 1);
+        start = ans.indexOf('=') + 1;
+        end = ans.lastIndexOf('typeof');
+        end = ans.lastIndexOf('}(', end);
         ans = ans.slice(start + 1, end);
         if (!beautify) {
             var extra = '})()';

package/tools/gettext.js

@@ -82,8 +82,11 @@ function entry_to_string(msgid, data) {
     data.locations.forEach(function (loc) { ans.push('#: ' + loc); });
     if (data.format) ans.push('#, ' + data.format);
     ans.push('msgid "' + esc(msgid) + '"');
-    if (data.plural) ans.push('msgid_plural "' + esc(data.plural) + '"');
-    ans.push('msgstr ""');
+    if (data.plural) {
+        ans.push('msgid_plural "' + esc(data.plural) + '"');
+        ans.push('msgstr[0] ""');
+        ans.push('msgstr[1] ""');
+    } else ans.push('msgstr ""');
     return ans.join('\n');
 }
 

package/tools/lint.js

@@ -39,7 +39,7 @@ var BUILTINS = Object.create(null);
  ' NodeList alert console Node Symbol NamedNodeMap ρσ_eslice ρσ_delslice Number' +
  ' Boolean encodeURIComponent decodeURIComponent setTimeout setInterval' +
  ' setImmediate clearTimeout clearInterval clearImmediate requestAnimationFrame' +
- ' id repr sorted __name__ equals get_module ρσ_str jstype divmod'
+ ' id repr sorted __name__ equals get_module ρσ_str jstype divmod NaN'
  ).split(' ').forEach(function(x) { BUILTINS[x] = true; });
 
 Object.keys(RapydScript.NATIVE_CLASSES).forEach(function (name) { BUILTINS[name] = true; });
@@ -280,6 +280,18 @@ function Linter(toplevel, filename, code, options) {
     this.handle_assign = function() {
         var node = this.current_node;
 
+        var handle_destructured = function(self, flat) {
+            for (var i = 0; i < flat.length; i++) {
+                var cnode = flat[i];
+                if (cnode instanceof RapydScript.AST_SymbolRef) {
+                    self.current_node = cnode;
+                    cnode.lint_visited = true;
+                    self.add_binding(cnode.name);
+                    self.current_node = node;
+                }
+            }
+        };
+
         if (node.left instanceof RapydScript.AST_SymbolRef) {
             node.left.lint_visited = node.operator === '=';  // Could be compound assignment like: +=
             if (node.operator === '=') {
@@ -292,15 +304,10 @@ function Linter(toplevel, filename, code, options) {
         } else if (node.left instanceof RapydScript.AST_Array) {
             // destructuring assignment: a, b = 1, 2
             var flat = node.left.flatten();
-            for (var i = 0; i < flat.length; i++) {
-                var cnode = flat[i];
-                if (cnode instanceof RapydScript.AST_SymbolRef) {
-                    this.current_node = cnode;
-                    cnode.lint_visited = true;
-                    this.add_binding(cnode.name);
-                    this.current_node = node;
-                }
-            }
+            handle_destructured(this, node.left.flatten());
+
+        } else if (node.left instanceof RapydScript.AST_Seq && node.left.car instanceof RapydScript.AST_SymbolRef) {
+            handle_destructured(this, node.left.to_array());
         }
 
     };
@@ -557,7 +564,7 @@ function lint_code(code, options) {
 // CLI {{{
 
 function read_whole_file(filename, cb) {
-    if (!filename) {
+    if (!filename || filename === '-') {
         var chunks = [];
         process.stdin.setEncoding('utf-8');
         process.stdin.on('data', function (chunk) {
@@ -646,6 +653,10 @@ module.exports.cli = function(argv, base_path, src_path, lib_path) {
     if (argv.globals) argv.globals.split(',').forEach(function(sym) { builtins[sym] = true; });
     if (argv.noqa) argv.noqa.split(',').forEach(function(sym) { noqa[sym] = true; });
 
+    function path_for_filename(x) {
+        return x === '-' ? argv.stdin_filename : x;
+    }
+
     function lint_single_file(err, code) {
         var output, final_builtins = merge(builtins), final_noqa = merge(noqa), rl;
         if (err) {
@@ -654,7 +665,7 @@ module.exports.cli = function(argv, base_path, src_path, lib_path) {
         }
 
         // Read setup.cfg
-        rl = get_ini(path.dirname(files[0]));
+        rl = get_ini(path.dirname(path_for_filename(files[0])));
         var g = {};
         (rl.globals || rl.builtins || '').split(',').forEach(function (x) { g[x.trim()] = true; });
         final_builtins = merge(final_builtins, g);
@@ -674,7 +685,7 @@ module.exports.cli = function(argv, base_path, src_path, lib_path) {
         });
 
         // Lint!
-        if (lint_code(code, {filename:files[0], builtins:final_builtins, noqa:final_noqa, errorformat:argv.errorformat || false}).length) all_ok = false;
+        if (lint_code(code, {filename:path_for_filename(files[0]), builtins:final_builtins, noqa:final_noqa, errorformat:argv.errorformat || false}).length) all_ok = false;
 
         files = files.slice(1);
         if (files.length) {

package/tools/msgfmt.js

@@ -7,7 +7,7 @@
 "use strict";  /*jshint node:true */
 
 function unesc(string) {
-    return string.replace('\\"', '"').replace('\\n', '\n').replace('\\r', '\r').replace('\\t', '\t').replace('\\\\', '\\');
+    return string.replace(/\\"/g, '"').replace(/\\n/g, '\n').replace(/\\r/g, '\r').replace(/\\t/g, '\t').replace(/\\\\/g, '\\');
 }
 
 function parse(data, on_error) {

package/web-repl/env.js

@@ -47,6 +47,10 @@ var builtin_modules = {
 
     'fs': {
         'readFileSync': function readfile(name) {
+            if (namespace.virtual_file_system && namespace.virtual_file_system.read_file_sync) {
+                data = namespace.virtual_file_system.read_file_sync(name);
+                if (data !== null) return data;
+            }
             var data = namespace.file_data[name];
             if (data) return data;
             data = write_cache[name];
@@ -57,7 +61,9 @@ var builtin_modules = {
         },
 
         'writeFileSync': function writefile(name, data) {
-            write_cache[name] = data;
+            if (namespace.virtual_file_system && namespace.virtual_file_system.write_file_sync) {
+                namespace.virtual_file_system.write_file_sync(name, data);
+            } else write_cache[name] = data;
         },
 
     },

package/.appveyor.yml

@@ -1,13 +0,0 @@
-cache:
-    - node_modules -> package.json
-
-install:
-    - ps: Install-Product node ''
-    - npm install --no-optional
-
-test_script:
-    - node --version
-    - npm --version
-    - npm test
-
-build: off

package/.npmignore

@@ -1,9 +0,0 @@
-# use glob syntax
-*~
-*.swp
-*.tmp
-*.orig
-*.pyj-cached
-node_modules
-dev
-self.cpuprofile

package/.travis.yml

@@ -1,12 +0,0 @@
-language: node_js
-node_js:
-    - 0.12
-    - 4
-    - 5
-    - 6
-    - 7
-    - node
-os:
-    - linux
-    - osx
-sudo: false