rapydscript-ns 0.8.4 → 0.9.0

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;
+// }}}

package/tools/ini.js

@@ -1,65 +1,65 @@
-/* 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 path = require('path');
-
-function parse_ini_data(data) {
-    // Based on MIT licensed code from: 
-    // https://github.com/shockie/node-iniparser/blob/master/lib/node-iniparser.js
-    var ans = {}, match;
-	var lines = data.split(/\r\n|\r|\n/);
-	var section = null;
-    var section_pat = /^\s*\[\s*([^\]]*)\s*\]\s*$/;
-    var param_pat = /^\s*([\w\.\-\_]+)\s*=\s*(.*?)\s*$/;
-    var comment_pat = /^\s*;.*$/;
-
-	lines.forEach(function(line) {
-		if(comment_pat.test(line)) {
-			return;
-		} else if(param_pat.test(line)) {
-			match = line.match(param_pat);
-			if(section) {
-				ans[section][match[1]] = match[2];
-			} else {
-				ans[match[1]] = match[2];
-			}
-		} else if(section_pat.test(line)) {
-			match = line.match(section_pat);
-			ans[match[1]] = {};
-			section = match[1];
-		} else if(line.length === 0 && section) {
-			section = null;
-		}
-	});
-	return ans;
-}
-
-function find_cfg_file(toplevel_dir) {
-    var current_dir = toplevel_dir, previous_dir = toplevel_dir;
-    do {
-        try {
-            return fs.readFileSync(path.join(current_dir, 'setup.cfg'), 'utf-8');
-        } catch (e) {
-            if (e.code !== 'ENOENT') throw e;
-        }
-        previous_dir = current_dir;
-        current_dir = path.dirname(current_dir);
-    } while(current_dir != previous_dir && current_dir);
-
-    return null;
-}
-
-function read_config(toplevel_dir) {
-    var data = find_cfg_file(toplevel_dir);
-    if (!data) return {};
-    return parse_ini_data(data);
-}
-
-
-exports.read_config = read_config;
+/* 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 path = require('path');
+
+function parse_ini_data(data) {
+    // Based on MIT licensed code from: 
+    // https://github.com/shockie/node-iniparser/blob/master/lib/node-iniparser.js
+    var ans = {}, match;
+	var lines = data.split(/\r\n|\r|\n/);
+	var section = null;
+    var section_pat = /^\s*\[\s*([^\]]*)\s*\]\s*$/;
+    var param_pat = /^\s*([\w\.\-\_]+)\s*=\s*(.*?)\s*$/;
+    var comment_pat = /^\s*;.*$/;
+
+	lines.forEach(function(line) {
+		if(comment_pat.test(line)) {
+			return;
+		} else if(param_pat.test(line)) {
+			match = line.match(param_pat);
+			if(section) {
+				ans[section][match[1]] = match[2];
+			} else {
+				ans[match[1]] = match[2];
+			}
+		} else if(section_pat.test(line)) {
+			match = line.match(section_pat);
+			ans[match[1]] = {};
+			section = match[1];
+		} else if(line.length === 0 && section) {
+			section = null;
+		}
+	});
+	return ans;
+}
+
+function find_cfg_file(toplevel_dir) {
+    var current_dir = toplevel_dir, previous_dir = toplevel_dir;
+    do {
+        try {
+            return fs.readFileSync(path.join(current_dir, 'setup.cfg'), 'utf-8');
+        } catch (e) {
+            if (e.code !== 'ENOENT') throw e;
+        }
+        previous_dir = current_dir;
+        current_dir = path.dirname(current_dir);
+    } while(current_dir != previous_dir && current_dir);
+
+    return null;
+}
+
+function read_config(toplevel_dir) {
+    var data = find_cfg_file(toplevel_dir);
+    if (!data) return {};
+    return parse_ini_data(data);
+}
+
+
+exports.read_config = read_config;

package/tools/lint.js

@@ -39,7 +39,7 @@ var BUILTINS = Object.create(null);
  ' NodeList alert console Node Symbol NamedNodeMap ρσ_eslice ρσ_delslice Number' +
  ' Boolean encodeURIComponent decodeURIComponent setTimeout setInterval' +
  ' setImmediate clearTimeout clearInterval clearImmediate requestAnimationFrame' +
- ' id repr sorted __name__ equals get_module ρσ_str jstype divmod NaN Ellipsis'
+ ' id repr sorted __name__ equals get_module ρσ_str jstype divmod NaN Ellipsis bytes bytearray'
  ).split(' ').forEach(function(x) { BUILTINS[x] = true; });
 
 Object.keys(RapydScript.NATIVE_CLASSES).forEach(function (name) { BUILTINS[name] = true; });
@@ -353,28 +353,25 @@ function Linter(toplevel, filename, code, options) {
 
     this.handle_for_in = function() {
         var node = this.current_node;
+        var self = this;
+        var add_loop_var = function(cnode) {
+            if (cnode instanceof RapydScript.AST_Seq) {
+                cnode.to_array().forEach(add_loop_var);
+            } else if (cnode instanceof RapydScript.AST_Array) {
+                cnode.elements.forEach(add_loop_var);
+            } else if (cnode instanceof RapydScript.AST_SymbolRef) {
+                self.current_node = cnode;
+                cnode.lint_visited = true;
+                self.add_binding(cnode.name).is_loop = true;
+                self.current_node = node;
+            }
+        };
         if (node.init instanceof RapydScript.AST_SymbolRef) {
             this.add_binding(node.init.name).is_loop = true;
             node.init.lint_visited = true;
         } else if (node.init instanceof RapydScript.AST_Array) {
-            // destructuring assignment: for a, b in []
-            for (var i = 0; i < node.init.elements.length; i++) {
-                var cnode = node.init.elements[i];
-                if (cnode instanceof RapydScript.AST_Seq) cnode = cnode.to_array();
-                if (cnode instanceof RapydScript.AST_SymbolRef) cnode = [cnode];
-                if (Array.isArray(cnode)) {
-                    for (var j = 0; j < cnode.length; j++) {
-                        var elem = cnode[j];
-                        if (elem instanceof RapydScript.AST_SymbolRef) {
-                            this.current_node = elem;
-                            elem.lint_visited = true;
-                            this.add_binding(elem.name).is_loop = true;
-                            this.current_node = node;
-                        }
-                    }
-                }
-            }
- 
+            // destructuring assignment: for a, b in [] or for (a, b), c in []
+            node.init.elements.forEach(add_loop_var);
         }
     };