rapydscript-ns 0.9.3 → 0.9.4

package/tools/completer.js

@@ -1,131 +1,131 @@
-/* vim:fileencoding=utf-8
- * 
- * Copyright (C) 2016 Kovid Goyal <kovid at kovidgoyal.net>
- *
- * Distributed under terms of the BSD license
- */
-
-
-module.exports = function(compiler, options) {
-    "use strict";
-    var all_keywords = compiler.ALL_KEYWORDS.split(' ');
-    var vm = require('vm');
-    options = options || {};
-    if (!options.enum_global) options.enum_global = "var global = Function('return this')(); Object.getOwnPropertyNames(global);";
-
-    function global_names(ctx) {
-        try {
-            var ans = vm.runInContext(options.enum_global, ctx);
-            ans = ans.concat(all_keywords);
-            ans.sort();
-            var seen = {};
-            ans.filter(function (item) { 
-                if (Object.prototype.hasOwnProperty.call(seen, item)) return false;
-                seen[item] = true;
-                return true;
-            });
-            return ans;
-        } catch(e) {
-            console.log(e.stack || e.toString());
-        }
-        return [];
-    }
-
-    function object_names(obj, prefix) {
-        if (obj === null || obj === undefined) return [];
-        var groups = [], prefix_len = prefix.length, p;
-
-        function prefix_filter(name) { return (prefix_len) ? (name.substr(0, prefix_len) === prefix) : true; }
-
-        function add(o) {
-            var items = Object.getOwnPropertyNames(o).filter(prefix_filter);
-            if (items.length) groups.push(items);
-        }
-
-        if (typeof obj === 'object' || typeof obj === 'function') {
-            add(obj);
-            p = Object.getPrototypeOf(obj);
-        } else p = obj.constructor ? obj.constructor.prototype : null; 
-
-        // Walk the prototype chain
-        try {
-            var sentinel = 5;
-            while (p !== null && sentinel > 0) {
-                add(p);
-                p = Object.getPrototypeOf(p);
-                // Circular refs possible? Let's guard against that.
-                sentinel--;
-            }
-        } catch (e) {
-            // console.error("completion error walking prototype chain:" + e);
-        }
-        if (!groups.length) return [];
-        var seen = {}, ans = [];
-        function uniq(name) {
-            if (Object.prototype.hasOwnProperty.call(seen, name)) return false;
-            seen[name] = true;
-            return true;
-        }
-        for (var i = 0; i < groups.length; i++) {
-            var group = groups[i];
-            group.sort();
-            ans = ans.concat(group.filter(uniq));
-            ans.push('');  // group separator
-
-        }
-        while (ans.length && ans[ans.length - 1] === '') ans.pop();
-        return ans;
-    }
-
-    function prefix_matches(prefix, items) {
-        var len = prefix.length;
-        var ans = items.filter(function(item) { return item.substr(0, len) === prefix; });
-        ans.sort();
-        return ans;
-    }
-
-    function find_completions(line, ctx) {
-        var t;
-        try {
-            t = compiler.tokenizer(line, '<repl>');
-        } catch(e) { return []; }
-        var tokens = [], token;
-        while (true) {
-            try {
-                token = t();
-            } catch (e) { return []; }
-            if (token.type === 'eof') break;
-            if (token.type === 'punc' && '(){},;:'.indexOf(token.value) > -1)
-                tokens = [];
-            tokens.push(token);
-        }
-        if (!tokens.length) {
-            // New line or trailing space
-            return [global_names(ctx), ''];
-        }
-        var last_tok = tokens[tokens.length - 1];
-        if (last_tok.value === '.' || (last_tok.type === 'name' && compiler.IDENTIFIER_PAT.test(last_tok.value))) {
-            last_tok = last_tok.value;
-            if (last_tok === '.') {
-                tokens.push({'value':''});
-                last_tok = '';
-            }
-            if (tokens.length > 1 && tokens[tokens.length - 2].value === '.') {
-                // A compound expression
-                var prefix = '', result;
-                tokens.slice(0, tokens.length - 2).forEach(function (tok) { prefix += tok.value; });
-                if (prefix) {
-                    try {
-                        result = vm.runInContext(prefix, ctx, {'displayErrors':false});
-                    } catch(e) { return []; }
-                    return [object_names(result, last_tok), last_tok];
-                }
-            } else {
-                return [prefix_matches(last_tok, global_names(ctx)), last_tok];
-            }
-        }
-        return [];
-    }
-
-    return find_completions;
-};
+/* vim:fileencoding=utf-8
+ * 
+ * Copyright (C) 2016 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the BSD license
+ */
+
+
+module.exports = function(compiler, options) {
+    "use strict";
+    var all_keywords = compiler.ALL_KEYWORDS.split(' ');
+    var vm = require('vm');
+    options = options || {};
+    if (!options.enum_global) options.enum_global = "var global = Function('return this')(); Object.getOwnPropertyNames(global);";
+
+    function global_names(ctx) {
+        try {
+            var ans = vm.runInContext(options.enum_global, ctx);
+            ans = ans.concat(all_keywords);
+            ans.sort();
+            var seen = {};
+            ans.filter(function (item) { 
+                if (Object.prototype.hasOwnProperty.call(seen, item)) return false;
+                seen[item] = true;
+                return true;
+            });
+            return ans;
+        } catch(e) {
+            console.log(e.stack || e.toString());
+        }
+        return [];
+    }
+
+    function object_names(obj, prefix) {
+        if (obj === null || obj === undefined) return [];
+        var groups = [], prefix_len = prefix.length, p;
+
+        function prefix_filter(name) { return (prefix_len) ? (name.substr(0, prefix_len) === prefix) : true; }
+
+        function add(o) {
+            var items = Object.getOwnPropertyNames(o).filter(prefix_filter);
+            if (items.length) groups.push(items);
+        }
+
+        if (typeof obj === 'object' || typeof obj === 'function') {
+            add(obj);
+            p = Object.getPrototypeOf(obj);
+        } else p = obj.constructor ? obj.constructor.prototype : null; 
+
+        // Walk the prototype chain
+        try {
+            var sentinel = 5;
+            while (p !== null && sentinel > 0) {
+                add(p);
+                p = Object.getPrototypeOf(p);
+                // Circular refs possible? Let's guard against that.
+                sentinel--;
+            }
+        } catch (e) {
+            // console.error("completion error walking prototype chain:" + e);
+        }
+        if (!groups.length) return [];
+        var seen = {}, ans = [];
+        function uniq(name) {
+            if (Object.prototype.hasOwnProperty.call(seen, name)) return false;
+            seen[name] = true;
+            return true;
+        }
+        for (var i = 0; i < groups.length; i++) {
+            var group = groups[i];
+            group.sort();
+            ans = ans.concat(group.filter(uniq));
+            ans.push('');  // group separator
+
+        }
+        while (ans.length && ans[ans.length - 1] === '') ans.pop();
+        return ans;
+    }
+
+    function prefix_matches(prefix, items) {
+        var len = prefix.length;
+        var ans = items.filter(function(item) { return item.substr(0, len) === prefix; });
+        ans.sort();
+        return ans;
+    }
+
+    function find_completions(line, ctx) {
+        var t;
+        try {
+            t = compiler.tokenizer(line, '<repl>');
+        } catch(e) { return []; }
+        var tokens = [], token;
+        while (true) {
+            try {
+                token = t();
+            } catch (e) { return []; }
+            if (token.type === 'eof') break;
+            if (token.type === 'punc' && '(){},;:'.indexOf(token.value) > -1)
+                tokens = [];
+            tokens.push(token);
+        }
+        if (!tokens.length) {
+            // New line or trailing space
+            return [global_names(ctx), ''];
+        }
+        var last_tok = tokens[tokens.length - 1];
+        if (last_tok.value === '.' || (last_tok.type === 'name' && compiler.IDENTIFIER_PAT.test(last_tok.value))) {
+            last_tok = last_tok.value;
+            if (last_tok === '.') {
+                tokens.push({'value':''});
+                last_tok = '';
+            }
+            if (tokens.length > 1 && tokens[tokens.length - 2].value === '.') {
+                // A compound expression
+                var prefix = '', result;
+                tokens.slice(0, tokens.length - 2).forEach(function (tok) { prefix += tok.value; });
+                if (prefix) {
+                    try {
+                        result = vm.runInContext(prefix, ctx, {'displayErrors':false});
+                    } catch(e) { return []; }
+                    return [object_names(result, last_tok), last_tok];
+                }
+            } else {
+                return [prefix_matches(last_tok, global_names(ctx)), last_tok];
+            }
+        }
+        return [];
+    }
+
+    return find_completions;
+};

