Changeset 19106 for lang/javascript/ijscript

Timestamp:

09/10/08 09:14:38 (4 months ago)

Author:

drry

Message:

• fixed to check for the case of extension.
  
• added long opts for the command line.
  
• et cetera.
  

Location:

lang/javascript/ijscript

Files:

• ijsc.js (modified) (8 diffs)
• util/env-proxy.js (modified) (1 diff)
• util/funcs.js (modified) (6 diffs)

lang/javascript/ijscript/ijsc.js

@@ -22 +22 @@
       var src = "";
       if (_p.fso.FolderExists(path)) {
-        for (var fs = files(path, /\.js$/), n = 0, m = fs.length; n < m; ++n)
+        for (var fs = files(path, /\.js$/i), n = 0, m = fs.length; n < m; ++n)
           src += _p.read_f(fs[n]);
       } else {
@@ -90 +90 @@
 
   function read(file) {
-    return file.match(/^http(?:s?):\/\//) ? _p.read_u(file) : _p.read_f(file);
+    return file.match(/^https?:\/\/\S/) ? _p.read_u(file) : _p.read_f(file);
   }
 
@@ -142 +142 @@
       _p.envs[key] = {};
       for (e = new Enumerator(_p.shell.environment(key)); !e.atEnd(); e.moveNext()) {
-        if (e.item().match(/^(.+)=(.+)$/))
+        if (e.item().match(/^([^=]+)=(.+)$/))
           _p.envs[key][RegExp.$1.toLowerCase()] = RegExp.$2;
       }
@@ -161 +161 @@
       ['-q', 'quit']
     ];
-    print('command line options:')
+    print('command line options:');
     for (var opt, i = 0, m = opts.length; i < m; ++i) {
       opt = opts[i];
@@ -167 +167 @@
     }
 
-    print('shell commands:')
+    print('shell commands:');
     var cmds = [
       ['c2a', ['c'], 'Collection to Array'],
@@ -173 +173 @@
       ['dump', ['obj'], 'dump obj'],
       ['envs', [], 'return the environment variable object, print(envs().system.path)'],
-      ['files', ['dir', '[re]'], 'files(".", /\\.js$/)'],
+      ['files', ['dir', '[re]'], 'files(".", /\\.js$/i)'],
       ['help', [], 'print this message'],
       ['print', ['val'], 'print val'],
@@ -192 +192 @@
   with ({ n: 0, m: 0, item: "", fquit: false, feval: false, libs: [] }) {
     try {
-      libs = files('lib', /\.js$/);
+      libs = files('lib', /\.js$/i);
     } catch (_e) {
     }
@@ -200 +200 @@
     for (n = 0, m = WScript.Arguments.length; n < m; ++n) {
       item = WScript.Arguments.Item(n);
-      if (item.match(/^-(\w+)$/)) {
-        if (RegExp.$1 == 'q') {
-          fquit = true;
-        } else if (RegExp.$1 == 'e') {
-          feval = true;
-          fquit = true;
+      if (item.match(/^-([-\w]+)$/)) {
+        switch (RegExp.$1) {
+          case 'e':
+          case '-eval':
+            feval = true;
+          case 'q':
+          case '-quit':
+            fquit = true;
+          default:
+            break;
         }
 

lang/javascript/ijscript/util/env-proxy.js

@@ -3 +3 @@
   for (var s, o = envs(), keys = ['process', 'user'], i = 0, m = keys.length; i < m; ++i) {
     s = o[keys[i]].http_proxy;
-    if (s && s.match(/(http:\/\/)(?:(.+):(.+)@)?(.+)/)) {
+    if (s && s.match(/(http:\/\/)(?:([^:]+):([^@]+)@)?(.+)/)) {
       proxy(
         RegExp.$2 && RegExp.$3

lang/javascript/ijscript/util/funcs.js

@@ -11 +11 @@
 function map(a, f) {
   var r = [];
-  for (var i = 0, m = a.length; i < m ; ++i)
+  for (var i = 0, m = a.length; i < m; i++)
     r.push(f(a[i]));
   return r;
@@ -18 +18 @@
 //
 function each(a, f) {
-  for (var i = 0, m = a.length; i < m ; ++i)
+  for (var i = 0, m = a.length; i < m; i++)
     f(a[i]);
 }
@@ -31 +31 @@
       function() { return true };
   return f;
-};
+}
 
 //
@@ -37 +37 @@
   var f = cond(p);
   var r = [];
-  for (var i = 0, m = a.length; i < m ; ++i) {
+  for (var i = 0, m = a.length; i < m; ++i) {
     if (f(a[i]))
       r.push(a[i]);
@@ -92 +92 @@
         function(d) { ret = ret.concat(handler(fso, d, f)) });
       return ret;
-    }
+    };
     files = handler(fso, fso.GetFolder(path), f);
   }
@@ -99 +99 @@
 
 function unzip(file, dir) {
-  if (!file || !file.match(/\.zip$/))
+  if (typeof file != 'string' || !file.toLowerCase().match(/\.zip$/))
     return false;