rapydscript-ns 0.8.2 → 0.8.4

package/test/annotations.pyj

@@ -1,80 +1,80 @@
-def add(a: int, b: float):
-    return a + b
-
-assrt.ok(add.__annotations__)
-assrt.equal(add.__annotations__['a'], int)
-assrt.equal(add.__annotations__['b'], float)
-assrt.equal(add.__annotations__['return'], undefined)
-
-def sum(ls: list) -> int:
-    pass
-
-assrt.ok(not (sum.__annotations__ == undefined))
-assrt.deepEqual(sum.__annotations__, {
-    'ls': list,
-    'return': int
-})
-
-def optional(a:int=10):
-    return a
-
-assrt.ok(not (optional.__annotations__ == undefined))
-assrt.equal(optional.__annotations__.a, int)
-assrt.equal(optional.__defaults__.a, 10)
-
-def otherexpr(a:3+4) -> [1, 2]:
-    pass
-
-assrt.ok(not (otherexpr.__annotations__ == undefined))
-assrt.equal(otherexpr.__annotations__['a'], 7)
-assrt.deepEqual(otherexpr.__annotations__['return'], [1, 2])
-
-def basic(x:float):
-    pass
-
-assrt.deepEqual(basic.__annotations__, {
-    'x': float
-})
-
-def kwstarargs(*args:list, **kwargs:dict) -> int:
-    pass
-
-assrt.equal(kwstarargs.__annotations__['return'], int)
-
-def nothing():
-    pass
-
-assrt.ok(nothing.__annotations__ == undefined)
-assrt.throws(def():
-    nothing.__annotations__['return']
-)
-
-test = def(x: int):
-    pass
-
-assrt.deepEqual(test.__annotations__, {
-    'x': int
-})
-
-anonreturn = def() -> 'test':
-    pass
-
-assrt.equal(anonreturn.__annotations__['return'], 'test')
-
-assrt.equal(def asexpr(a: int):
-    a
-.__annotations__['a'], int)
-
-assrt.deepEqual(def(a: int) -> float:
-    a + 10.0
-.__annotations__, {
-    'a': int,
-    'return': float
-})
-
-class A:
-
-    def f(self, a : int, b: 'x') -> float:
-        pass
-
-assrt.deepEqual(A.prototype.f.__annotations__, {'a':int, 'b':'x', 'return': float})
+def add(a: int, b: float):
+    return a + b
+
+assrt.ok(add.__annotations__)
+assrt.equal(add.__annotations__['a'], int)
+assrt.equal(add.__annotations__['b'], float)
+assrt.equal(add.__annotations__['return'], undefined)
+
+def sum(ls: list) -> int:
+    pass
+
+assrt.ok(not (sum.__annotations__ == undefined))
+assrt.deepEqual(sum.__annotations__, {
+    'ls': list,
+    'return': int
+})
+
+def optional(a:int=10):
+    return a
+
+assrt.ok(not (optional.__annotations__ == undefined))
+assrt.equal(optional.__annotations__.a, int)
+assrt.equal(optional.__defaults__.a, 10)
+
+def otherexpr(a:3+4) -> [1, 2]:
+    pass
+
+assrt.ok(not (otherexpr.__annotations__ == undefined))
+assrt.equal(otherexpr.__annotations__['a'], 7)
+assrt.deepEqual(otherexpr.__annotations__['return'], [1, 2])
+
+def basic(x:float):
+    pass
+
+assrt.deepEqual(basic.__annotations__, {
+    'x': float
+})
+
+def kwstarargs(*args:list, **kwargs:dict) -> int:
+    pass
+
+assrt.equal(kwstarargs.__annotations__['return'], int)
+
+def nothing():
+    pass
+
+assrt.ok(nothing.__annotations__ == undefined)
+assrt.throws(def():
+    nothing.__annotations__['return']
+)
+
+test = def(x: int):
+    pass
+
+assrt.deepEqual(test.__annotations__, {
+    'x': int
+})
+
+anonreturn = def() -> 'test':
+    pass
+
+assrt.equal(anonreturn.__annotations__['return'], 'test')
+
+assrt.equal(def asexpr(a: int):
+    a
+.__annotations__['a'], int)
+
+assrt.deepEqual(def(a: int) -> float:
+    a + 10.0
+.__annotations__, {
+    'a': int,
+    'return': float
+})
+
+class A:
+
+    def f(self, a : int, b: 'x') -> float:
+        pass
+
+assrt.deepEqual(A.prototype.f.__annotations__, {'a':int, 'b':'x', 'return': float})

