rapydscript-ng 0.7.24 → 0.8.0

package/test/fmt.pyj

@@ -0,0 +1,201 @@
+# globals: assrt, fs, require, test_path, compiler_dir, console, RapydScript
+
+# Tests for the "fmt" sub-command (tools/fmt.mjs), the PEP8 style formatter for
+# RapydScript source code.
+
+fmt = require('./fmt.mjs')
+path = require('path')
+os = require('os')
+
+base_path = path.resolve(compiler_dir, '..')
+libdir = path.join(base_path, 'src', 'lib')
+
+async def parses(code):
+    ok = True
+    try:
+        await RapydScript.parse(code, {
+            'filename': 'fmt_test.pyj', 'basedir': test_path,
+            'libdir': libdir, 'for_linting': True
+        })
+    except:
+        ok = False
+        console.log('Formatted output failed to parse:\n' + code)
+    return ok
+
+nchecks = {'n': 0}
+
+async def check(name, src, expected, opts):
+    opts = opts or {}
+    out = fmt.format_string(src, opts)
+    assrt.equal(out, expected, 'format output mismatch for: ' + name)
+    # The formatter must be idempotent.
+    assrt.equal(fmt.format_string(out, opts), out, 'formatter not idempotent for: ' + name)
+    # The formatted output must remain valid RapydScript.
+    ok = await parses(out)
+    assrt.ok(ok, 'formatted output does not parse for: ' + name)
+    nchecks.n += 1
+
+
+async def run_tests():
+
+    # --- Whitespace / operator normalization -------------------------------
+    await check('binary-ops', 'x=1+2*3\n', 'x = 1 + 2 * 3\n')
+    await check('collapse-spaces', 'y  =   f( a ,b )\n', 'y = f(a, b)\n')
+    await check('unary-minus', 'x = -1\ny = a - 1\n', 'x = -1\ny = a - 1\n')
+    await check('unary-not', 'z = not  x\n', 'z = not x\n')
+    await check('word-ops', 'q=a and b or c\n', 'q = a and b or c\n')
+    await check('is-not', 'r = a is not b\n', 'r = a is not b\n')
+    await check('power', 'p = a**b\n', 'p = a ** b\n')
+    await check('attribute', 'v = a . b . c\n', 'v = a.b.c\n')
+
+    # --- kwargs / defaults vs assignment -----------------------------------
+    await check('kwargs', 'f( a=1, b = 2 )\n', 'f(a=1, b=2)\n')
+    await check('defaults', 'def g(a, b=3, c = 4):\n    return a\n',
+                'def g(a, b=3, c=4):\n    return a\n')
+    await check('assignment-spaces', 'x=1\n', 'x = 1\n')
+    await check('augmented', 'x+=1\n', 'x += 1\n')
+
+    # --- splat / unpacking --------------------------------------------------
+    await check('splat', 'f( *args, **kwargs )\n', 'f(*args, **kwargs)\n')
+
+    # --- slices / index / dict / list --------------------------------------
+    await check('slice', 'a = b[ 1 : 2 ]\n', 'a = b[1:2]\n')
+    await check('slice-step', 'a = b[::2]\n', 'a = b[::2]\n')
+    await check('index', 'c = d[ x ]\n', 'c = d[x]\n')
+    await check('negative-index', 'c = d[-1]\n', 'c = d[-1]\n')
+    await check('dict', 'e = {"a":1,"b":2}\n', "e = {'a': 1, 'b': 2}\n")
+    await check('list', 'l = [ 1,2,3 ]\n', 'l = [1, 2, 3]\n')
+
+    # --- comprehensions -----------------------------------------------------
+    await check('list-comp', 'a=[i*i for i in range(1,20) if i*i%3==0]\n',
+                'a = [i * i for i in range(1, 20) if i * i % 3 == 0]\n')
+    await check('dict-comp', 'd={x:x+1 for x in range(20) if x>2}\n',
+                'd = {x: x + 1 for x in range(20) if x > 2}\n')
+
+    # --- quote normalization -----------------------------------------------
+    await check('quote-to-single', 'a = "hi"\n', "a = 'hi'\n")
+    await check('quote-to-double', "a = 'hi'\n", 'a = "hi"\n', {'preferred_quote': 'double'})
+    # Do not re-quote when it would add escapes.
+    await check('quote-keep-apostrophe', 'a = "it\'s"\n', 'a = "it\'s"\n')
+    await check('quote-keep-embedded-double', 'a = \'say "hi"\'\n', 'a = \'say "hi"\'\n')
+    # Raw / f / verbatim strings are never re-quoted.
+    await check('quote-raw-untouched', 'a = r"\\d+"\n', 'a = r"\\d+"\n')
+    await check('quote-fstring-untouched', 'a = f"x{y}"\n', 'a = f"x{y}"\n')
+
+    # --- indentation normalization (tabs and 2-space -> 4-space) -----------
+    await check('tab-indent', 'if True:\n\tx = 1\n', 'if True:\n    x = 1\n')
+    await check('two-space-indent', 'if True:\n  x = 1\n  if x:\n    y = 2\n',
+                'if True:\n    x = 1\n    if x:\n        y = 2\n')
+
+    # --- blank line policy --------------------------------------------------
+    await check('cap-blank-lines', 'a = 1\n\n\n\n\nb = 2\n', 'a = 1\n\n\nb = 2\n')
+    await check('two-blanks-between-defs',
+                'def f():\n    pass\ndef g():\n    pass\n',
+                'def f():\n    pass\n\n\ndef g():\n    pass\n')
+    await check('one-blank-between-methods',
+                'class A:\n    def f(self):\n        pass\n    def g(self):\n        pass\n',
+                'class A:\n    def f(self):\n        pass\n\n    def g(self):\n        pass\n')
+    await check('collapse-def-blanks',
+                'def f():\n    pass\n\n\n\n\ndef g():\n    pass\n',
+                'def f():\n    pass\n\n\ndef g():\n    pass\n')
+
+    # --- comments -----------------------------------------------------------
+    await check('comment-space', '#hello\nx = 1\n', '# hello\nx = 1\n')
+    await check('trailing-comment', 'x = 1 #note\n', 'x = 1  # note\n')
+    await check('comment-before-def',
+                '# a helper\ndef f():\n    pass\n',
+                '# a helper\ndef f():\n    pass\n')
+
+    # --- decorators ---------------------------------------------------------
+    await check('decorators',
+                '@makebold\n@makeitalic\ndef hello():\n    return "hi"\n',
+                "@makebold\n@makeitalic\ndef hello():\n    return 'hi'\n")
+
+    # --- line wrapping ------------------------------------------------------
+    await check('wrap-call',
+                'result = fn(aaaaaaaa, bbbbbbbb, cccccccc, dddddddd, eeeeeeee)\n',
+                'result = fn(\n    aaaaaaaa,\n    bbbbbbbb,\n    cccccccc,\n    dddddddd,\n    eeeeeeee\n)\n',
+                {'line_length': 30})
+    await check('wrap-list-trailing-comma',
+                'data = [11111111, 22222222, 33333333, 44444444]\n',
+                'data = [\n    11111111,\n    22222222,\n    33333333,\n    44444444,\n]\n',
+                {'line_length': 20})
+    # Short lines are left alone.
+    await check('no-wrap-short', 'x = f(a, b)\n', 'x = f(a, b)\n', {'line_length': 80})
+    # Comprehensions must never be wrapped on their (tuple-unpacking) commas.
+    await check('no-wrap-comprehension',
+                'result = [transform(it) for it, index in enumerate(collection) if it.is_valid]\n',
+                'result = [transform(it) for it, index in enumerate(collection) if it.is_valid]\n',
+                {'line_length': 40})
+
+    # --- reflow of simple multi-line statements ----------------------------
+    await check('reflow-simple-call',
+                'x = fn(\n    a,\n    b,\n    c\n)\n',
+                'x = fn(a, b, c)\n')
+
+    # --- RapydScript specific constructs are preserved ----------------------
+    await check('preserve-anon-function',
+                "params = {\n    'onclick': def(event):\n        alert('hi')\n    ,\n    'x': 5\n}\n",
+                "params = {\n    'onclick': def(event):\n        alert('hi')\n    ,\n    'x': 5\n}\n")
+    await check('preserve-chain',
+                "$(element)\n.css('background-color', 'red')\n.show()\n",
+                "$(element)\n.css('background-color', 'red')\n.show()\n")
+    await check('preserve-verbatim-js', "a = v'var x = {foo: 1};'\n", "a = v'var x = {foo: 1};'\n")
+    await check('preserve-regex', 'b = /a(b)/g\n', 'b = /a(b)/g\n')
+    await check('preserve-verbose-regex',
+                "c = re.match(///\n  a  # comment\n  b\n///, 'ab')\n",
+                "c = re.match(///\n  a  # comment\n  b\n///, 'ab')\n")
+    await check('preserve-fstring', "msg = f'hello {name} world'\n", "msg = f'hello {name} world'\n")
+    await check('preserve-triple-string',
+                "text = '''\nline one\n    line two\n'''\n",
+                "text = '''\nline one\n    line two\n'''\n")
+    await check('preserve-existential',
+                'ans = a?.b?[1]?()\nv = b ? c\n',
+                'ans = a?.b?[1]?()\nv = b ? c\n')
+
+    # --- backslash continuation is preserved --------------------------------
+    await check('preserve-backslash',
+                'x = a + \\\n    b + \\\n    c\n',
+                'x = a + \\\n    b + \\\n    c\n')
+
+    # --- inline anonymous function on a single line -------------------------
+    await check('inline-anon', 'add = def(a,b): return a+b\n',
+                'add = def(a, b): return a + b\n')
+
+    # --- shebang preserved --------------------------------------------------
+    await check('shebang', '#!/usr/bin/env rapydscript\nx=1\n',
+                '#!/usr/bin/env rapydscript\nx = 1\n')
+
+    # --- empty / whitespace only input --------------------------------------
+    assrt.equal(fmt.format_string('', {}), '', 'empty input -> empty output')
+    assrt.equal(fmt.format_string('\n\n\n', {}), '', 'blank input -> empty output')
+
+    # --- check_report -------------------------------------------------------
+    errs = fmt.check_report('a.pyj', 'x=1\n', fmt.format_string('x=1\n', {}), {})
+    assrt.ok(errs.length >= 1, 'check_report must flag files that would be reformatted')
+    assrt.ok(errs[0].indexOf('would be reformatted') >= 0, 'check_report message content')
+
+    errs2 = fmt.check_report('a.pyj', 'x = 1\n', 'x = 1\n', {})
+    assrt.equal(errs2.length, 0, 'check_report must be silent for already-formatted, short files')
+
+    longline = 'x = ' + "'" + Array(90).join('a') + "'" + '\n'
+    errs3 = fmt.check_report('a.pyj', longline, longline, {'line_length': 80})
+    assrt.ok(errs3.length >= 1, 'check_report must flag over-length lines')
+    assrt.ok(errs3.join('\n').indexOf('exceeds') >= 0, 'check_report over-length message content')
+
+    # --- collect_pyj_files (directory recursion) ----------------------------
+    tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'rs-fmt-'))
+    fs.mkdirSync(path.join(tmp, 'sub'))
+    fs.writeFileSync(path.join(tmp, 'a.pyj'), 'x=1\n')
+    fs.writeFileSync(path.join(tmp, 'sub', 'b.pyj'), 'y=2\n')
+    fs.writeFileSync(path.join(tmp, 'c.txt'), 'not rapydscript\n')
+    collected = await fmt.collect_pyj_files([tmp])
+    assrt.equal(collected.length, 2, 'collect_pyj_files must recurse and find 2 .pyj files')
+    for f in collected:
+        assrt.ok(f.indexOf('.txt') < 0, 'collect_pyj_files must skip non .pyj files in directories')
+    # An explicitly named non .pyj file is still included.
+    collected2 = await fmt.collect_pyj_files([path.join(tmp, 'c.txt')])
+    assrt.equal(collected2.length, 1, 'explicitly named files are always included')
+    fs.rmSync(tmp, {'recursive': True})
+
+__test_async_done__ = run_tests()

