rapydscript-ng 0.7.21 → 0.7.23

package/release/compiler.js

@@ -712,7 +712,6 @@ if (!ρσ_list_extend.__argnames__) Object.defineProperties(ρσ_list_extend, {
 });
 
 function ρσ_list_index(val, start, stop) {
-    var idx;
     start = start || 0;
     if (start < 0) {
         start = this.length + start;
@@ -721,11 +720,7 @@ function ρσ_list_index(val, start, stop) {
         throw new ValueError(val + " is not in list");
     }
     if (stop === undefined) {
-        idx = this.indexOf(val, start);
-        if (idx === -1) {
-            throw new ValueError(val + " is not in list");
-        }
-        return idx;
+        stop = this.length;
     }
     if (stop < 0) {
         stop = this.length + stop;
@@ -762,12 +757,13 @@ if (!ρσ_list_pop.__argnames__) Object.defineProperties(ρσ_list_pop, {
 });
 
 function ρσ_list_remove(value) {
-    var idx;
-    idx = this.indexOf(value);
-    if (idx === -1) {
-        throw new ValueError(value + " not in list");
+    for (var i = 0; i < this.length; i++) {
+        if (((ρσ_expr_temp = this)[(typeof i === "number" && i < 0) ? ρσ_expr_temp.length + i : i] === value || typeof (ρσ_expr_temp = this)[(typeof i === "number" && i < 0) ? ρσ_expr_temp.length + i : i] === "object" && ρσ_equals((ρσ_expr_temp = this)[(typeof i === "number" && i < 0) ? ρσ_expr_temp.length + i : i], value))) {
+            this.splice(i, 1);
+            return;
+        }
     }
-    this.splice(idx, 1);
+    throw new ValueError(value + " not in list");
 };
 if (!ρσ_list_remove.__argnames__) Object.defineProperties(ρσ_list_remove, {
     __argnames__ : {value: ["value"]},
@@ -2008,7 +2004,7 @@ Object.defineProperties(ρσ_dict.prototype, (function(){
     });
     return ρσ_anonfunc;
 })();
-ρσ_dict.prototype.set_default = (function() {
+ρσ_dict.prototype.set_default = ρσ_dict.prototype.setdefault = (function() {
     var ρσ_anonfunc = function (key, defval) {
         var j;
         j = this.jsmap;
@@ -2072,13 +2068,20 @@ Object.defineProperties(ρσ_dict.prototype, (function(){
 })();
 ρσ_dict.prototype.popitem = (function() {
     var ρσ_anonfunc = function () {
-        var r;
-        r = this.jsmap.entries().next();
-        if (r.done) {
-            throw new KeyError("dict is empty");
+        var last, e, r;
+        last = null;
+        e = this.jsmap.entries();
+        while (true) {
+            r = e.next();
+            if (r.done) {
+                if (last === null) {
+                    throw new KeyError("dict is empty");
+                }
+                this.jsmap.delete(last.value[0]);
+                return last.value;
+            }
+            last = r;
         }
-        this.jsmap.delete(r.value[0]);
-        return r.value;
     };
     if (!ρσ_anonfunc.__module__) Object.defineProperties(ρσ_anonfunc, {
         __module__ : {value: "__main__"}
@@ -2703,6 +2706,7 @@ function ρσ_setitem(obj, key, val) {
         }
         obj[(typeof key === "number" && key < 0) ? obj.length + key : key] = val;
     }
+    return val;
 };
 if (!ρσ_setitem.__argnames__) Object.defineProperties(ρσ_setitem, {
     __argnames__ : {value: ["obj", "key", "val"]},
@@ -7090,6 +7094,7 @@ return this.__repr__();
         AST_ItemAccess.prototype.properties = (function(){
             var ρσ_d = Object.create(null);
             ρσ_d["assignment"] = "[AST_Node or None] Not None if this is an assignment (a[x] = y) rather than a simple access";
+            ρσ_d["assign_operator"] = "[String] The operator for a assignment like += or empty string if plain assignment";
             return ρσ_d;
         }).call(this);
 
@@ -8601,6 +8606,7 @@ return this.__repr__();
         var SyntaxError = ρσ_modules.errors.SyntaxError;
 
         var interpolate = ρσ_modules.string_interpolation.interpolate;
+        var quoted_string = ρσ_modules.string_interpolation.quoted_string;
 
         RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
         RE_OCT_NUMBER = /^0[0-7]+$/;
@@ -9247,6 +9253,7 @@ return this.__repr__();
                 return ρσ_anonfunc;
             })());
             function handle_interpolated_string(string, start_tok) {
+                var parts, ch, stok, j, potential_mod, mods, is_raw, combined;
                 function raise_error(err) {
                     throw new SyntaxError(err, filename, start_tok.line, start_tok.col, start_tok.pos, false);
                 };
@@ -9255,7 +9262,50 @@ return this.__repr__();
                     __module__ : {value: "tokenizer"}
                 });
 
-                S.text = S.text.slice(0, S.pos) + "(" + interpolate(string, raise_error) + ")" + S.text.slice(S.pos);
+                parts = [interpolate(string, raise_error)];
+                while (true) {
+                    while (S.pos < S.text.length && (S.text.charAt(S.pos) === " " || S.text.charAt(S.pos) === "\t")) {
+                        next();
+                    }
+                    ch = S.text.charAt(S.pos);
+                    if (!ch) {
+                        break;
+                    }
+                    if (ch === "'" || ch === "\"") {
+                        stok = read_string(false, false);
+                        parts.push(quoted_string(stok.value));
+                    } else if (is_identifier_start(ch.charCodeAt(0))) {
+                        j = S.pos;
+                        while (j < S.text.length && is_identifier_char(S.text.charAt(j))) {
+                            j += 1;
+                        }
+                        potential_mod = S.text.substring(S.pos, j);
+                        if (!is_string_modifier(potential_mod)) {
+                            break;
+                        }
+                        if (j >= S.text.length || "'\"".indexOf(S.text.charAt(j)) === -1) {
+                            break;
+                        }
+                        mods = potential_mod.toLowerCase();
+                        if (mods.indexOf("v") !== -1) {
+                            break;
+                        }
+                        while (S.pos < j) {
+                            next();
+                        }
+                        is_raw = mods.indexOf("r") !== -1;
+                        stok = read_string(is_raw, false);
+                        if (mods.indexOf("f") !== -1) {
+                            parts.push(interpolate(stok.value, raise_error));
+                        } else {
+                            parts.push(quoted_string(stok.value));
+                        }
+                    } else {
+                        break;
+                    }
+                }
+                combined = parts.join("+");
+                S.text = S.text.slice(0, S.pos) + "(" + combined + ")" + S.text.slice(S.pos);
                 return token("punc", next());
             };
             if (!handle_interpolated_string.__argnames__) Object.defineProperties(handle_interpolated_string, {
@@ -9646,7 +9696,7 @@ return this.__repr__();
         var is_token = ρσ_modules.tokenizer.is_token;
         var RESERVED_WORDS = ρσ_modules.tokenizer.RESERVED_WORDS;
 
-        COMPILER_VERSION = "eb857dad74098b17e1abd5c68b2fed35a74ea3d0";
+        COMPILER_VERSION = "33bc40d444e2a542a0577a3a3b0549d8381795ff";
         PYTHON_FLAGS = (function(){
             var ρσ_d = Object.create(null);
             ρσ_d["dict_literals"] = true;
@@ -12207,7 +12257,7 @@ return this.__repr__();
             });
 
             function getitem(expr, allow_calls) {
-                var start, is_py_sub, slice_bounds, is_slice, i, assignment;
+                var start, is_py_sub, slice_bounds, is_slice, i, assignment, assign_operator;
                 start = expr.start;
                 next();
                 is_py_sub = S.scoped_flags.get("overload_getitem", false);
@@ -12326,7 +12376,9 @@ return this.__repr__();
                 } else {
                     if (is_py_sub) {
                         assignment = null;
-                        if (is_("operator") && S.token.value === "=") {
+                        assign_operator = "";
+                        if (is_("operator") && ASSIGNMENT[ρσ_bound_index(S.token.value, ASSIGNMENT)]) {
+                            assign_operator = S.token.value.slice(0, -1);
                             next();
                             assignment = expression(true);
                         }
@@ -12340,6 +12392,7 @@ return this.__repr__();
                                 return ρσ_d;
                             }).call(this));
                             ρσ_d["assignment"] = assignment;
+                            ρσ_d["assign_operator"] = assign_operator;
                             ρσ_d["end"] = prev();
                             return ρσ_d;
                         }).call(this)), allow_calls);
@@ -14984,12 +15037,23 @@ return this.__repr__();
         });
 
         function print_rich_getitem(self, output) {
-            var func;
+            var func, asg, as_op;
             func = "ρσ_" + ((self.assignment) ? "setitem" : "getitem");
             output.print(func + "(");
             [self.expression.print(output), output.comma(), self.property.print(output)];
             if (self.assignment) {
-                [output.comma(), self.assignment.print(output)];
+                output.comma();
+                asg = self.assignment;
+                as_op = self.assign_operator;
+                if (as_op.length > 0) {
+                    self.assignment = null;
+                    print_rich_getitem(self, output);
+                    self.assignment = asg;
+                    output.space();
+                    output.print(as_op);
+                    output.space();
+                }
+                self.assignment.print(output);
             }
             output.print(")");
         };
@@ -15356,7 +15420,7 @@ return this.__repr__();
                 var ρσ_Iter89 = ρσ_Iterable(left_hand_sides);
                 for (var ρσ_Index89 = 0; ρσ_Index89 < ρσ_Iter89.length; ρσ_Index89++) {
                     lhs = ρσ_Iter89[ρσ_Index89];
-                    if (is_node_type(lhs, AST_Seq) || is_node_type(lhs, AST_Array)) {
+                    if (is_node_type(lhs, AST_Seq) || is_node_type(lhs, AST_Array) || is_node_type(lhs, AST_ItemAccess)) {
                         is_compound_assign = true;
                         break;
                     }

package/release/signatures.json

@@ -1,9 +1,9 @@
 {
-    "ast": "81fefe5999ac0ce23d87f05861a113f21e776714",
+    "ast": "7a1a1800d9ee7af7f7153eee38002e4e9dcfb71e",
     "baselib-builtins": "50927b38fded9bd9dbe14c42a20dd8e930ac021f",
-    "baselib-containers": "92a0841862b0f8b22a3748081a2223d3405cfa41",
+    "baselib-containers": "59936060f92bff9c83a70489276f7e2f6edb6630",
     "baselib-errors": "f2423e1e2489bdd7fb8c8725bb76436898c8008c",
-    "baselib-internal": "1b77d40970a8ef2d886132dc7c21c9510d2eb4cd",
+    "baselib-internal": "7a8544ec19d35ac9f6cea9bf1a8584b105d648b2",
     "baselib-itertools": "ab1f3257642c8d26fab1ff9d392814a459a60cdb",
     "baselib-str": "8c396e4fae02ae34b6d3d805becf7bfdd36625ee",
     "compiler": "cfbfceb0439fed3302f78d80b303dca713b25e7b",
@@ -17,15 +17,15 @@
     "output/literals": "fdbfb744fec8dfea1e1c62cb49767c60160fd402",
     "output/loops": "f59cc623320f57edb01953f7877d712758e9f825",
     "output/modules": "bd3e3f3f6794fb6e401867b4d011c4e3aab98893",
-    "output/operators": "4d1c1cd4d7da71a3ccdd802add3c88e35bb92d06",
+    "output/operators": "bcda6aeab9214523252481c8dba2741c01f725bb",
     "output/statements": "7d8dfdc0b43e3e430be7ce3b23ffaf1b41408d8c",
     "output/stream": "46375cb467477ac898546e818bfdfa5be738c352",
     "output/utils": "595968f96f6fdcc51eb41c34d64c92bb595e3cb1",
-    "parse": "b63fd10695f03eecbfa8e02887e6783ba87d7be3",
+    "parse": "d5c1a77662dfcff841dfcd368d5dbb129a592f5d",
     "string_interpolation": "bff1cc76d772d24d35707f6c794f38734ca08376",
-    "tokenizer": "00fc24a41edac9f9b31735e6290348005a623cef",
+    "tokenizer": "1b23dc17814989686f4dc5b69f776b127f63c520",
     "unicode_aliases": "79ac6eaa5e6be44a5397d62c561f854a8fe7528e",
     "utils": "c1666db819aa7c8db38697e34e18362e3cb45869",
-    "#compiler#": "00bd8ed07a7de8d6bf5e6f380f831d0ac00713e8",
-    "#compiled_with#": "00bd8ed07a7de8d6bf5e6f380f831d0ac00713e8"
+    "#compiler#": "0b52100610a7474259047753e409de52cdb3e12c",
+    "#compiled_with#": "0b52100610a7474259047753e409de52cdb3e12c"
 }

package/src/ast.pyj

@@ -719,6 +719,7 @@ class AST_ItemAccess(AST_PropAccess):
     'Python index-style property access, i.e. `a.__getitem__("foo")`'
     properties = {
         'assignment': "[AST_Node or None] Not None if this is an assignment (a[x] = y) rather than a simple access",
+        'assign_operator': "[String] The operator for a assignment like += or empty string if plain assignment",
     }
 
     def _walk(self, visitor):

package/src/baselib-containers.pyj

@@ -67,10 +67,7 @@ def ρσ_list_index(val, start, stop):
     if start < 0:
         raise ValueError(val + ' is not in list')
     if stop is undefined:
-        idx = this.indexOf(val, start)
-        if idx is -1:
-            raise ValueError(val + ' is not in list')
-        return idx
+        stop = this.length
     if stop < 0:
         stop = this.length + stop
     for v'var i = start; i < stop; i++':
@@ -89,10 +86,11 @@ def ρσ_list_pop(index):
     return ans[0]
 
 def ρσ_list_remove(value):
-    idx = this.indexOf(value)
-    if idx is -1:
-        raise ValueError(value + ' not in list')
-    this.splice(idx, 1)
+    for v'var i = 0; i < this.length; i++':
+        if this[i] == value:
+            this.splice(i, 1)
+            return
+    raise ValueError(value + ' not in list')
 
 def ρσ_list_to_string():
     return '[' + this.join(', ') + ']'
@@ -606,7 +604,7 @@ Object.defineProperties(ρσ_dict.prototype, {
         return None if defval is undefined else defval
     return ans
 
-ρσ_dict.prototype.set_default = def (key, defval):
+ρσ_dict.prototype.set_default = ρσ_dict.prototype.setdefault = def (key, defval):
     j = this.jsmap
     if not j.has(key):
         j.set(key, defval)
@@ -632,11 +630,16 @@ Object.defineProperties(ρσ_dict.prototype, {
     return ans
 
 ρσ_dict.prototype.popitem = def ():
-    r = this.jsmap.entries().next()
-    if r.done:
-        raise KeyError('dict is empty')
-    this.jsmap.delete(r.value[0])
-    return r.value
+    last = None
+    e = this.jsmap.entries()
+    while True:
+        r = e.next()
+        if r.done:
+            if last is None:
+                raise KeyError('dict is empty')
+            this.jsmap.delete(last.value[0])
+            return last.value
+        last = r
 
 ρσ_dict.prototype.update = def ():
     if arguments.length is 0:

package/src/baselib-internal.pyj

@@ -175,6 +175,7 @@ def ρσ_setitem(obj, key, val):
         if jstype(key) is 'number' and key < 0:
             key += obj.length
         obj[key] = val
+    return val
 
 def ρσ_delitem(obj, key):
     if obj.__delitem__:

package/src/lib/math.pyj

@@ -17,6 +17,7 @@
 
 pi = Math.PI
 e = Math.E
+inf = Infinity
 
 ########################################
 # Number-theoretic and representation functions

package/src/lib/random.pyj

@@ -51,9 +51,30 @@ def random():
         m *= 256
     return v'n / 0x10000000000000000'
 
-# unlike the python version, this DOES build a range object, feel free to reimplement
 def randrange():
-    return choice(range.apply(this, arguments))
+    if arguments.length is 1:
+        return randbelow(int(arguments[0]))
+    start = int(arguments[0])
+    stop = int(arguments[1])
+    if arguments.length < 3:
+        step = 1
+    else:
+        step = int(arguments[2])
+    width = stop - start
+    if step is 1:
+        if width > 0:
+            return start + randbelow(width)
+        raise ValueError("empty range for randrange()")
+    if step > 0:
+        n = (width + step - 1) // step
+    elif step < 0:
+        n = (width + step + 1) // step
+    else:
+        raise ValueError("zero step for randrange()")
+    if n <= 0:
+        raise ValueError(f"empty range in randrange({start}, {stop}, {step})")
+    return start + step * randbelow(n)
+
 
 def randint(a, b):
     return int(random()*(b-a+1) + a)
@@ -61,9 +82,12 @@ def randint(a, b):
 def uniform(a, b):
     return random()*(b-a) + a
 
+def randbelow(n):
+    return Math.floor(random()*n)
+
 def choice(seq):
     if seq.length > 0:
-        return seq[Math.floor(random()*seq.length)]
+        return seq[randbelow(seq.length)]
     else:
         raise IndexError()
 

package/src/output/operators.pyj

@@ -55,7 +55,17 @@ def print_rich_getitem(self, output):  # AST_ItemAccess
     output.print(func + '(')
     self.expression.print(output), output.comma(), self.property.print(output)
     if self.assignment:
-        output.comma(), self.assignment.print(output)
+        output.comma()
+        asg = self.assignment
+        as_op = self.assign_operator
+        if as_op.length > 0:
+            self.assignment = None
+            print_rich_getitem(self, output)
+            self.assignment = asg
+            output.space()
+            output.print(as_op)
+            output.space()
+        self.assignment.print(output)
     output.print(')')
 
 def print_splice_assignment(self, output):  # AST_Splice
@@ -286,7 +296,7 @@ def print_assign(self, output):
         left_hand_sides, rhs = self.traverse_chain()
         is_compound_assign = False
         for lhs in left_hand_sides:
-            if is_node_type(lhs, AST_Seq) or is_node_type(lhs, AST_Array):
+            if is_node_type(lhs, AST_Seq) or is_node_type(lhs, AST_Array) or is_node_type(lhs, AST_ItemAccess):
                 is_compound_assign = True
                 break
         if is_compound_assign:

package/src/parse.pyj

@@ -1802,7 +1802,9 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
             # regular index (arr[index])
             if is_py_sub:
                 assignment = None
-                if is_("operator") and S.token.value is "=":
+                assign_operator = ''
+                if is_("operator") and ASSIGNMENT[S.token.value]:
+                    assign_operator = S.token.value[:-1]
                     next()
                     assignment = expression(True)
                 return subscripts(new AST_ItemAccess({
@@ -1812,6 +1814,7 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
                         'value': 0
                     }),
                     'assignment':assignment,
+                    'assign_operator': assign_operator,
                     'end': prev()
                 }), allow_calls)
 

package/src/tokenizer.pyj

@@ -6,7 +6,7 @@ from unicode_aliases import ALIAS_MAP
 from utils import make_predicate, characters
 from ast import AST_Token
 from errors import SyntaxError
-from string_interpolation import interpolate
+from string_interpolation import interpolate, quoted_string
 
 RE_HEX_NUMBER = /^0x[0-9a-f]+$/i
 RE_OCT_NUMBER = /^0[0-7]+$/
@@ -486,7 +486,45 @@ def tokenizer(raw_text, filename):
     def handle_interpolated_string(string, start_tok):
         def raise_error(err):
             raise new SyntaxError(err, filename, start_tok.line, start_tok.col, start_tok.pos, False)
-        S.text = S.text[:S.pos] + '(' + interpolate(string, raise_error) + ')' + S.text[S.pos:]
+        parts = v'[interpolate(string, raise_error)]'
+        # Look ahead for consecutive string literals to concatenate (e.g. f'a'f'b' or f'a''b')
+        while True:
+            # Skip horizontal whitespace (spaces and tabs, not newlines)
+            while S.pos < S.text.length and (S.text.charAt(S.pos) is ' ' or S.text.charAt(S.pos) is '\t'):
+                next()
+            ch = S.text.charAt(S.pos)
+            if not ch:
+                break
+            if ch is "'" or ch is '"':
+                # A plain string literal follows; read it and append its quoted value
+                stok = read_string(False, False)
+                parts.push(quoted_string(stok.value))
+            elif is_identifier_start(ch.charCodeAt(0)):
+                # Peek ahead (without consuming) to check if it is a string modifier followed by a quote
+                j = S.pos
+                while j < S.text.length and is_identifier_char(S.text.charAt(j)):
+                    j += 1
+                potential_mod = S.text.substring(S.pos, j)
+                if not is_string_modifier(potential_mod):
+                    break
+                if j >= S.text.length or '\'"'.indexOf(S.text.charAt(j)) is -1:
+                    break
+                mods = potential_mod.toLowerCase()
+                if mods.indexOf('v') is not -1:
+                    break  # Do not concatenate with verbatim JS literals
+                # Consume the modifier characters via next() to keep position tracking correct
+                while S.pos < j:
+                    next()
+                is_raw = mods.indexOf('r') is not -1
+                stok = read_string(is_raw, False)
+                if mods.indexOf('f') is not -1:
+                    parts.push(interpolate(stok.value, raise_error))
+                else:
+                    parts.push(quoted_string(stok.value))
+            else:
+                break
+        combined = parts.join('+')
+        S.text = S.text[:S.pos] + '(' + combined + ')' + S.text[S.pos:]
         return token('punc', next())
 
     def read_line_comment(shebang):

package/test/baselib.pyj

@@ -59,6 +59,14 @@ assrt.deepEqual(['y', 'x'], [x for x in reversed('xy')])
 # Test that the iterator created by iter() is itself iterable
 assrt.deepEqual(s, set(iter(s)))
 
+# Test list index/remove/in use the same notion of equality
+a = [1, 2]
+b = [list(a), 3, 4]
+assrt.ok(a in b)
+assrt.equal(b.index(a), 0)
+b.remove(a)
+assrt.equal(len(b), 2)
+
 assrt.ok('a' in m)
 assrt.ok(1 in s)
 assrt.ok('1' not in s)
@@ -234,6 +242,8 @@ def test_dicts():
     assrt.ok(a is not a.copy()), assrt.deepEqual(a, a.copy())
     a.clear()
     assrt.equal(a.length, 0), assrt.deepEqual(list(a), [])
+    a[1] = a[2] = 19
+    assrt.deepEqual(a, {1:19, 2:19})
     assrt.deepEqual(set({1:9, 2:8}.keys()), {1, 2})
     assrt.deepEqual(set({1:9, 2:8}.values()), {8, 9})
     items = [list_wrap(x) for x in {1:9, 2:8}.items()]
@@ -241,8 +251,8 @@ def test_dicts():
     assrt.deepEqual(items, [[1,9], [2, 8]])
     a = {1:1, 2:2}
     assrt.equal(a.get(1), 1), assrt.equal(a.get(3), None)
-    assrt.equal(a.set_default(2, 2), 2)
-    assrt.equal(a.set_default(3, 3), 3), assrt.equal(a[3], 3)
+    assrt.equal(a.setdefault(2, 2), 2)
+    assrt.equal(a.setdefault(3, 3), 3), assrt.equal(a[3], 3)
     assrt.deepEqual(dict.fromkeys([1, 2], 3), {1:3, 2:3})
     a = {1:3, 2:3}
     assrt.equal(a.pop(2, 2), 3), assrt.equal(a.pop(2, 2), 2)

package/test/collections.pyj

@@ -111,6 +111,7 @@ assrt.equal(d1.fun2(3), 4)
 assrt.equal(len(d0), 3)
 assrt.equal(d2.get(1), 2)
 assrt.equal(d2.get('a'), 'b')
+assrt.deepEqual(d2.popitem(), ['a', 'b'])
 
 # assignment
 d1["bar"] += "!"

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/str.pyj

@@ -49,6 +49,14 @@ def test_interpolation():
     ae(f'{a=}', 'a=1')
     somevar = {'x': 1}
     ae(f'{somevar.x=}', 'somevar.x=1')
+    # Test consecutive f-string concatenation
+    ae(f'a'f'b', 'ab')
+    ae(f'a' f'b', 'ab')
+    ae(f'a'f'{a}', 'a1')
+    ae(f'{a}'   f'b', '1b')
+    ae(f'{a}'f'{a}', '11')
+    ae(f'a''b', 'ab')
+    ae(f'{a}''b', '1b')
 
 somevar = 33
 test('somevar=33', '{somevar=}', somevar=somevar)

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/lint.js

@@ -564,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) {
@@ -653,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) {
@@ -661,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);
@@ -681,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) {