Updated to build meter

DavePearce · DavePearce · commit 439760a438b4 · 2019-11-19T15:24:18.000+13:00
The build metering concept provides a mechanism for profiling.
diff --git a/src/main/java/wyjs/io/JavaScriptFileWriter.java b/src/main/java/wyjs/io/JavaScriptFileWriter.java
@@ -102,12 +102,14 @@ public final class JavaScriptFileWriter extends AbstractConsumer<JavaScriptFileW
 
 	private WyilFile wyilfile;
 
-	public JavaScriptFileWriter(Build.Project project, PrintWriter writer) {
+	public JavaScriptFileWriter(Build.Meter meter, Build.Project project, PrintWriter writer) {
+		super(meter);
 		this.project = project;
 		this.out = writer;
 	}
 
-	public JavaScriptFileWriter(Build.Project project, OutputStream stream) {
+	public JavaScriptFileWriter(Build.Meter meter, Build.Project project, OutputStream stream) {
+		super(meter);
 		this.project = project;
 		this.out = new PrintWriter(new OutputStreamWriter(stream));
 	}
diff --git a/src/main/java/wyjs/tasks/JavaScriptCompileTask.java b/src/main/java/wyjs/tasks/JavaScriptCompileTask.java
@@ -82,6 +82,7 @@ public Function<Build.Meter,Boolean> initialise() throws IOException {
 	}
 
 	public boolean execute(Build.Meter meter, JavaScriptFile target, WyilFile source, JavaScriptFile... includes) {
+		meter = meter.fork("JavaScriptCompiler");
 		// FIXME: this is a fairly temporary solution at the moment which just
 		// turns the WyIL file directly into a string. A more useful solution
 		// will be to generate an intermediate file representing JavaScript in
@@ -93,6 +94,8 @@ public boolean execute(Build.Meter meter, JavaScriptFile target, WyilFile source
 		for (JavaScriptFile i : includes) {
 			target.getDeclarations().addAll(i.getDeclarations());
 		}
+		//
+		meter.done();
 		// How can this fail?
 		return true;
 	}
diff --git a/src/main/java/wyjs/tasks/JavaScriptCompiler.java b/src/main/java/wyjs/tasks/JavaScriptCompiler.java
@@ -241,7 +241,7 @@ public Term constructLambda(Decl.Lambda decl, Term term) {
 		Term inner = new Lambda(parameters,new Block(new Return(term)));
 		// NOTE: need to use Immediately Invoked Function Expression here, otherwise
 		// capture variables don't behave properly.
-		Tuple<Decl.Variable> captured = new Tuple<>(decl.getCapturedVariables());
+		Tuple<Decl.Variable> captured = new Tuple<>(decl.getCapturedVariables(meter));
 		List<String> captures = toParameterNames(captured);
 		Term[] capturedArgs = toLambdaArguments(captured);
 		// Construct outer lambda (this is for the IIFE)
@@ -1854,7 +1854,7 @@ private void extractUsedVariables(LVal lval, Set<Decl.Variable> uses) {
 	 */
 	private void extractUsedVariables(Expr e, Set<Decl.Variable> uses) {
 		// Construct appropriate visitor
-		AbstractVisitor visitor = new AbstractVisitor() {
+		AbstractVisitor visitor = new AbstractVisitor(meter) {
 			@Override
 			public void visitVariableAccess(Expr.VariableAccess e) {
 				uses.add(e.getVariableDeclaration());

Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,14 @@ public final class JavaScriptFileWriter extends AbstractConsumer<JavaScriptFileW`
`102`	`102`
`103`	`103`	`private WyilFile wyilfile;`
`104`	`104`
`105`		`- public JavaScriptFileWriter(Build.Project project, PrintWriter writer) {`
	`105`	`+ public JavaScriptFileWriter(Build.Meter meter, Build.Project project, PrintWriter writer) {`
	`106`	`+ super(meter);`
`106`	`107`	`this.project = project;`
`107`	`108`	`this.out = writer;`
`108`	`109`	`}`
`109`	`110`
`110`		`- public JavaScriptFileWriter(Build.Project project, OutputStream stream) {`
	`111`	`+ public JavaScriptFileWriter(Build.Meter meter, Build.Project project, OutputStream stream) {`
	`112`	`+ super(meter);`
`111`	`113`	`this.project = project;`
`112`	`114`	`this.out = new PrintWriter(new OutputStreamWriter(stream));`
`113`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public Function<Build.Meter,Boolean> initialise() throws IOException {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public boolean execute(Build.Meter meter, JavaScriptFile target, WyilFile source, JavaScriptFile... includes) {`
	`85`	`+ meter = meter.fork("JavaScriptCompiler");`
`85`	`86`	`// FIXME: this is a fairly temporary solution at the moment which just`
`86`	`87`	`// turns the WyIL file directly into a string. A more useful solution`
`87`	`88`	`// will be to generate an intermediate file representing JavaScript in`
`@@ -93,6 +94,8 @@ public boolean execute(Build.Meter meter, JavaScriptFile target, WyilFile source`
`93`	`94`	`for (JavaScriptFile i : includes) {`
`94`	`95`	`target.getDeclarations().addAll(i.getDeclarations());`
`95`	`96`	`}`
	`97`	`+ //`
	`98`	`+ meter.done();`
`96`	`99`	`// How can this fail?`
`97`	`100`	`return true;`
`98`	`101`	`}`