rapydscript-ns 0.8.2 → 0.8.4

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

@@ -177,6 +177,7 @@ def tokenizer(raw_text, filename):
         'index_or_slice': v'[ false ]',
         'expecting_object_literal_key': False,  # This is set by the parser when it is expecting an object literal key
         'prev_was_comma': False,  # True when the previous token was a ',' — used to detect positional-only '/' separator
+        'jsx_depth': 0,  # >0 when inside JSX children content
     }
     def peek():
         return S.text.charAt(S.pos)
@@ -639,6 +640,23 @@ def tokenizer(raw_text, filename):
         if not ch:
             return token("eof")
 
+        # JSX children mode: when inside JSX content, read raw text until { or <
+        if S.jsx_depth > 0 and ch is not '{' and ch is not '<':
+            result = ""
+            while S.pos < S.text.length:
+                c = S.text.charAt(S.pos)
+                if c is '{' or c is '<':
+                    break
+                if c is '\n':
+                    S.line += 1
+                    S.col = 0
+                    S.newline_before = True
+                else:
+                    S.col += 1
+                result += c
+                S.pos += 1
+            return token("jsx_text", result)
+
         code = ch.charCodeAt(0)
         tmp_ = code
         if tmp_ is 34 or tmp_ is 39:    # double-quote (") or single quote (')
@@ -700,4 +718,15 @@ def tokenizer(raw_text, filename):
             S = nc
         return S
 
+    next_token.jsx_enter = def():
+        S.jsx_depth += 1
+        S.indentation_matters.push(False)
+
+    next_token.jsx_exit = def():
+        if S.jsx_depth > 0:
+            S.jsx_depth -= 1
+            S.indentation_matters.pop()
+        # After < in JSX context, / is always an operator (e.g. </tag>), never a regex
+        S.regex_allowed = False
+
     return next_token