sibilant 0.0.2 → 0.0.3

data/js/sibilant/lib/repl.js

@@ -38,13 +38,11 @@ var displayPrompt = (function() {
 });
 
 readline.on("line", (function(cmd) {
-  // cmd:required
   var jsLine = "";
   (function() {
     try {
       cmdBuffer = (cmdBuffer + cmd);
       sibilant.tokenize(cmdBuffer).forEach((function(stmt) {
-        // stmt:required
         return jsLine = (jsLine + sibilant.translate(stmt, "statement"));
       }));
       var result = vm.runInContext(jsLine, context, "sibilant-repl");

data/js/sibilant/lib/sibilant.js

@@ -3,12 +3,10 @@ var sibilant = exports,
     path = require("path"),
     fs = require("fs"),
     error = (function(str) {
-  // str:required
   throw new Error (str);
 }),
     inspect = util.inspect;
 var bulkMap = (function(arr, fn) {
-  // arr:required fn:required
   var index = 0,
       groupSize = fn.length,
       retArr = [  ];
@@ -26,12 +24,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);
       }));
     }
@@ -40,18 +36,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);
@@ -62,7 +54,6 @@ var select = (function(items, fn) {
 });
 
 var detect = (function(items, fn) {
-  // items:required fn:required
   var returnItem = undefined,
       index = 0,
       items = items;
@@ -83,7 +74,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));
@@ -91,19 +81,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);
@@ -127,14 +113,12 @@ sibilant.versionString = (function() {
 });
 
 sibilant.stripShebang = (function(data) {
-  // data:required
   return data.replace(/^#!.*\n/, "");
 });
 
 (sibilant)["file"] = "eval.sibilant";
 (sibilant)["dir"] = process.cwd();
 var withDirAndFile = (function(dir, file, fn) {
-  // dir:required file:required fn:required
   var before = {
     dir: sibilant.dir,
     file: sibilant.file
@@ -148,7 +132,6 @@ var withDirAndFile = (function(dir, file, fn) {
 });
 
 sibilant.translateFile = (function(fileName) {
-  // fileName:required
   return withDirAndFile(path.dirname(fileName), fileName, (function() {
     return sibilant.translateAll(sibilant.stripShebang(fs.readFileSync(fileName, "utf8")));
   }));
@@ -159,12 +142,10 @@ sibilant.version = (function() {
 });
 
 (require.extensions)[".sibilant"] = (function(module, filename) {
-  // module:required filename:required
   var content = sibilant.translateFile(filename);
   return module._compile(content, filename);
 });
 sibilant.include = (function(file) {
-  // file:required
   (function() {
     if ((!file.match((new RegExp(".sibilant$", undefined))))) {
       return file = (file + ".sibilant");
@@ -194,12 +175,10 @@ sibilant.include = (function(file) {
 (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);
   });
   ;
@@ -220,7 +199,6 @@ var tokenize = sibilant.tokenize = (function(string) {
   });
   ;
   var handleToken = (function(token) {
-    // token:required
     var special = (token)[0],
         token = token;
     (function() {
@@ -269,11 +247,10 @@ var tokenize = sibilant.tokenize = (function(string) {
   });
   ;
   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)
   ;
@@ -285,10 +262,9 @@ var tokenize = sibilant.tokenize = (function(string) {
   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  ")
@@ -296,9 +272,7 @@ var indent = (function(args) {
 });
 
 var constructHash = (function(arrayOfArrays) {
-  // arrayOfArrays:required
   return inject({  }, arrayOfArrays, (function(object, item) {
-    // object:required item:required
     (object)[(item)[0]] = (object)[(item)[1]];
     return object;
   }));
@@ -307,7 +281,6 @@ var constructHash = (function(arrayOfArrays) {
 var macros = {  };
 (sibilant)["macros"] = macros;
 (macros)["return"] = (function(token) {
-  // token:required
   var defaultReturn = ("return " + translate(token));
   return (function() {
     if ((token) && (token).constructor.name === "Array") {
@@ -361,41 +334,39 @@ var macros = {  };
   })();
 });
 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),
@@ -410,7 +381,6 @@ macros.defun = (function(fnName, argsAndBody) {
 });
 
 macros.defmacro = (function(name, argsAndBody) {
-  // name:required argsAndBody:rest
   var argsAndBody = Array.prototype.slice.call(arguments, 1);
   
   var js = macros.lambda.apply(undefined, argsAndBody),
@@ -426,18 +396,15 @@ macros.defmacro = (function(name, argsAndBody) {
 });
 
 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);
@@ -456,10 +423,8 @@ var transformArgs = (function(arglist) {
 });
 
 macros.reverse = (function(arr) {
-  // arr:required
   var reversed = [  ];
   arr.forEach((function(item) {
-    // item:required
     return reversed.unshift(item);
   }));
   return reversed;
@@ -467,17 +432,14 @@ macros.reverse = (function(arr) {
 
 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(", ")
@@ -495,28 +457,11 @@ var buildArgsString = (function(args, rest) {
   })();
 });
 
-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;
@@ -533,13 +478,10 @@ macros.lambda = (function(arglist, body) {
       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] === ";")) {
@@ -552,7 +494,6 @@ macros.lambda = (function(arglist, body) {
 });
 
 macros.quote = (function(item) {
-  // item:required
   return (function() {
     if (("Array" === item.constructor.name)) {
       return ("[ " + (map(item, macros.quote)).join(", ") + " ]");
@@ -569,7 +510,6 @@ macros.quote = (function(item) {
 });
 
 macros.hash = (function(pairs) {
-  // pairs:rest
   var pairs = Array.prototype.slice.call(arguments, 0);
   
   (function() {
@@ -578,7 +518,6 @@ macros.hash = (function(pairs) {
     }
   })();
   var pairStrings = bulkMap(pairs, (function(key, value) {
-    // key:required value:required
     return (translate(key) + ": " + translate(value));
   }));
   return (function() {
@@ -591,19 +530,57 @@ macros.hash = (function(pairs) {
 });
 
 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')) {
@@ -621,34 +598,13 @@ var translate = (function(token, hint) {
         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;
                 }
               })();
             }
@@ -663,10 +619,8 @@ var translate = (function(token, hint) {
 
 (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) {
@@ -680,7 +634,6 @@ var translateAll = (function(contents) {
 (sibilant)["translateAll"] = translateAll;
 
 macros.include = (function(file) {
-  // file:required
   return sibilant.include(eval(translate(file)));
 });
 

data/js/sibilant/misc/sibilant-mode.el

@@ -25,7 +25,7 @@
     (modify-syntax-entry ?\} "){" table)
     (modify-syntax-entry ?\[ "(]" table)
     (modify-syntax-entry ?\] ")[" table)
-    (modify-syntax-entry ?/  "|" table)
+    (modify-syntax-entry ?/  "." table)
     table))
 
 ;;;###autoload

data/js/sibilant/package.json

@@ -1,10 +1,10 @@
 {
   "name": "sibilant",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "keywords": [ "lisp", "javascript", "language" ],
   "description": "javascript with a lisp",
   "contributors": [ "Jacob Rothstein <hi@jbr.me> (http://jbr.me)", "Matthew Phillips (http://www.matthewphillips.info/)", "Yuest Wang (http://yue.st/)", "Lyndon Tremblay (http://www.hoovy.org)", "David Sargeant (https://github.com/dubiousdavid)" ],
-  "repositories": {
+  "repository": {
     "type": "git",
     "url": "http://github.com/jbr/sibilant.git"
   },
@@ -14,6 +14,9 @@
   },
   "bin": { "sibilant": "./bin/sibilant" },
   "main": "./lib/sibilant",
-  "scripts": { "test": "node ./bin/sibilant test/test.sibilant -x" }
+  "scripts": {
+    "test": "npm run-script build && node ./bin/sibilant test/test.sibilant -x",
+    "build": "bin/sibilant src/*.sibilant -o lib && bin/sibilant package.sibilant > package.json"
+  }
 }
 

data/js/sibilant/package.sibilant

@@ -1,5 +1,5 @@
 { 'name 'sibilant
-  'version "0.1.3"
+  'version "0.1.4"
   'keywords '(lisp javascript language)
   'description "javascript with a lisp"
   'contributors [ "Jacob Rothstein <hi@jbr.me> (http://jbr.me)"
@@ -7,10 +7,11 @@
                   "Yuest Wang (http://yue.st/)"
                   "Lyndon Tremblay (http://www.hoovy.org)"
                   "David Sargeant (https://github.com/dubiousdavid)" ]
-  'repositories { 'type 'git
+  'repository   { 'type 'git
                   'url  "http://github.com/jbr/sibilant.git" }
   'bugs         { 'mail "sibilant@librelist.com"
                   'url "http://github.com/jbr/sibilant/issues" }
   'bin          { 'sibilant "./bin/sibilant" }
   'main         "./lib/sibilant"
-  'scripts      { 'test "node ./bin/sibilant test/test.sibilant -x" }}
+  'scripts      { 'test "npm run-script build && node ./bin/sibilant test/test.sibilant -x"
+                  'build "bin/sibilant src/*.sibilant -o lib && bin/sibilant package.sibilant > package.json" }}