package/test/generic.pyj

@@ -2,10 +2,12 @@
 
 import traceback
 
+_throw_test_promises = []
+
 def throw_test(code):
-    assrt.throws(def():
-        RapydScript.parse(code, {'filename':code}).body[0]
-    , RapydScript.SyntaxError)
+    _throw_test_promises.append(assrt.rejects(async def():
+        await RapydScript.parse(code, {'filename':code})
+    , RapydScript.SyntaxError))
 
 # unary operators
 assrt.equal(-(1), -1)
@@ -368,3 +370,5 @@ if "1" + "2" not in ["1", "2"]:
     assrt.ok(1)
 else:
     assrt.ok(0)
+
+Promise.all(_throw_test_promises)

package/test/imports.pyj

@@ -64,9 +64,11 @@ eq(GLOBAL_SYMBOL, 'i am global')
 # Import errors happen during parsing, so we cannot test them directly as they would
 # prevent this file from being parsed.
 
-assrt.throws(def():
-    RapydScript.parse('from _import_one import not_exported', {'basedir':test_path}).body[0]
-, /not exported/)
-assrt.throws(def():
-    RapydScript.parse('import xxxx', {'basedir':test_path}).body[0]
-, /doesn't exist/)
+Promise.all([
+    assrt.rejects(async def():
+        await RapydScript.parse('from _import_one import not_exported', {'basedir':test_path})
+    , /not exported/),
+    assrt.rejects(async def():
+        await RapydScript.parse('import xxxx', {'basedir':test_path})
+    , /doesn't exist/),
+])

package/test/internationalization.pyj

@@ -3,30 +3,29 @@
 
 from gettext import gettext as _, ngettext, install
 
-g = require('../tools/gettext.js')
-
-def gettext(code):
+async def gettext(code):
     ans = {}
-    g.gettext(ans, code, '<test>')
+    await rs_gettext(ans, code, '<test>')
     return ans
 
-def test_string(code, *args):
-    catalog = gettext(code)
+async def test_string(code, *args):
+    catalog = await gettext(code)
     assrt.equal(len(catalog), len(args))
     for msgid, q in zip(Object.keys(catalog), args):
-        assrt.equal(g.entry_to_string(msgid, catalog[msgid]), q)
+        assrt.equal(rs_entry_to_string(msgid, catalog[msgid]), q)
 
-test_string('a = _("one")', '#: <test>:1\nmsgid "one"\nmsgstr ""')
-test_string('a = _("one")\nb = gettext("one")', '#: <test>:1\n#: <test>:2\nmsgid "one"\nmsgstr ""')
-test_string('''a = _("""one
+async def run_all_tests():
+    await test_string('a = _("one")', '#: <test>:1\nmsgid "one"\nmsgstr ""')
+    await test_string('a = _("one")\nb = gettext("one")', '#: <test>:1\n#: <test>:2\nmsgid "one"\nmsgstr ""')
+    await 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[0] ""\nmsgstr[1] ""')
-test_string('''_('o"ne')''', '#: <test>:1\nmsgid "o\\"ne"\nmsgstr ""')
+    await test_string('a = _("{}one")', '#: <test>:1\n#, python-brace-format\nmsgid "{}one"\nmsgstr ""')
+    await test_string('a = _("{one}")', '#: <test>:1\n#, python-brace-format\nmsgid "{one}"\nmsgstr ""')
+    await test_string('ngettext("one", "two", 1)', '#: <test>:1\nmsgid "one"\nmsgid_plural "two"\nmsgstr[0] ""\nmsgstr[1] ""')
+    await test_string('''_('o"ne')''', '#: <test>:1\nmsgid "o\\"ne"\nmsgstr ""')
 
-m = require('../tools/msgfmt.js')
-catalog = m.parse(r'''
+    m = rs_msgfmt
+    catalog = m.parse(r'''
 msgid ""
 msgstr ""
 "Language: en\n"
@@ -48,26 +47,28 @@ msgid "test \"quote\" escape"
 msgstr "good"
 ''')
 
-assrt.equal(2, catalog['nplurals'])
-assrt.equal('en', catalog['language'])
-assrt.equal(catalog['entries'].length, 3)
-item = catalog['entries'][0]
-assrt.equal(item['msgid'], 'one\ncontinued')
-assrt.deepEqual(item['msgstr'], v"['ONE']")
-assrt.ok(item['fuzzy'], 'item not fuzzy')
-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']")
+    assrt.equal(2, catalog['nplurals'])
+    assrt.equal('en', catalog['language'])
+    assrt.equal(catalog['entries'].length, 3)
+    item = catalog['entries'][0]
+    assrt.equal(item['msgid'], 'one\ncontinued')
+    assrt.deepEqual(item['msgstr'], v"['ONE']")
+    assrt.ok(item['fuzzy'], 'item not fuzzy')
+    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'],
+        'two':['1', '2'],
+    }})
 
