sibilant 0.0.2 → 0.0.3

data/js/sibilant/include/macros.sibilant

@@ -228,7 +228,7 @@
   (concat "(!!(" (translate expr) "))"))
 
 (defmacro chain (object &rest calls)
-  (concat (translate object) " // chain"
+  (concat (translate object)
 	  (indent (join "\n"
                         (map calls
                              (lambda (call, index)
@@ -237,6 +237,11 @@
                                (concat "." (translate method)
                                        "(" (join ", " (map args translate)) ")")))))))
 
+(defmacro chainable (&rest names)
+  (each (name) names
+    (macros.defmacro name ['target "&rest" 'calls]
+                     ['apply 'macros.chain ['cons ['macros.call ['quote name] 'target] 'calls]])))
+
 (defmacro try (tryblock catchblock)
   (concat
    "(function() {"

data/js/sibilant/lib/browser.js

@@ -1,12 +1,10 @@
 (function() {
   var sibilant = {  };
   var error = (function(str) {
-    // str:required
     throw new Error (str);
   });
   ;
   var inspect = (function(item) {
-    // item:required
     return (function() {
       if (item.toSource) {
         return item.toSource();
@@ -19,7 +17,6 @@
   (window)["sibilant"] = sibilant;
   var exports = {  };
   var bulkMap = (function(arr, fn) {
-    // arr:required fn:required
     var index = 0,
         groupSize = fn.length,
         retArr = [  ];
@@ -37,12 +34,10 @@
   });
   
   var inject = (function(start, items, fn) {
-    // start:required items:required fn:required
     var value = start;
     (function() {
       if ((items) && (items).constructor.name === "Array") {
         return items.forEach((function(item, index) {
-          // item:required index:required
           return value = fn(value, item, index);
         }));
       }
@@ -51,18 +46,14 @@
   });
   
   var map = (function(items, fn) {
-    // items:required fn:required
     return inject([  ], items, (function(collector, item, index) {
-      // collector:required item:required index:required
       collector.push(fn(item, index));
       return collector;
     }));
   });
   
   var select = (function(items, fn) {
-    // items:required fn:required
     return inject([  ], items, (function(collector, item, index) {
-      // collector:required item:required index:required
       (function() {
         if (fn(item, index)) {
           return collector.push(item);
@@ -73,7 +64,6 @@
   });
   
   var detect = (function(items, fn) {
-    // items:required fn:required
     var returnItem = undefined,
         index = 0,
         items = items;
@@ -94,7 +84,6 @@
   });
   
   var reject = (function(items, fn) {
-    // items:required fn:required
     var args = [ items, fn ];
     return select(items, (function() {
       return (!fn.apply(undefined, arguments));
@@ -102,19 +91,15 @@
   });
   
   var compact = (function(arr) {
-    // arr:required
     return select(arr, (function(item) {
-      // item:required
       return (!!(item));
     }));
   });
   
   var flatten = (function(items) {
-    // items:rest
     var items = Array.prototype.slice.call(arguments, 0);
     
     return inject([  ], items, (function(collector, item) {
-      // collector:required item:required
       return collector.concat((function() {
         if ((item) && (item).constructor.name === "Array") {
           return flatten.apply(undefined, item);
@@ -141,12 +126,10 @@
   (sibilant.tokens)["specialLiteral"] = (sibilant.tokens.special + sibilant.tokens.literal);
   (sibilant)["tokenPrecedence"] = [ "regex", "comment", "string", "number", "specialLiteral", "otherChar", "specialOpenParen", "closeParen", "alternativeParens" ];
   var tokenize = sibilant.tokenize = (function(string) {
-    // string:required
     var tokens = [  ],
         parseStack = [ tokens ],
         specials = [  ];
     var acceptToken = (function(token) {
-      // token:required
       return (parseStack)[0].push(token);
     });
     ;
@@ -167,7 +150,6 @@
     });
     ;
     var handleToken = (function(token) {
-      // token:required
       var special = (token)[0],
           token = token;
       (function() {
@@ -216,11 +198,10 @@
     });
     ;
     var orderedRegexen = map(sibilant.tokenPrecedence, (function(x) {
-      // x:required
       return (sibilant.tokens)[x];
     })),
         masterRegex = (new RegExp((orderedRegexen).join("|"), "g"));
-    string // chain
+    string
       .match(masterRegex)
       .forEach(handleToken)
     ;
@@ -232,10 +213,9 @@
     return tokens;
   });
   var indent = (function(args) {
-    // args:rest
     var args = Array.prototype.slice.call(arguments, 0);
     
-    return (compact(args) // chain
+    return (compact(args)
       .join("\n")
       .replace(/^/, "\n")
       .replace(/\n/g, "\n  ")
@@ -243,9 +223,7 @@
   });
   
   var constructHash = (function(arrayOfArrays) {
-    // arrayOfArrays:required
     return inject({  }, arrayOfArrays, (function(object, item) {
-      // object:required item:required
       (object)[(item)[0]] = (object)[(item)[1]];
       return object;
     }));
@@ -254,7 +232,6 @@
   var macros = {  };
   (sibilant)["macros"] = macros;
   (macros)["return"] = (function(token) {
-    // token:required
     var defaultReturn = ("return " + translate(token));
     return (function() {
       if ((token) && (token).constructor.name === "Array") {
@@ -308,41 +285,39 @@
     })();
   });
   var asStatement = (function(string) {
-    // string:required
-    return string // chain
+    return string
       .toString()
       .replace(/;*\s*$/, ";")
     ;
   });
   
   macros.statement = (function(args) {
-    // args:rest
     var args = Array.prototype.slice.call(arguments, 0);
     
     return (macros.call.apply(undefined, args) + ";\n");
   });
   
   macros.progn = (function(body) {
-    // body:rest
     var body = Array.prototype.slice.call(arguments, 0);
     
     var lastIndex = Math.max(0, (body.length - 1));
     (body)[lastIndex] = [ "return", (body)[lastIndex] ];
     return (map(body, (function(arg) {
-      // arg:required
       return (asStatement(translate(arg)));
     }))).join("\n");
   });
   
+  macros.emptyList = (function() {
+    return "null";
+  });
+  
   macros.call = (function(fnName, args) {
-    // fnName:required args:rest
     var args = Array.prototype.slice.call(arguments, 1);
     
     return (translate(fnName) + "(" + (map(args, translate)).join(", ") + ")");
   });
   
   macros.defun = (function(fnName, argsAndBody) {
-    // fnName:required argsAndBody:rest
     var argsAndBody = Array.prototype.slice.call(arguments, 1);
     
     var fnNameTr = translate(fnName),
@@ -357,7 +332,6 @@
   });
   
   macros.defmacro = (function(name, argsAndBody) {
-    // name:required argsAndBody:rest
     var argsAndBody = Array.prototype.slice.call(arguments, 1);
     
     var js = macros.lambda.apply(undefined, argsAndBody),
@@ -373,18 +347,15 @@
   });
   
   macros.concat = (function(args) {
-    // args:rest
     var args = Array.prototype.slice.call(arguments, 0);
     
     return ("(" + (map(args, translate)).join(" + ") + ")");
   });
   
   var transformArgs = (function(arglist) {
-    // arglist:required
     var last = undefined,
         args = [  ];
     arglist.forEach((function(arg) {
-      // arg:required
       return (function() {
         if (((arg)[0] === "&")) {
           return last = arg.slice(1);
@@ -403,10 +374,8 @@
   });
   
   macros.reverse = (function(arr) {
-    // arr:required
     var reversed = [  ];
     arr.forEach((function(item) {
-      // item:required
       return reversed.unshift(item);
     }));
     return reversed;
@@ -414,17 +383,14 @@
   
   var reverse = macros.reverse;
   var buildArgsString = (function(args, rest) {
-    // args:required rest:required
     var argsString = "",
         optionalCount = 0;
     args.forEach((function(arg, optionIndex) {
-      // arg:required optionIndex:required
       return (function() {
         if (((arg)[0] === "optional")) {
-          argsString = (argsString + "if (arguments.length < " + (args.length - optionalCount) + ")" + " // if " + translate((arg)[1]) + " is missing" + indent(("var " + map(args.slice((optionIndex + 1)), (function(arg, argIndex) {
-            // arg:required argIndex:required
+          argsString = (argsString + "if (arguments.length < " + (args.length - optionalCount) + ")" + indent(("var " + map(args.slice((optionIndex + 1)), (function(arg, argIndex) {
             return (translate((arg)[1]) + " = " + translate(((args)[(optionIndex + argIndex)])[1]));
-          })) // chain
+          }))
             .reverse()
             .concat((translate((arg)[1]) + " = undefined"))
             .join(", ")
@@ -442,28 +408,11 @@
     })();
   });
   
-  var buildCommentString = (function(args) {
-    // args:required
-    return (function() {
-      if (((args).length === 0)) {
-        return "";
-      } else {
-        return ("// " + (map(args, (function(arg) {
-          // arg:required
-          return (translate((arg)[1]) + ":" + (arg)[0]);
-        }))).join(" "));
-      }
-    })();
-  });
-  
-  // brain 'splode
   macros.lambda = (function(arglist, body) {
-    // arglist:required body:rest
     var body = Array.prototype.slice.call(arguments, 1);
     
     var args = transformArgs(arglist),
         rest = (select(args, (function(arg) {
-      // arg:required
       return ("rest" === (arg)[0]);
     })))[0],
         docString = undefined;
@@ -480,13 +429,10 @@
         return args;
       }
     })(),
-        argsString = buildArgsString(noRestArgs, rest),
-        commentString = buildCommentString(args);
+        argsString = buildArgsString(noRestArgs, rest);
     return ("(function(" + (map(args, (function(arg) {
-      // arg:required
       return translate((arg)[1]);
-    }))).join(", ") + ") {" + indent(commentString, docString, argsString, (map(body, (function(stmt) {
-      // stmt:required
+    }))).join(", ") + ") {" + indent(docString, argsString, (map(body, (function(stmt) {
       var tstmt = translate(stmt);
       return (tstmt + (function() {
         if (((tstmt.slice(-1))[0] === ";")) {
@@ -499,7 +445,6 @@
   });
   
   macros.quote = (function(item) {
-    // item:required
     return (function() {
       if (("Array" === item.constructor.name)) {
         return ("[ " + (map(item, macros.quote)).join(", ") + " ]");
@@ -516,7 +461,6 @@
   });
   
   macros.hash = (function(pairs) {
-    // pairs:rest
     var pairs = Array.prototype.slice.call(arguments, 0);
     
     (function() {
@@ -525,7 +469,6 @@
       }
     })();
     var pairStrings = bulkMap(pairs, (function(key, value) {
-      // key:required value:required
       return (translate(key) + ": " + translate(value));
     }));
     return (function() {
@@ -538,19 +481,57 @@
   });
   
   var literal = (function(string) {
-    // string:required
-    return inject(string // chain
+    return inject(string
       .replace(/\*/g, "_")
       .replace(/\?$/, "__QUERY")
       .replace(/!$/, "__BANG")
     , string.match(/-(.)/g), (function(returnString, match) {
-      // returnString:required match:required
       return returnString.replace(match, (match)[1].toUpperCase());
     }));
   });
   
+  var translateListToken = (function(token, hint) {
+    return (function() {
+      if (((token).length === 0)) {
+        return macros.emptyList();
+      } else {
+        return (function() {
+          if (typeof((macros)[translate((token)[0])]) !== 'undefined') {
+            return (macros)[translate((token)[0])].apply(undefined, token.slice(1));
+          } else {
+            return (macros)[(hint || "call")].apply(undefined, token);
+          }
+        })();
+      }
+    })();
+  });
+  
+  var translateStringToken = (function(token, hint) {
+    return (function() {
+      if (token.match((new RegExp(("^" + sibilant.tokens.literal + "$"), undefined)))) {
+        return literal(token);
+      } else {
+        return (function() {
+          if (token.match((new RegExp("^;", undefined)))) {
+            return token.replace((new RegExp("^;+", undefined)), "//");
+          } else {
+            return (function() {
+              if (("\"" === (token)[0] &&
+               "\"" === (token.slice(-1))[0])) {
+                return token
+                  .split("\n")
+                  .join("\\n\" +\n\"");
+              } else {
+                return token;
+              }
+            })();
+          }
+        })();
+      }
+    })();
+  });
+  
   var translate = (function(token, hint) {
-    // token:required hint:required
     var hint = hint;
     (function() {
       if ((hint && typeof((macros)[hint]) === 'undefined')) {
@@ -568,34 +549,13 @@
           try {
             return (function() {
               if ((token) && (token).constructor.name === "Array") {
-                return (function() {
-                  if (typeof((macros)[translate((token)[0])]) !== 'undefined') {
-                    return (macros)[translate((token)[0])].apply(undefined, token.slice(1));
-                  } else {
-                    return (macros)[(hint || "call")].apply(undefined, token);
-                  }
-                })();
+                return translateListToken(token, hint);
               } else {
                 return (function() {
-                  if ((typeof(token) === "string" && token.match((new RegExp(("^" + sibilant.tokens.literal + "$"), undefined))))) {
-                    return literal(token);
+                  if (typeof(token) === "string") {
+                    return translateStringToken(token, hint);
                   } else {
-                    return (function() {
-                      if ((typeof(token) === "string" && token.match((new RegExp("^;", undefined))))) {
-                        return token.replace((new RegExp("^;+", undefined)), "//");
-                      } else {
-                        return (function() {
-                          if ((typeof(token) === "string" && ("\"" === (token)[0] &&
-                           "\"" === (token.slice(-1))[0]))) {
-                            return token // chain
-                              .split("\n")
-                              .join("\\n\" +\n\"");
-                          } else {
-                            return token;
-                          }
-                        })();
-                      }
-                    })();
+                    return token;
                   }
                 })();
               }
@@ -610,10 +570,8 @@
   
   (sibilant)["translate"] = translate;
   var translateAll = (function(contents) {
-    // contents:required
     var buffer = "";
     tokenize(contents).forEach((function(token) {
-      // token:required
       var line = translate(token, "statement");
       return (function() {
         if (line) {
@@ -630,7 +588,6 @@
     var sibilant = window.sibilant,
         scripts = [  ];
     var evalWithTryCatch = (function(js) {
-      // js:required
       return (function() {
         try {
           return eval(js);
@@ -646,13 +603,13 @@
           js = null;
       return (function() {
         if ((!sibilant.loadNextScript())) {
-          return $("script[type=\"text/sibilant\"]:not([src])") // chain
+          return $("script[type=\"text/sibilant\"]:not([src])")
             .each((function() {
-              lisp = $(this) // chain
+              lisp = $(this)
                 .text()
                 .replace(/(^\s*\/\/\<!\[CDATA\[)|(\/\/\]\]>\s*$)/g, "");
               js = sibilant.translateAll(lisp);
-              $(this) // chain
+              $(this)
                 .data("js", js)
               ;
               return evalWithTryCatch(js);
@@ -661,7 +618,7 @@
       })();
     });
     ;
-    scripts = $.makeArray($("script[type=\"text/sibilant\"][src]") // chain
+    scripts = $.makeArray($("script[type=\"text/sibilant\"][src]")
       .map((function() {
         return this.src;
       }))
@@ -671,7 +628,6 @@
       return (function() {
         if (typeof(nextScript) !== 'undefined') {
           $.get(nextScript, (function(data) {
-            // data:required
             evalWithTryCatch(sibilant.translateAll(data));
             return sibilant.scriptLoaded();
           }));

data/js/sibilant/lib/cli.js

@@ -17,8 +17,7 @@ var createContext = (function() {
 });
 
 var runInSandbox = (function(js, inputPath) {
-  // js:required inputPath:optional
-  if (arguments.length < 2) // if inputPath is missing
+  if (arguments.length < 2)
     var inputPath = undefined;
   
   (function() {
@@ -54,18 +53,15 @@ cli.version = (function() {
 });
 
 cli.repl = (function(args) {
-  // args:required
   return require("../lib/repl");
 });
 
 var readStdin = (function(fn) {
-  // fn:required
   var stdin = process.stdin,
       data = "";
   stdin.resume();
   stdin.setEncoding("utf8");
   stdin.on("data", (function(chunk) {
-    // chunk:required
     return data = (data + chunk);
   }));
   return stdin.on("end", (function() {
@@ -74,15 +70,12 @@ var readStdin = (function(fn) {
 });
 
 cli.eval = (function(args, options) {
-  // args:required options:required
   (options)["execute"] = true;
   return cli.input(args, options);
 });
 
 cli.input = (function(args, options) {
-  // args:required options:required
   var process = (function(sibilantCode) {
-    // sibilantCode:required
     var jsCode = sibilant.translateAll(sibilantCode);
     return (function() {
       if (options.execute) {
@@ -103,9 +96,7 @@ cli.input = (function(args, options) {
 });
 
 cli.help = (function(args, options) {
-  // args:required options:required
   return fs.readFile((__dirname + "/../cli-help"), { encoding: "utf8" }, (function(err, data) {
-    // err:required data:required
     (function() {
       if (err) {
         throw new Error (err);
@@ -132,7 +123,6 @@ var outputDir = (function() {
   }
 })();
 (cliOptions.file || [  ]).forEach((function(inputFile) {
-  // inputFile:required
   var inputPath = path.join(process.cwd(), inputFile),
       translated = sibilant.translateFile(inputPath);
   return (function() {

data/js/sibilant/lib/options.js

@@ -1,5 +1,4 @@
 var bulkMap = (function(arr, fn) {
-  // arr:required fn:required
   var index = 0,
       groupSize = fn.length,
       retArr = [  ];
@@ -17,12 +16,10 @@ var bulkMap = (function(arr, fn) {
 });
 
 var inject = (function(start, items, fn) {
-  // start:required items:required fn:required
   var value = start;
   (function() {
     if ((items) && (items).constructor.name === "Array") {
       return items.forEach((function(item, index) {
-        // item:required index:required
         return value = fn(value, item, index);
       }));
     }
@@ -31,18 +28,14 @@ var inject = (function(start, items, fn) {
 });
 
 var map = (function(items, fn) {
-  // items:required fn:required
   return inject([  ], items, (function(collector, item, index) {
-    // collector:required item:required index:required
     collector.push(fn(item, index));
     return collector;
   }));
 });
 
 var select = (function(items, fn) {
-  // items:required fn:required
   return inject([  ], items, (function(collector, item, index) {
-    // collector:required item:required index:required
     (function() {
       if (fn(item, index)) {
         return collector.push(item);
@@ -53,7 +46,6 @@ var select = (function(items, fn) {
 });
 
 var detect = (function(items, fn) {
-  // items:required fn:required
   var returnItem = undefined,
       index = 0,
       items = items;
@@ -74,7 +66,6 @@ var detect = (function(items, fn) {
 });
 
 var reject = (function(items, fn) {
-  // items:required fn:required
   var args = [ items, fn ];
   return select(items, (function() {
     return (!fn.apply(undefined, arguments));
@@ -82,19 +73,15 @@ var reject = (function(items, fn) {
 });
 
 var compact = (function(arr) {
-  // arr:required
   return select(arr, (function(item) {
-    // item:required
     return (!!(item));
   }));
 });
 
 var flatten = (function(items) {
-  // items:rest
   var items = Array.prototype.slice.call(arguments, 0);
   
   return inject([  ], items, (function(collector, item) {
-    // collector:required item:required
     return collector.concat((function() {
       if ((item) && (item).constructor.name === "Array") {
         return flatten.apply(undefined, item);
@@ -107,8 +94,7 @@ var flatten = (function(items) {
 
 
 var extractOptions = (function(config, args) {
-  // config:required args:optional
-  if (arguments.length < 2) // if args is missing
+  if (arguments.length < 2)
     var args = undefined;
   
   var args = (args || process.argv.slice(2)),
@@ -118,12 +104,10 @@ var extractOptions = (function(config, args) {
       config = (config || {  }),
       unlabeled = [  ];
   var label__QUERY = (function(item) {
-    // item:required
     return (typeof(item) === "string" && /^-/.test(item));
   });
   ;
   var synonymLookup = (function(item) {
-    // item:required
     var configEntry = (config)[item];
     return (function() {
       if (typeof(configEntry) === "string") {
@@ -135,19 +119,16 @@ var extractOptions = (function(config, args) {
   });
   ;
   var takesArgs__QUERY = (function(item) {
-    // item:required
     return (false !== (config)[labelFor(item)]);
   });
   ;
   defaultLabel = synonymLookup(defaultLabel);
   currentLabel = defaultLabel;
   var labelFor = (function(item) {
-    // item:required
     return synonymLookup(item.replace(/^-+/, ""));
   });
   ;
   var addValue = (function(hash, key, value) {
-    // hash:required key:required value:required
     var currentValue = (hash)[key];
     (function() {
       if (typeof(currentValue) === 'undefined') {
@@ -167,7 +148,6 @@ var extractOptions = (function(config, args) {
   });
   ;
   return inject({  }, args, (function(returnHash, item, index) {
-    // returnHash:required item:required index:required
     (function() {
       if (("--" === item)) {
         return afterBreak = true;
@@ -199,15 +179,13 @@ var extractOptions = (function(config, args) {
 });
 
 var processOptions = (function(config) {
-  // config:optional
-  if (arguments.length < 1) // if config is missing
+  if (arguments.length < 1)
     var config = undefined;
   
   var options = extractOptions(config);
   (function() {
     if (config) {
       var handlePair = (function(key, value) {
-        // key:required value:required
         var handle = (config)[key];
         (function() {
           if (typeof(handle) === "string") {
@@ -221,7 +199,6 @@ var processOptions = (function(config) {
         })();
       });
       return Object.keys(options).forEach((function(key) {
-        // key:required
         return handlePair(key, (options)[key]);
       }));
     }