package/tools/export.js

@@ -229,7 +229,8 @@ function compile(code, filename, options) {
 
 function create_embedded_compiler(runjs) {
     var c = vrequire('tools/embedded_compiler.js');
-    return c(create_compiler(), data['baselib-plain-pretty.js'], runjs);
+    if (!RapydScript) RapydScript = create_compiler();
+    return c(RapydScript, data['baselib-plain-pretty.js'], runjs);
 }
 
 function web_repl() {
@@ -238,7 +239,8 @@ function web_repl() {
         set: function(vf) { current_virtual_files = vf; },
         clear: function() { current_virtual_files = null; }
     };
-    return repl(create_compiler(), data['baselib-plain-pretty.js'], vf_context);
+    if (!RapydScript) RapydScript = create_compiler();
+    return repl(RapydScript, data['baselib-plain-pretty.js'], vf_context);
 }
 
 function init_repl(options) {

package/tools/gettext.js

@@ -1,185 +1,185 @@
-/* vim:fileencoding=utf-8
- * 
- * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
- *
- * Distributed under terms of the BSD license
- */
-"use strict";  /*jshint node:true */
-
-var fs = require('fs');
-var RapydScript = (typeof create_rapydscript_compiler === 'function') ? create_rapydscript_compiler() : require('./compiler').create_compiler();
-var path = require('path');
-
-function parse_file(code, filename) {
-    return RapydScript.parse(code, {
-        filename: filename,
-        basedir: path.dirname(filename),
-        libdir: path.dirname(filename),
-        for_linting: true,
-    });
-}
-
-function detect_format(msgid) {
-    var q = msgid.replace('{{', '');
-    if (/\{[0-9a-zA-Z_}]+/.test(q)) return 'python-brace-format';
-    return null;
-}
-
-function Gettext(catalog, filename) {
-    this._visit = function (node, cont) {
-        if (node instanceof RapydScript.AST_Call && node.args && node.args.length && node.expression instanceof RapydScript.AST_Symbol) {
-            var name = node.expression.name;
-            if (name === '_' || name === 'gettext' || name === 'ngettext') {
-                var nargs = (name === 'ngettext') ? 2 : 1;
-                var line = node.start.line;
-                for (var i = 0; i < nargs; i++) {
-                    if (!(node.args[i] instanceof RapydScript.AST_String)) {
-                        console.error('Translation function: ' + name + ' does not have a string literal argument at line: ' + line + ' of ' + filename);
-                        process.exit(1);
-                    }
-                }
-                var msgid = node.args[0].value;
-                if (!Object.prototype.hasOwnProperty.call(catalog, msgid)) {
-                    catalog[msgid] = {
-                        'locations': [],
-                        'plural': null,
-                        'format': detect_format(msgid),
-                    };
-                }
-                if (name === 'ngettext') catalog[msgid].plural = node.args[1].value;
-                if (filename) catalog[msgid].locations.push(filename + ':' + line);
-            }
-            
-        }
-        if (cont !== undefined) cont();
-    };
-}
-
-function gettext(catalog, code, filename) {
-    var toplevel;
-
-    try {
-        toplevel = parse_file(code, filename);
-    } catch(e) {
-        if (e instanceof RapydScript.SyntaxError) {
-            console.error('Failed to parse: ' + filename + ' with error: ' + e.line + ':' + e.col + ':' + e.message);
-            process.exit(1);
-        } else throw e;
-    }
-
-    if (toplevel) {
-        var gt = new Gettext(catalog, filename);
-        toplevel.walk(gt);
-    }
-}
-
-function esc(string) {
-    return (string || '').replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n').replace(/\t/g, '\\t').replace(/\r/g, '');
-}
-
-function entry_to_string(msgid, data) {
-    var ans = [];
-    data.locations.forEach(function (loc) { ans.push('#: ' + loc); });
-    if (data.format) ans.push('#, ' + data.format);
-    ans.push('msgid "' + esc(msgid) + '"');
-    if (data.plural) {
-        ans.push('msgid_plural "' + esc(data.plural) + '"');
-        ans.push('msgstr[0] ""');
-        ans.push('msgstr[1] ""');
-    } else ans.push('msgstr ""');
-    return ans.join('\n');
-}
-
-function write_output(catalog, options, write) {
-    write = write || (function(x) { process.stdout.write(new Buffer(x, 'utf-8')); });
-    function print() {
-        var val = Array.prototype.slice.call(arguments).join(' ') + '\n';
-        write(val);
-    }
-    function header_line() {
-        var val = '"' + Array.prototype.slice.call(arguments).join(' ') + '\\n"\n';
-        write(val);
-    }
-    if (!options.omit_header) {
-        var now = (new Date()).toISOString();
-        print('msgid', '""');
-        print('msgstr', '""');
-        header_line('Project-Id-Version:', esc(options.package_name), esc(options.package_version));
-        header_line('POT-Creation-Date:', now);
-        header_line("PO-Revision-Date:", now);
-        header_line("Report-Msgid-Bugs-To:", esc(options.bugs_address));
-        header_line("Last-Translator: Automatically generated");
-        header_line("Language-Team: LANGUAGE");
-        header_line("MIME-Version: 1.0");
-        header_line("Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;");
-        header_line("Content-Type: text/plain; charset=UTF-8");
-        header_line("Content-Transfer-Encoding: 8bit");
-        print();
-    }
-    Object.keys(catalog).forEach(function(msgid) {
-        var data = catalog[msgid];
-        print(entry_to_string(msgid, data));
-        print();
-    });
-}
-
-// CLI {{{
-
-function read_whole_file(filename, cb) {
-    if (!filename) {
-        var chunks = [];
-        process.stdin.setEncoding('utf-8');
-        process.stdin.on('data', function (chunk) {
-            chunks.push(chunk);
-        }).on('end', function () {
-            cb(null, chunks.join(""));
-        });
-        process.openStdin();
-    } else {
-        fs.readFile(filename, "utf-8", cb);
-    }
-}
-
-module.exports.cli = function(argv, base_path, src_path, lib_path) {
-    var files = [];
-    var num_of_files = files.length || 1;
-    var catalog = {};
-
-    function read_files(src) {
-        src.forEach(function(f) {
-            if (fs.lstatSync(f).isDirectory()) {
-                var children = [];
-                fs.readdirSync(f).forEach(function(x) { children.push(path.join(f, x)); });
-                read_files(children);
-            }
-            else files.push(f);
-        });
-    }
-    read_files(argv.files);
-
-    function process_single_file(err, code) {
-        if (err) {
-            console.error("ERROR: can't read file: " + files[0]);
-            process.exit(1);
-        }
-
-        gettext(catalog, code, files[0]);
-
-        files = files.slice(1);
-        if (files.length) {
-            setImmediate(read_whole_file, files[0], process_single_file);
-            return;
-        } else {
-            write_output(catalog, argv);
-            process.exit(0);
-        }
-    }
- 
-    setImmediate(read_whole_file, files[0], process_single_file);
-
-};
-
-module.exports.gettext = gettext;
-module.exports.entry_to_string = entry_to_string;
-module.exports.write_output = write_output;
-// }}}
+/* vim:fileencoding=utf-8
+ * 
+ * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the BSD license
+ */
+"use strict";  /*jshint node:true */
+
+var fs = require('fs');
+var RapydScript = (typeof create_rapydscript_compiler === 'function') ? create_rapydscript_compiler() : require('./compiler').create_compiler();
+var path = require('path');
+
+function parse_file(code, filename) {
+    return RapydScript.parse(code, {
+        filename: filename,
+        basedir: path.dirname(filename),
+        libdir: path.dirname(filename),
+        for_linting: true,
+    });
+}
+
+function detect_format(msgid) {
+    var q = msgid.replace('{{', '');
+    if (/\{[0-9a-zA-Z_}]+/.test(q)) return 'python-brace-format';
+    return null;
+}
+
+function Gettext(catalog, filename) {
+    this._visit = function (node, cont) {
+        if (node instanceof RapydScript.AST_Call && node.args && node.args.length && node.expression instanceof RapydScript.AST_Symbol) {
+            var name = node.expression.name;
+            if (name === '_' || name === 'gettext' || name === 'ngettext') {
+                var nargs = (name === 'ngettext') ? 2 : 1;
+                var line = node.start.line;
+                for (var i = 0; i < nargs; i++) {
+                    if (!(node.args[i] instanceof RapydScript.AST_String)) {
+                        console.error('Translation function: ' + name + ' does not have a string literal argument at line: ' + line + ' of ' + filename);
+                        process.exit(1);
+                    }
+                }
+                var msgid = node.args[0].value;
+                if (!Object.prototype.hasOwnProperty.call(catalog, msgid)) {
+                    catalog[msgid] = {
+                        'locations': [],
+                        'plural': null,
+                        'format': detect_format(msgid),
+                    };
+                }
+                if (name === 'ngettext') catalog[msgid].plural = node.args[1].value;
+                if (filename) catalog[msgid].locations.push(filename + ':' + line);
+            }
+            
+        }
+        if (cont !== undefined) cont();
+    };
+}
+
+function gettext(catalog, code, filename) {
+    var toplevel;
+
+    try {
+        toplevel = parse_file(code, filename);
+    } catch(e) {
+        if (e instanceof RapydScript.SyntaxError) {
+            console.error('Failed to parse: ' + filename + ' with error: ' + e.line + ':' + e.col + ':' + e.message);
+            process.exit(1);
+        } else throw e;
+    }
+
+    if (toplevel) {
+        var gt = new Gettext(catalog, filename);
+        toplevel.walk(gt);
+    }
+}
+
+function esc(string) {
+    return (string || '').replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n').replace(/\t/g, '\\t').replace(/\r/g, '');
+}
+
+function entry_to_string(msgid, data) {
+    var ans = [];
+    data.locations.forEach(function (loc) { ans.push('#: ' + loc); });
+    if (data.format) ans.push('#, ' + data.format);
+    ans.push('msgid "' + esc(msgid) + '"');
+    if (data.plural) {
+        ans.push('msgid_plural "' + esc(data.plural) + '"');
+        ans.push('msgstr[0] ""');
+        ans.push('msgstr[1] ""');
+    } else ans.push('msgstr ""');
+    return ans.join('\n');
+}
+
+function write_output(catalog, options, write) {
+    write = write || (function(x) { process.stdout.write(new Buffer(x, 'utf-8')); });
+    function print() {
+        var val = Array.prototype.slice.call(arguments).join(' ') + '\n';
+        write(val);
+    }
+    function header_line() {
+        var val = '"' + Array.prototype.slice.call(arguments).join(' ') + '\\n"\n';
+        write(val);
+    }
+    if (!options.omit_header) {
+        var now = (new Date()).toISOString();
+        print('msgid', '""');
+        print('msgstr', '""');
+        header_line('Project-Id-Version:', esc(options.package_name), esc(options.package_version));
+        header_line('POT-Creation-Date:', now);
+        header_line("PO-Revision-Date:", now);
+        header_line("Report-Msgid-Bugs-To:", esc(options.bugs_address));
+        header_line("Last-Translator: Automatically generated");
+        header_line("Language-Team: LANGUAGE");
+        header_line("MIME-Version: 1.0");
+        header_line("Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;");
+        header_line("Content-Type: text/plain; charset=UTF-8");
+        header_line("Content-Transfer-Encoding: 8bit");
+        print();
+    }
+    Object.keys(catalog).forEach(function(msgid) {
+        var data = catalog[msgid];
+        print(entry_to_string(msgid, data));
+        print();
+    });
+}
+
+// CLI {{{
+
+function read_whole_file(filename, cb) {
+    if (!filename) {
+        var chunks = [];
+        process.stdin.setEncoding('utf-8');
+        process.stdin.on('data', function (chunk) {
+            chunks.push(chunk);
+        }).on('end', function () {
+            cb(null, chunks.join(""));
+        });
+        process.openStdin();
+    } else {
+        fs.readFile(filename, "utf-8", cb);
+    }
+}
+
+module.exports.cli = function(argv, base_path, src_path, lib_path) {
+    var files = [];
+    var num_of_files = files.length || 1;
+    var catalog = {};
+
+    function read_files(src) {
+        src.forEach(function(f) {
+            if (fs.lstatSync(f).isDirectory()) {
+                var children = [];
+                fs.readdirSync(f).forEach(function(x) { children.push(path.join(f, x)); });
+                read_files(children);
+            }
+            else files.push(f);
+        });
+    }
+    read_files(argv.files);
+
+    function process_single_file(err, code) {
+        if (err) {
+            console.error("ERROR: can't read file: " + files[0]);
+            process.exit(1);
+        }
+
+        gettext(catalog, code, files[0]);
+
+        files = files.slice(1);
+        if (files.length) {
+            setImmediate(read_whole_file, files[0], process_single_file);
+            return;
+        } else {
+            write_output(catalog, argv);
+            process.exit(0);
+        }
+    }
+ 
+    setImmediate(read_whole_file, files[0], process_single_file);
+
+};
+
+module.exports.gettext = gettext;
+module.exports.entry_to_string = entry_to_string;
+module.exports.write_output = write_output;
+// }}}