package/test/baselib.pyj

@@ -117,8 +117,8 @@ assrt.throws(def():a.index(8);, ValueError)
 assrt.throws(def():a.index(1, 1);, ValueError)
 assrt.throws(def():a.index(4, 1, 2);, ValueError)
 assrt.equal(1, a.index(2, 1, 2))
-assrt.throws(def():a.pypop(10);, IndexError)
-assrt.equal(a.pypop(-1), 4)
+assrt.throws(def():a.pop(10);, IndexError)
+assrt.equal(a.pop(-1), 4)
 assrt.deepEqual(a, [1,2,3])
 assrt.equal(a.remove(2), None)
 assrt.deepEqual(a, [1, 3])
@@ -141,9 +141,9 @@ assrt.ok(a.as_array().extend == undefined)
 a = [1, 2, 1]
 assrt.equal(a.count(1), 2)
 a = [3, 2, 4, 1]
-a.pysort()
+a.sort()
 assrt.deepEqual(a, [1,2,3,4])
-a.pysort(reverse=True)
+a.sort(reverse=True)
 assrt.deepEqual(a, [4,3,2,1])
 assrt.deepEqual(a, a.slice())
 assrt.ok(a is not a.slice())

package/test/classes.pyj

@@ -67,7 +67,7 @@ bound = angela.get_bound_method()
 assrt.equal(bound(), angela.how_long())
 
 # function methods
