rapydscript-ns 0.9.3 → 0.9.5

package/src/string_interpolation.pyj

@@ -1,72 +1,72 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
-from __python__ import hash_literals
-
-def quoted_string(x):
-    return '"' + x.replace(/\\/g, '\\\\').replace(/"/g, r'\"').replace(/\n/g, '\\n') + '"'
-
-def render_markup(markup):
-    pos, key = 0, ''
-    while pos < markup.length:
-        ch = markup[pos]
-        if ch is '!' or ch is ':':
-            break
-        key += ch
-        pos += 1
-    fmtspec = markup[pos:]
-    prefix = ''
-    if key.endsWith('='):
-        prefix=key
-        key = key[:-1]
-    return 'ρσ_str.format("' + prefix + '{' + fmtspec + '}", ' + key + ')'
-
-
-def interpolate(template, raise_error):
-    pos = in_brace = 0
-    markup = ''
-    ans = v'[""]'
-    while pos < template.length:
-        ch = template[pos]
-        if in_brace:
-            if ch is '{':
-                in_brace += 1
-                markup += '{'
-            elif ch is '}':
-                in_brace -= 1
-                if in_brace > 0:
-                    markup += '}'
-                else:
-                    ans.push(v'[markup]')
-                    ans.push('')
-            else:
-                markup += ch
-        else:
-            if ch is '{':
-                if template[pos+1] is '{':
-                    pos += 1
-                    ans[-1] += '{'
-                else:
-                    in_brace = 1
-                    markup = ''
-            elif ch is '}':
-                if template[pos+1] is '}':
-                    pos += 1
-                    ans[-1] += '}'
-                else:
-                    raise_error("f-string: single '}' is not allowed")
-            else:
-                ans[-1] += ch
-
-        pos += 1
-
-    if in_brace:
-        raise_error("expected '}' before end of string")
-
-    if ans[-1] is '+':
-        ans[-1] = ''
-    for v'var i = 0; i < ans.length; i++':
-        if jstype(ans[i]) is 'string':
-            ans[i] = quoted_string(ans[i])
-        else:
-            ans[i] = '+' + render_markup.apply(this, ans[i]) + '+'
-    return ans.join('')
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
+
+def quoted_string(x):
+    return '"' + x.replace(/\\/g, '\\\\').replace(/"/g, r'\"').replace(/\n/g, '\\n') + '"'
+
+def render_markup(markup):
+    pos, key = 0, ''
+    while pos < markup.length:
+        ch = markup[pos]
+        if ch is '!' or ch is ':':
+            break
+        key += ch
+        pos += 1
+    fmtspec = markup[pos:]
+    prefix = ''
+    if key.endsWith('='):
+        prefix=key
+        key = key[:-1]
+    return 'ρσ_str.format("' + prefix + '{' + fmtspec + '}", ' + key + ')'
+
+
+def interpolate(template, raise_error):
+    pos = in_brace = 0
+    markup = ''
+    ans = v'[""]'
+    while pos < template.length:
+        ch = template[pos]
+        if in_brace:
+            if ch is '{':
+                in_brace += 1
+                markup += '{'
+            elif ch is '}':
+                in_brace -= 1
+                if in_brace > 0:
+                    markup += '}'
+                else:
+                    ans.push(v'[markup]')
+                    ans.push('')
+            else:
+                markup += ch
+        else:
+            if ch is '{':
+                if template[pos+1] is '{':
+                    pos += 1
+                    ans[-1] += '{'
+                else:
+                    in_brace = 1
+                    markup = ''
+            elif ch is '}':
+                if template[pos+1] is '}':
+                    pos += 1
+                    ans[-1] += '}'
+                else:
+                    raise_error("f-string: single '}' is not allowed")
+            else:
+                ans[-1] += ch
+
+        pos += 1
+
+    if in_brace:
+        raise_error("expected '}' before end of string")
+
+    if ans[-1] is '+':
+        ans[-1] = ''
+    for v'var i = 0; i < ans.length; i++':
+        if jstype(ans[i]) is 'string':
+            ans[i] = quoted_string(ans[i])
+        else:
+            ans[i] = '+' + render_markup.apply(this, ans[i]) + '+'
+    return ans.join('')

package/src/tokenizer.pyj

@@ -334,6 +334,19 @@ def tokenizer(raw_text, filename):
             valid = parseInt(num, 2)
             if isNaN(valid):
                 parse_error('Invalid syntax for a binary number')
+            if peek() is 'n':
+                next()
+                return token('bigint', '0b' + num)
+            return token('num', valid)
+        if not prefix and peek() is '0' and S.text.charAt(S.pos + 1) is 'o':
+            next(), next()
+            num = read_while(def(ch): return ch >= '0' and ch <= '7';)
+            valid = parseInt(num, 8)
+            if isNaN(valid):
+                parse_error('Invalid syntax for an octal number')
+            if peek() is 'n':
+                next()
+                return token('bigint', '0o' + num)
             return token('num', valid)
         seen = v'[]'
         num = read_while(def(ch, i):
@@ -363,8 +376,8 @@ def tokenizer(raw_text, filename):
                 return False
             elif ch is '.':
                 return (has_dot = True) if not has_dot and not has_x and not has_e else False
-            elif ch is 'j' or ch is 'J':
-                return False  # imaginary suffix — stop here; handled after loop
+            elif ch is 'j' or ch is 'J' or ch is 'n':
+                return False  # imaginary/bigint suffix — stop here; handled after loop
             return is_alphanumeric_char(ch.charCodeAt(0))
         )
         if prefix:
@@ -375,6 +388,9 @@ def tokenizer(raw_text, filename):
             if peek() is 'j' or peek() is 'J':
                 next()
                 return token("imaginary", valid)
+            if peek() is 'n':
+                next()
+                return token("bigint", num)
             return token("num", valid)
         else:
             parse_error("Invalid syntax: " + num)