Demand one argument and define -d and -s

codedot · codedot · commit 25b01dd2c172 · 2017-01-22T15:24:09.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
 all: compile.js
 	npm install
-	node lambda debug.mlc >|output.tmp
-	tail output.tmp
-	time -p node lambda
+	node lambda -d debug.mlc
+	time -p node lambda fact.mlc
 
 compile.js: grammar.jison
 	npm install jison@0.4.15
@@ -11,5 +10,5 @@ compile.js: grammar.jison
 	mv $@.tmp $@
 
 clean:
-	-rm -f *.tmp stats.json
+	-rm -f *.tmp
 	-rm -fr node_modules
diff --git a/README.md b/README.md
@@ -1,14 +1,16 @@
 This package implements the pure untyped lambda calculus using
-interaction nets, providing both CLI and API described below.
+interaction nets, providing both CLI and API.
 
 # CLI
 
 This package provides a `lambda` command with the following interface:
 
 ```
-Usage: lambda [file]
+Usage: lambda [options] <file.mlc>
 
 Options:
+  --debug, -d    Enable step-by-step evaluation              [boolean]
+  --stats, -s    Save statistics to a file                    [string]
   --help, -h     Show help                                   [boolean]
   --version, -v  Show version number                         [boolean]
 
@@ -24,7 +26,7 @@ The last term in the input is the term whose normal form is to be found.
 For developing and testing purposes, the package also exports
 two additional functions `.prepare(term)` and `.debug()`.
 The `.debug()` function applies a single reduction step to
-the interaction net compiled by the previous `.prepare(src, fmt)`
+the interaction net compiled by the previous `.prepare()`
 call and returns a human-readable string representation of
 the current interaction net state.
 
diff --git a/lambda.js b/lambda.js
@@ -4,8 +4,23 @@ var lambda = require(".");
 var yargs = require("yargs");
 var fs = require("fs");
 
+var opts = {
+	debug: {
+		alias: "d",
+		desc: "Enable step-by-step evaluation",
+		boolean: true
+	},
+	stats: {
+		alias: "s",
+		desc: "Save statistics to a file",
+		string: true
+	}
+};
+
 var argv = yargs
-	.usage("Usage: $0 [file]")
+	.usage("Usage: $0 [options] <file.mlc>")
+	.options(opts)
+	.demandCommand(1)
 	.help()
 	.alias("help", "h")
 	.version()
@@ -14,23 +29,23 @@ var argv = yargs
 	.wrap(70)
 	.argv;
 
-var file = argv._[0];
+var input = fs.readFileSync(argv._[0], "utf8");
 
-if (file) {
-	var input = fs.readFileSync(file, "utf8");
+if (argv.debug) {
 	var eqn;
 
 	lambda.prepare(input);
 
 	while (eqn = lambda.debug1())
 		console.log(eqn);
 } else {
-	var output = lambda(lambda.example);
+	var output = lambda(input);
 	var stats = JSON.stringify(output.stats, null, "\t");
 
 	console.log(output.term);
 	console.info("%s(%s)", output.total, output.beta);
 	console.log(output.nf);
 
-	fs.writeFileSync("stats.json", stats + "\n");
+	if (argv.stats)
+		fs.writeFileSync(argv.stats, stats + "\n");
 }
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 	"repository": "codedot/lambda",
 	"name": "@alexo/lambda",
 	"bin": "./lambda.js",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"license": "MIT",
 	"dependencies": {
 		"inet-lib": "0.2.0",