-install({'entries': {
-    'one':['ONE'],
-    'two':['1', '2'],
-}})
+    assrt.equal(_('one'), 'ONE')
+    assrt.equal(ngettext('two', 'xxx', 1), '1')
+    assrt.equal(ngettext('two', 'xxx', 100), '2')
 
-assrt.equal(_('one'), 'ONE')
-assrt.equal(ngettext('two', 'xxx', 1), '1')
-assrt.equal(ngettext('two', 'xxx', 100), '2')
+run_all_tests()

package/test/lint.pyj

@@ -2,15 +2,15 @@
 # License: BSD
 # Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
 
-linter = require('../tools/lint.js')
+linter = require('../tools/lint.mjs')
 
-def lint(code):
-    return linter.lint_code(code, {'filename':'<test>', 'report':def():
+async def lint(code):
+    return await linter.lint_code(code, {'filename':'<test>', 'report':def():
                                    pass
 })
 
-def err_test(code, ident, line, name, other_line):
-    msgs = lint(code)
+async def err_test(code, ident, line, name, other_line):
+    msgs = await lint(code)
     assrt.ok(len(msgs) > 0, 'failed to find error in: ' + code)
     assrt.equal(len(msgs), 1, 'found ' + (len(msgs) - 1) + ' extra errors in: ' + code)
     assrt.equal(msgs[0].ident, ident, 'incorrect ident: ' + msgs[0].ident + ' for: ' + code)
@@ -21,110 +21,111 @@ def err_test(code, ident, line, name, other_line):
     if other_line != undefined:
         assrt.equal(msgs[0].other_line, other_line, 'incorrect other_line: ' + msgs[0].other_line + ' for: ' + code)
 
-def ok_test(code):
-    msgs = lint(code)
+async def ok_test(code):
+    msgs = await lint(code)
     assrt.equal(msgs.length, 0, 'Got unexpected msg: ' + (msgs[0] or {}).message + ' for code: ' + code)
 
-# Imports
-err_test('import foo', 'unused-import', 1, 'foo')
-err_test('import foo.boo', 'unused-import', 1, 'foo')
-err_test('import foo as boo', 'unused-import', 1, 'boo')
-err_test('from x import foo', 'unused-import', 1, 'foo')
-err_test('from x import foo as boo', 'unused-import', 1, 'boo')
-ok_test('import foo\nfoo')
-
-# Function arguments
-ok_test('def f(a):\n return a')
-ok_test('def f(a=1):\n return a')
-ok_test('def f(*a):\n return a')
-ok_test('def f(**a):\n return a')
-ok_test('def f(a):\n return 1')
-
-# Extended slices
-ok_test('a = []; a[::2], a[1:-1]')
-
-# Top level unused ignored
-ok_test('a=1\ndef f():\n pass')
-
-# Destructuring assignment
-ok_test('def f():\n a, b = 1, 2; a, b')
-ok_test('def f():\n a = 1; b, c = a, 2; return b, c')
-ok_test('for x, (y, z) in [ [1, [2, 3]] ]:\n x + y + z')
-err_test('def f():\n a, b = 1, 1; return a', 'unused-local', 2, 'b')
-
-# Compound assignment
-err_test('a += 1', 'undef', 1, 'a')
-ok_test('def f():\n a = 1; a += 1')
-
-# Unused bindings
-err_test('def f():\n a=1', 'unused-local', 2, 'a')
-err_test('def f():\n def a():\n  pass', 'unused-local', 2, 'a')
-
-# Undefined references
-err_test('f()', 'undef', 1, 'f')
-err_test('a', 'undef', 1, 'a')
-err_test('def f():\n a=1; return a\na', 'undef', 3, 'a')
-
-# Comprehensions
-ok_test('[x for x in [1,2]]')
-ok_test('[1 for x in [1,2] if x]')
-ok_test('[1 for x in [1,2]]')
-ok_test('def f():\n l=[1,2];[x for x in l]')
-ok_test('def f():\n l=[1,2];{x:True for x in l}')
-err_test('def f():\n [x for x in [1,2]]; return x', 'undef', 2, 'x')
-
-# Loops
-ok_test('def f():\n for x in "":\n  pass\n return x')
-ok_test('def f():\n for x in "":\n  x += 1\n')
-ok_test('def f():\n for x, y in "":\n  pass\n return x, y')
-ok_test('for v"var i = 0; i < 1; i++":\n print(i)')
-err_test('def f():\n a = 1\n for a in "":\n  a', 'loop-shadowed', 3, 'a', 2)
-
-# Semi-colons
-err_test('a=1;;a', 'extra-semicolon', 1, ';')
-err_test('a=1;', 'eol-semicolon', 1, ';')
-ok_test('a = """\nhello;\n"""')
-ok_test("a = '''\nhello;\n'''")
-
-# Builtins
-for k in 'String Symbol this self window Map arguments print len range dir undefined'.split(' '):
-    ok_test(k)
-
-# noqa
-ok_test('f() # noqa')
-ok_test('f() # noqa:undef')
-err_test('f() # noqa:xxx', 'undef')
-
-# Named func in branch
-err_test('if 1:\n def f():\n  pass', 'func-in-branch', 2, 'f')
-err_test('if 1:\n pass\nelse:\n def f():\n  pass', 'func-in-branch', 4, 'f')
-err_test('try:\n def f():\n  pass\nexcept:\n pass', 'func-in-branch', 2, 'f')
-ok_test('if 1:\n a = def():\n  pass')
-
-# Syntax errors
-err_test('def f(:\n pass', 'syntax-err', 1)
-
-# Functions
-ok_test('def f():\n pass\nf()')
-
-# Non-locals
-err_test('def a():\n x = 1\n def b():\n  nonlocal x\n b()', 'unused-local', 2, 'x')
-ok_test('def a():\n x = 1\n def b():\n  nonlocal x\n  x\n b()')
-ok_test('def a():\n x = 1\n def b():\n  nonlocal x\n  x\n  x = 2\n b()')
-ok_test('def a():\n x = 1\n def ():\n  nonlocal x\n  x = 1\n  x')
-ok_test('nonlocal a\na()')
-
-# Define after use
-err_test('def g():\n f()\n f()\n def f():\n  pass', 'def-after-use', 3, 'f')
-
-# Decorators
-ok_test('from x import y\n@y\ndef f():\n pass')
-
-# try/except
-ok_test('try:\n 1\nexcept Error as e:\n e')
-
-# Classes
-ok_test('''
+async def run_tests():
+    # Imports
+    await err_test('import foo', 'unused-import', 1, 'foo')
+    await err_test('import foo.boo', 'unused-import', 1, 'foo')
+    await err_test('import foo as boo', 'unused-import', 1, 'boo')
+    await err_test('from x import foo', 'unused-import', 1, 'foo')
+    await err_test('from x import foo as boo', 'unused-import', 1, 'boo')
+    await ok_test('import foo\nfoo')
+
+    # Function arguments
+    await ok_test('def f(a):\n return a')
+    await ok_test('def f(a=1):\n return a')
+    await ok_test('def f(*a):\n return a')
+    await ok_test('def f(**a):\n return a')
+    await ok_test('def f(a):\n return 1')
+
+    # Extended slices
+    await ok_test('a = []; a[::2], a[1:-1]')
+
+    # Top level unused ignored
+    await ok_test('a=1\ndef f():\n pass')
+
+    # Destructuring assignment
+    await ok_test('def f():\n a, b = 1, 2; a, b')
+    await ok_test('def f():\n a = 1; b, c = a, 2; return b, c')
+    await ok_test('for x, (y, z) in [ [1, [2, 3]] ]:\n x + y + z')
+    await err_test('def f():\n a, b = 1, 1; return a', 'unused-local', 2, 'b')
+
+    # Compound assignment
+    await err_test('a += 1', 'undef', 1, 'a')
+    await ok_test('def f():\n a = 1; a += 1')
+
+    # Unused bindings
+    await err_test('def f():\n a=1', 'unused-local', 2, 'a')
+    await err_test('def f():\n def a():\n  pass', 'unused-local', 2, 'a')
+
+    # Undefined references
+    await err_test('f()', 'undef', 1, 'f')
+    await err_test('a', 'undef', 1, 'a')
+    await err_test('def f():\n a=1; return a\na', 'undef', 3, 'a')
+
+    # Comprehensions
+    await ok_test('[x for x in [1,2]]')
+    await ok_test('[1 for x in [1,2] if x]')
+    await ok_test('[1 for x in [1,2]]')
+    await ok_test('def f():\n l=[1,2];[x for x in l]')
+    await ok_test('def f():\n l=[1,2];{x:True for x in l}')
+    await err_test('def f():\n [x for x in [1,2]]; return x', 'undef', 2, 'x')
+
+    # Loops
+    await ok_test('def f():\n for x in "":\n  pass\n return x')
+    await ok_test('def f():\n for x in "":\n  x += 1\n')
+    await ok_test('def f():\n for x, y in "":\n  pass\n return x, y')
+    await ok_test('for v"var i = 0; i < 1; i++":\n print(i)')
+    await err_test('def f():\n a = 1\n for a in "":\n  a', 'loop-shadowed', 3, 'a', 2)
+
+    # Semi-colons
+    await err_test('a=1;;a', 'extra-semicolon', 1, ';')
+    await err_test('a=1;', 'eol-semicolon', 1, ';')
+    await ok_test('a = """\nhello;\n"""')
+    await ok_test("a = '''\nhello;\n'''")
+
+    # Builtins
+    for k in 'String Symbol this self window Map arguments print len range dir undefined'.split(' '):
+        await ok_test(k)
+
+    # noqa
+    await ok_test('f() # noqa')
+    await ok_test('f() # noqa:undef')
+    await err_test('f() # noqa:xxx', 'undef')
+
+    # Named func in branch
+    await err_test('if 1:\n def f():\n  pass', 'func-in-branch', 2, 'f')
+    await err_test('if 1:\n pass\nelse:\n def f():\n  pass', 'func-in-branch', 4, 'f')
+    await err_test('try:\n def f():\n  pass\nexcept:\n pass', 'func-in-branch', 2, 'f')
+    await ok_test('if 1:\n a = def():\n  pass')
+
+    # Syntax errors
+    await err_test('def f(:\n pass', 'syntax-err', 1)
+
+    # Functions
+    await ok_test('def f():\n pass\nf()')
+
+    # Non-locals
+    await err_test('def a():\n x = 1\n def b():\n  nonlocal x\n b()', 'unused-local', 2, 'x')
+    await ok_test('def a():\n x = 1\n def b():\n  nonlocal x\n  x\n b()')
+    await ok_test('def a():\n x = 1\n def b():\n  nonlocal x\n  x\n  x = 2\n b()')
+    await ok_test('def a():\n x = 1\n def ():\n  nonlocal x\n  x = 1\n  x')
+    await ok_test('nonlocal a\na()')
+
+    # Define after use
+    await err_test('def g():\n f()\n f()\n def f():\n  pass', 'def-after-use', 3, 'f')
+
+    # Decorators
+    await ok_test('from x import y\n@y\ndef f():\n pass')
+
+    # try/except
+    await ok_test('try:\n 1\nexcept Error as e:\n e')
+
+    # Classes
+    await ok_test('''
 class A:
 
     h = j = 1
@@ -146,21 +147,23 @@ class B(A):
     def __init__(self):
         A.__init__(self, 'b')
 ''')
-err_test('class A:\n def a(self):\n  a()', 'undef', 3, 'a')
-err_test('class A:\n def a(self):\n  pass\n def a(self):\n  pass', 'dup-method', 4, 'a')
+    await err_test('class A:\n def a(self):\n  a()', 'undef', 3, 'a')
+    await err_test('class A:\n def a(self):\n  pass\n def a(self):\n  pass', 'dup-method', 4, 'a')
 
-# Object literals
-err_test('{"a":1, "a":2}', 'dup-key', 1, 'a')
+    # Object literals
+    await err_test('{"a":1, "a":2}', 'dup-key', 1, 'a')
 
-# keyword arg values
-ok_test('def f():\n a=1\n f(b=a)')
-ok_test('def f():\n a={}\n f(**a)')
+    # keyword arg values
+    await ok_test('def f():\n a=1\n f(b=a)')
+    await ok_test('def f():\n a={}\n f(**a)')
 
-# with statement
-ok_test('''
+    # with statement
+    await ok_test('''
 def f():
     a = 1
     with a as b:
         b()
 ''')
-err_test('with a:\n pass', 'undef', '1', 'a')
+    await err_test('with a:\n pass', 'undef', '1', 'a')
+
+__test_async_done__ = run_tests()