Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Woodchipper to ConstantVisitor, and simplify the vendor/constants.js interface #106

Merged
merged 2 commits into from
Jun 17, 2013
Merged

Rename Woodchipper to ConstantVisitor, and simplify the vendor/constants.js interface #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f87e8e
Rename Woodchipper-related stuff.
benjamn Jun 17, 2013
000928f
Use recast.parse and .print for require("vendor/constants").propagate.
benjamn Jun 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 5 additions & 11 deletions bin/jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

var visitors = require('../vendor/fbtransform/visitors').transformVisitors;
var transform = require('../vendor/fbtransform/lib/transform').transform;
var debranch = require("../vendor/woodchipper").debranch;
var propagate = require("../vendor/constants").propagate;

require("commoner").resolve(function(id) {
var context = this;
Expand All @@ -25,18 +25,12 @@ require("commoner").resolve(function(id) {

}).process(function(id, source) {
var context = this;
var constants = context.config.constants || {};

// This is where JSX, ES6, etc. desugaring happens.
source = transform(visitors.react, source).code;

return context.makePromise(function(callback) {
var constants = context.config.constants || {};

// Debranching means removing any obviously dead code after
// replacing constant conditional expressions with literal
// (boolean) values.
debranch(constants, source, function(source) {
callback(null, source);
});
});
// Constant propagation means removing any obviously dead code after
// replacing constant expressions with literal (boolean) values.
return propagate(constants, source);
});
16 changes: 6 additions & 10 deletions vendor/woodchipper.js → vendor/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@

var recast = require('recast');

exports.debranch = function(constants, source, writeback) {
recast.runString(
source,
function(ast, callback) {
callback(new Woodchipper(constants).visit(ast));
},
{ writeback: writeback }
);
exports.propagate = function(constants, source) {
var ast = recast.parse(source);
ast = new ConstantVisitor(constants).visit(ast);
return recast.print(ast);
};

var Woodchipper = recast.Visitor.extend({
var ConstantVisitor = recast.Visitor.extend({
init: function(constants) {
this.constants = constants || {};
},
Expand Down Expand Up @@ -57,6 +53,6 @@ var Woodchipper = recast.Visitor.extend({
if (!module.parent) {
var constants = JSON.parse(process.argv[3]);
recast.run(function(ast, callback) {
callback(new Woodchipper(constants).visit(ast));
callback(new ConstantVisitor(constants).visit(ast));
});
}