-assrt.deepEqual(dir(angela).sort(), [
+assrt.deepEqual(sorted(dir(angela)), [
     'HAIRS',
     "__init__",
     '__repr__',
@@ -137,22 +137,61 @@ inc()
 assrt.equal(c.count, 6)
 
 # nested classes
-# not yet fully implemented
-#class Molecule:
-#   class Atom:
-#       def __init__(self, element):
-#           self.element = element
-#
-#   def __init__(self, elements):
-#       self.structure = []
-#       for e in elements:
-#           self.structure.push(Molecule.Atom(e))
-#
-#water = Molecule(['H', "H", 'O'])
-#assrt.equal(len(water.structure), 3)
-#assrt.equal(water.structure[0].element, 'H')
-#for atom in water.structure:
-#   assrt.ok(isinstance(atom, Molecule.Atom))
+class Molecule:
+    class Atom:
+        def __init__(self, element):
+            self.element = element
+        def __repr__(self):
+            return 'Atom(' + self.element + ')'
+
+    def __init__(self, elements):
+        self.structure = []
+        for e in elements:
+            self.structure.push(Molecule.Atom(e))
+
+water = Molecule(['H', 'H', 'O'])
+assrt.equal(len(water.structure), 3)
+assrt.equal(water.structure[0].element, 'H')
+assrt.equal(water.structure[2].element, 'O')
+for atom in water.structure:
+    assrt.ok(isinstance(atom, Molecule.Atom))
+
+# nested class accessible via class reference and via instance attribute
+assrt.ok(Molecule.Atom is water.structure[0].__class__)
+# nested class can also be accessed via instance (self.Inner semantics)
+mol2 = Molecule(['C'])
+assrt.ok(isinstance(mol2.structure[0], mol2.Atom))
+
+# two levels of nesting
+class Universe:
+    class Galaxy:
+        class Star:
+            def __init__(self, name):
+                self.name = name
+        def __init__(self, star_name):
+            self.star = Universe.Galaxy.Star(star_name)
+    def __init__(self, star_name):
+        self.galaxy = Universe.Galaxy(star_name)
+
+u = Universe('Sol')
+assrt.equal(u.galaxy.star.name, 'Sol')
+assrt.ok(isinstance(u.galaxy.star, Universe.Galaxy.Star))
+
+# nested class with inheritance from outer-scope class
+class Animal:
+    def __init__(self, sound):
+        self.sound = sound
+
+class Zoo:
+    class Dog(Animal):
+        def __init__(self):
+            Animal.__init__(self, 'woof')
+
+zoo = Zoo()
+fido = Zoo.Dog()
+assrt.equal(fido.sound, 'woof')
+assrt.ok(isinstance(fido, Animal))
+assrt.ok(isinstance(fido, Zoo.Dog))
 
 # starargs and method decorators
 def negate(fn):

package/test/collections.pyj

@@ -62,18 +62,18 @@ assrt.equal(s[4:1:-2], 'ec')
 
 # sorting
 a = [2,1,3]
-a.pysort(key=def(x):return 0;)
+a.sort(key=def(x):return 0;)
 assrt.deepEqual(a, [2,1,3])  # stable sort
-a.pysort(reverse=True)
+a.sort(reverse=True)
 assrt.deepEqual(a, [3,2,1])
-a.pysort()
+a.sort()
 assrt.deepEqual(a, [1,2,3])
 
 # misc interface
 a = [1,2,3]
-assrt.equal(a.pypop(), 3)
+assrt.equal(a.pop(), 3)
 assrt.deepEqual(a, [1,2])
-assrt.equal(a.pypop(0), 1)
+assrt.equal(a.pop(0), 1)
 assrt.deepEqual(a, [2])
 
 # strings

package/test/decorators.pyj

@@ -1,77 +1,77 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
-
-def double(f):
-    return def (x):
-        return 2 * f(x)
-
-def triple(f):
-    return def(x):
-        return 3 * f(x)
-
-@double
-def half(x):
-    return x // 2
-
-@double
-def f1(x):
-    return x
-
-@double
-@triple
-def f2(x):
-    return x
-
-def append_one(f):
-    return def(x):
-        ans = f(x)
-        ans.push(1)
-        return ans
-
-def append_two(f):
-    return def(x):
-        ans = f(x)
-        ans.push(2)
-        return ans
-
-@append_two
-@append_one
-def f3():
-    return []
-
-o = {'double':double}
-
-@o.double
-def f4():
-    return 1
-
-assrt.equal(2, half(2))
-assrt.equal(4, f1(2))
-assrt.equal(12, f2(2))
-assrt.equal(2, f4())
-assrt.deepEqual([1, 2], f3())
-
-def multiply(amt):
-
-    def wrapper(f):
-        return def ():
-            return amt * f()
-
-    return wrapper
-
-@multiply(2)
-def two():
-    return 1
-
-@multiply(3)
-def three():
-    return 1
-
-@multiply(2)
-@multiply(2)
-def four():
-    return 1
-
-assrt.equal(2, two())
-assrt.equal(3, three())
-assrt.equal(4, four())
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
+
+def double(f):
+    return def (x):
+        return 2 * f(x)
+
+def triple(f):
+    return def(x):
+        return 3 * f(x)
+
+@double
+def half(x):
+    return x // 2
+
+@double
+def f1(x):
+    return x
+
+@double
+@triple
+def f2(x):
+    return x
+
+def append_one(f):
+    return def(x):
+        ans = f(x)
+        ans.push(1)
+        return ans
+
+def append_two(f):
+    return def(x):
+        ans = f(x)
+        ans.push(2)
+        return ans
+
+@append_two
+@append_one
+def f3():
+    return []
+
+o = {'double':double}
+
+@o.double
+def f4():
+    return 1
+
+assrt.equal(2, half(2))
+assrt.equal(4, f1(2))
+assrt.equal(12, f2(2))
+assrt.equal(2, f4())
+assrt.deepEqual([1, 2], f3())
+
+def multiply(amt):
+
+    def wrapper(f):
+        return def ():
+            return amt * f()
+
+    return wrapper
+
+@multiply(2)
+def two():
+    return 1
+
+@multiply(3)
+def three():
+    return 1
+
+@multiply(2)
+@multiply(2)
+def four():
+    return 1
+
+assrt.equal(2, two())
+assrt.equal(3, three())
+assrt.equal(4, four())

package/test/docstrings.pyj

@@ -1,39 +1,39 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-# globals: ρσ_module_doc__
-
-import _import_one
-
-def f():
-    " A basic docstring "
-    pass
-
-assrt.equal(f.__doc__, 'A basic docstring')
-assrt.equal(_import_one.__doc__, 'Module level ds1\n\nModule level ds2\nline2\n\nModule level ds 3')
-
-def g():
-    '''
-    A more complex docstring:
-        xxx
-            yyyy
-
-    the end
-    '''
-    pass
-
-assrt.equal(g.__doc__, 'A more complex docstring:\n    xxx\n        yyyy\n\nthe end')
-
-class D:
-    ' Docstring for a class '
-
-    def method(self):
-        'ds for a method'
-        pass
-
-assrt.equal(D().__doc__, 'Docstring for a class')
-assrt.equal(D().method.__doc__, 'ds for a method')
-
-x = def():
-    'xxx'
-
-assrt.equal(x.__doc__, 'xxx')
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+# globals: ρσ_module_doc__
+
+import _import_one
+
+def f():
+    " A basic docstring "
+    pass
+
+assrt.equal(f.__doc__, 'A basic docstring')
+assrt.equal(_import_one.__doc__, 'Module level ds1\n\nModule level ds2\nline2\n\nModule level ds 3')
+
+def g():
+    '''
+    A more complex docstring:
+        xxx
+            yyyy
+
+    the end
+    '''
+    pass
+
+assrt.equal(g.__doc__, 'A more complex docstring:\n    xxx\n        yyyy\n\nthe end')
+
+class D:
+    ' Docstring for a class '
+
+    def method(self):
+        'ds for a method'
+        pass
+
+assrt.equal(D().__doc__, 'Docstring for a class')
+assrt.equal(D().method.__doc__, 'ds for a method')
+
+x = def():
+    'xxx'
+
+assrt.equal(x.__doc__, 'xxx')

package/test/elementmaker_test.pyj

@@ -1,45 +1,45 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
-# globals: assrt
-
-from elementmaker import E
-
-eq = assrt.equal
-
-def dummy_elem_eq(a, b):
-    eq(jstype(a), jstype(b))
-    if (jstype(a) == 'string'):
-        eq(a, b)
-        return
-    eq(a.attributes.length, b.attributes.length)
-    eq(a.children.length, b.children.length)
-    eq(a.name, b.name)
-    for attr in a.attributes:
-        eq(a[attr], b[attr])
-    for i, child in enumerate(a.children):
-        dummy_elem_eq(child, b.children[i])
-
-q = E.div('text', id='1', class_='c', data_x='x')
-dummy_elem_eq(q, {'name':'div', 'children':['text'], 'attributes':{'id':'1', 'class':'c', 'data-x': 'x'}})
-
-q = E.div(
-        E.span('a'),
-        E.span('b'),
-        E.a(),
-        id='1',
-        boolean_attr=True,
-    )
-dummy_elem_eq(q, {'name':'div', 'children':[
-    {
-        'name':'span',
-        'children':['a'], 'attributes': {}
-    },
-    {
-        'name':'span',
-        'children':['b'], 'attributes': {}
-    },
-    {
-        'name':'a',
-        'children':[], 'attributes': {}
-    },
-], 'attributes':{'id':'1', 'boolean-attr':'boolean-attr'}})
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
+# globals: assrt
+
+from elementmaker import E
+
+eq = assrt.equal
+
+def dummy_elem_eq(a, b):
+    eq(jstype(a), jstype(b))
+    if (jstype(a) == 'string'):
+        eq(a, b)
+        return
+    eq(a.attributes.length, b.attributes.length)
+    eq(a.children.length, b.children.length)
+    eq(a.name, b.name)
+    for attr in a.attributes:
+        eq(a[attr], b[attr])
+    for i, child in enumerate(a.children):
+        dummy_elem_eq(child, b.children[i])
+
+q = E.div('text', id='1', class_='c', data_x='x')
+dummy_elem_eq(q, {'name':'div', 'children':['text'], 'attributes':{'id':'1', 'class':'c', 'data-x': 'x'}})
+
+q = E.div(
+        E.span('a'),
+        E.span('b'),
+        E.a(),
+        id='1',
+        boolean_attr=True,
+    )
+dummy_elem_eq(q, {'name':'div', 'children':[
+    {
+        'name':'span',
+        'children':['a'], 'attributes': {}
+    },
+    {
+        'name':'span',
+        'children':['b'], 'attributes': {}
+    },
+    {
+        'name':'a',
+        'children':[], 'attributes': {}
+    },
+], 'attributes':{'id':'1', 'boolean-attr':'boolean-attr'}})