archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

generator -> codegen

Browse Source
This commit is contained in:
Patrick Steele-Idem 2015-12-28 21:55:29 -07:00
parent 21ff7769e5
commit fb6b436063
41 changed files with 243 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/CodeGenerator.js
View File

@ -9,19 +9,19 @@ const Container = require('./ast/Container');
const util = require('util');
class Slot {
constructor(generator, slotNode) {
constructor(codegen, slotNode) {
this._content = null;
this._start = generator._code.length;
generator.write('/* slot */');
this._start = codegen._code.length;
codegen.write('/* slot */');
if (slotNode.statement) {
generator.write('\n');
codegen.write('\n');
}
this._end = generator._code.length;
this._end = codegen._code.length;
this._currentIndent = generator._currentIndent;
this._inFunction = generator.inFunction;
this._currentIndent = codegen._currentIndent;
this._inFunction = codegen.inFunction;
this._statement = slotNode.statement;
}
@ -29,36 +29,36 @@ class Slot {
this._content = content;
}
generateCode(generator) {
generateCode(codegen) {
let content = this._content;
let slotCode;
if (content) {
let isStatement = this._statement;
generator._currentIndent = this._currentIndent;
generator.inFunction = this._inFunction;
codegen._currentIndent = this._currentIndent;
codegen.inFunction = this._inFunction;
let capture = generator._beginCaptureCode();
let capture = codegen._beginCaptureCode();
if (isArray(content) || (content instanceof Container)) {
content.forEach((node) => {
node.statement = isStatement;
generator.generateCode(node);
codegen.generateCode(node);
});
} else {
content.statement = isStatement;
generator.generateCode(content);
codegen.generateCode(content);
}
slotCode = capture.end();
}
let oldCode = generator._code;
let oldCode = codegen._code;
let beforeCode = oldCode.substring(0, this._start);
let afterCode = oldCode.substring(this._end);
generator._code = beforeCode + (slotCode || '') + afterCode;
codegen._code = beforeCode + (slotCode || '') + afterCode;
}
}
@ -83,7 +83,7 @@ class Generator {
ok(this.builder, '"this.builder" is required');
this._generatorCodeMethodName = 'generate' +
this._codegenCodeMethodName = 'generate' +
this.outputType.charAt(0).toUpperCase() +
this.outputType.substring(1) +
'Code';
@ -153,10 +153,10 @@ class Generator {
let generateCodeMethod = node.generateCode;
if (!generateCodeMethod) {
generateCodeMethod = node[this._generatorCodeMethodName];
generateCodeMethod = node[this._codegenCodeMethodName];
if (!generateCodeMethod) {
throw new Error('No code generator for node of type "' +
throw new Error('No code codegen for node of type "' +
node.type +
'" (output type: "' + this.outputType + '"). Node: ' + util.inspect(node));
}
@ -299,10 +299,10 @@ class Generator {
this._code = '';
return {
generator: this,
codegen: this,
end() {
let newCode = this.generator._code;
this.generator._code = oldCode;
let newCode = this.codegen._code;
this.codegen._code = oldCode;
return newCode;
}
};

12
compiler/ast/Assignment.js
View File

@ -10,24 +10,24 @@ class Assignment extends Node {
this.operator = def.operator;
}
generateCode(generator) {
generateCode(codegen) {
var left = this.left;
var right = this.right;
var operator = this.operator;
generator.generateCode(left);
generator.write(' ' + (operator || '=') + ' ');
codegen.generateCode(left);
codegen.write(' ' + (operator || '=') + ' ');
var wrap = right instanceof Assignment;
if (wrap) {
generator.write('(');
codegen.write('(');
}
generator.generateCode(right);
codegen.generateCode(right);
if (wrap) {
generator.write(')');
codegen.write(')');
}
}

20
compiler/ast/BinaryExpression.js
View File

@ -3,17 +3,17 @@
var Node = require('./Node');
var isCompoundExpression = require('../util/isCompoundExpression');
function generateCodeForOperand(node, generator) {
function generateCodeForOperand(node, codegen) {
var wrap = isCompoundExpression(node);
if (wrap) {
generator.write('(');
codegen.write('(');
}
generator.generateCode(node);
codegen.generateCode(node);
if (wrap) {
generator.write(')');
codegen.write(')');
}
}
@ -25,7 +25,7 @@ class BinaryExpression extends Node {
this.right = def.right;
}
generateCode(generator) {
generateCode(codegen) {
var left = this.left;
var operator = this.operator;
var right = this.right;
@ -34,11 +34,11 @@ class BinaryExpression extends Node {
throw new Error('Invalid BinaryExpression: ' + this);
}
generateCodeForOperand(left, generator);
generator.write(' ');
generator.generateCode(operator);
generator.write(' ');
generateCodeForOperand(right, generator);
generateCodeForOperand(left, codegen);
codegen.write(' ');
codegen.generateCode(operator);
codegen.write(' ');
generateCodeForOperand(right, codegen);
}
isCompoundExpression() {

12
compiler/ast/CustomTag.js
View File

@ -68,12 +68,12 @@ class CustomTag extends HtmlElement {
this.tagDef = tagDef;
}
generateCode(generator) {
var loadRendererVar = generator.addStaticVar('__renderer', '__helpers.r');
var tagVar = generator.addStaticVar('__tag', '__helpers.t');
generateCode(codegen) {
var loadRendererVar = codegen.addStaticVar('__renderer', '__helpers.r');
var tagVar = codegen.addStaticVar('__tag', '__helpers.t');
var builder = generator.builder;
var context = generator.context;
var builder = codegen.builder;
var context = codegen.context;
var tagDef = this.tagDef;
@ -83,7 +83,7 @@ class CustomTag extends HtmlElement {
let requireRendererFunctionCall = builder.require(JSON.stringify(rendererRequirePath));
let loadRendererFunctionCall = builder.functionCall(loadRendererVar, [ requireRendererFunctionCall ]);
let rendererVar = generator.addStaticVar(removeExt(rendererPath), loadRendererFunctionCall);
let rendererVar = codegen.addStaticVar(removeExt(rendererPath), loadRendererFunctionCall);
var inputProps = buildInputProps(this, context);
var tagArgs = [ 'out', rendererVar, inputProps ];
var tagFunctionCall = builder.functionCall(tagVar, tagArgs);

10
compiler/ast/Else.js
View File

@ -9,16 +9,16 @@ class Else extends Node {
this.matched = false;
}
generateCode(generator) {
generateCode(codegen) {
if (!this.matched) {
generator.addError('Unmatched else statement');
codegen.addError('Unmatched else statement');
return;
}
var body = this.body;
generator.write('else ');
generator.generateBlock(body);
generator.write('\n');
codegen.write('else ');
codegen.generateBlock(body);
codegen.write('\n');
}
}

10
compiler/ast/ElseIf.js
View File

@ -11,15 +11,15 @@ class ElseIf extends Node {
this.matched = false;
}
generateCode(generator) {
generateCode(codegen) {
if (!this.matched) {
generator.addError('Unmatched else statement');
codegen.addError('Unmatched else statement');
return;
}
var ifStatement = generator.builder.ifStatement(this.test, this.body, this.else);
generator.write('else ');
generator.generateCode(ifStatement);
var ifStatement = codegen.builder.ifStatement(this.test, this.body, this.else);
codegen.write('else ');
codegen.generateCode(ifStatement);
}
}

4
compiler/ast/Expression.js
View File

@ -10,8 +10,8 @@ class Expression extends Node {
ok(this.value != null, 'Invalid expression');
}
generateCode(generator) {
generator.generateCode(this.value);
generateCode(codegen) {
codegen.generateCode(this.value);
}
isCompoundExpression() {

8
compiler/ast/ForEach.js
View File

@ -16,14 +16,14 @@ class ForEach extends Node {
ok(this.in != null, '"in" is required');
}
generateCode(generator) {
generateCode(codegen) {
var varName = this.varName;
var inExpression = this.in;
var separator = this.separator;
var statusVarName = this.statusVarName;
var iterator = this.iterator;
var builder = generator.builder;
var builder = codegen.builder;
if (separator && !statusVarName) {
statusVarName = '__loop';
@ -41,7 +41,7 @@ class ForEach extends Node {
builder.functionDeclaration(null, params, this.body)
]);
} else if (statusVarName) {
let forEachVarName = generator.addStaticVar('forEachWithStatusVar', '__helpers.fv');
let forEachVarName = codegen.addStaticVar('forEachWithStatusVar', '__helpers.fv');
let body = this.body;
if (separator) {
@ -63,7 +63,7 @@ class ForEach extends Node {
builder.functionDeclaration(null, [varName, statusVarName], body)
]);
} else {
let forEachVarName = generator.addStaticVar('forEach', '__helpers.f');
let forEachVarName = codegen.addStaticVar('forEach', '__helpers.f');
return builder.functionCall(forEachVarName, [
inExpression,

6
compiler/ast/ForEachProp.js
View File

@ -15,15 +15,15 @@ class ForEachProp extends Node {
ok(this.in != null, '"in" is required');
}
generateCode(generator) {
generateCode(codegen) {
var nameVarName = this.nameVarName;
var valueVarName = this.valueVarName;
var inExpression = this.in;
var body = this.body;
var builder = generator.builder;
var builder = codegen.builder;
let forEachVarName = generator.addStaticVar('forEachProp', '__helpers.fp');
let forEachVarName = codegen.addStaticVar('forEachProp', '__helpers.fp');
return builder.functionCall(forEachVarName, [
inExpression,

4
compiler/ast/ForRange.js
View File

@ -17,13 +17,13 @@ class ForRange extends Node {
ok(this.from != null, '"from" is required');
}
generateCode(generator) {
generateCode(codegen) {
var varName = this.varName;
var from = this.from;
var to = this.to;
var step = this.step;
var builder = generator.builder;
var builder = codegen.builder;
var comparison = '<=';

20
compiler/ast/ForStatement.js
View File

@ -11,35 +11,35 @@ class ForStatement extends Node {
this.body = this.makeContainer(def.body);
}
generateCode(generator) {
generateCode(codegen) {
var init = this.init;
var test = this.test;
var update = this.update;
var body = this.body;
generator.write('for (');
codegen.write('for (');
if (init) {
generator.generateCode(init);
codegen.generateCode(init);
}
generator.write('; ');
codegen.write('; ');
if (test) {
generator.generateCode(test);
codegen.generateCode(test);
}
generator.write('; ');
codegen.write('; ');
if (update) {
generator.generateCode(update);
codegen.generateCode(update);
}
generator.write(') ');
codegen.write(') ');
generator.generateBlock(body);
codegen.generateBlock(body);
generator.write('\n');
codegen.write('\n');
}
}

12
compiler/ast/FunctionCall.js
View File

@ -13,29 +13,29 @@ class FunctionCall extends Node {
}
}
generateCode(generator) {
generateCode(codegen) {
var callee = this.callee;
var args = this.args;
generator.generateCode(callee);
codegen.generateCode(callee);
generator.write('(');
codegen.write('(');
if (args && args.length) {
for (let i=0, argsLen = args.length; i<argsLen; i++) {
if (i !== 0) {
generator.write(', ');
codegen.write(', ');
}
let arg = args[i];
if (!arg) {
throw new Error('Arg ' + i + ' is not valid for function call: ' + JSON.stringify(this.toJSON()));
}
generator.generateCode(arg);
codegen.generateCode(arg);
}
}
generator.write(')');
codegen.write(')');
}
}

22
compiler/ast/FunctionDeclaration.js
View File

@ -11,7 +11,7 @@ class FunctionDeclaration extends Node {
this.body = this.makeContainer(def.body);
}
generateCode(generator) {
generateCode(codegen) {
var name = this.name;
var params = this.params;
var body = this.body;
@ -21,34 +21,34 @@ class FunctionDeclaration extends Node {
ok(typeof name === 'string', 'Function name should be a string');
}
generator.write('function' + (name ? ' ' + name : '') + '(');
codegen.write('function' + (name ? ' ' + name : '') + '(');
if (params && params.length) {
for (let i=0, paramsLen = params.length; i<paramsLen; i++) {
if (i !== 0) {
generator.write(', ');
codegen.write(', ');
}
var param = params[i];
if (typeof param === 'string') {
generator.write(param);
codegen.write(param);
} else {
if (param.type !== 'Identifier') {
throw new Error('Illegal param: ' + param);
}
generator.generateCode(param);
codegen.generateCode(param);
}
}
}
generator.write(') ');
var oldInFunction = generator.inFunction;
generator.inFunction = true;
generator.generateBlock(body);
generator.inFunction = oldInFunction;
codegen.write(') ');
var oldInFunction = codegen.inFunction;
codegen.inFunction = true;
codegen.generateBlock(body);
codegen.inFunction = oldInFunction;
if (statement) {
generator.write('\n');
codegen.write('\n');
}
}

4
compiler/ast/Html.js
View File

@ -12,9 +12,9 @@ class Html extends Node {
return this.argument instanceof Node && this.argument.type === 'Literal';
}
generateHtmlCode(generator) {
generateHtmlCode(codegen) {
let argument = this.argument;
generator.addWrite(argument);
codegen.addWrite(argument);
}
}

10
compiler/ast/HtmlComment.js
View File

@ -8,13 +8,13 @@ class HtmlComment extends Node {
this.comment = def.comment;
}
generateHtmlCode(generator) {
generateHtmlCode(codegen) {
var comment = this.comment;
var literal = generator.builder.literal;
var literal = codegen.builder.literal;
generator.addWrite(literal('<--'));
generator.addWrite(comment);
generator.addWrite(literal('-->'));
codegen.addWrite(literal('<--'));
codegen.addWrite(comment);
codegen.addWrite(literal('-->'));
}
}

54
compiler/ast/HtmlElement.js
View File

@ -36,12 +36,12 @@ class HtmlElement extends Node {
this._dynamicAttributesExpressionArray = undefined;
}
generateHtmlCode(generator) {
generateHtmlCode(codegen) {
var tagName = this.tagName;
// Convert the tag name into a Node so that we generate the code correctly
if (tagName) {
tagName = generator.builder.literal(tagName);
tagName = codegen.builder.literal(tagName);
} else {
tagName = this.dynamicTagName;
}
@ -50,12 +50,12 @@ class HtmlElement extends Node {
var startTagOnly = this.startTagOnly;
var allowSelfClosing = this.allowSelfClosing;
var hasBody = body && body.length;
var builder = generator.builder;
var builder = codegen.builder;
// Starting tag
generator.addWriteLiteral('<');
codegen.addWriteLiteral('<');
generator.addWrite(tagName);
codegen.addWrite(tagName);
var attributes = this._attributes && this._attributes.all;
@ -69,51 +69,51 @@ class HtmlElement extends Node {
var literalValue = attrValue.value;
if (typeof literalValue === 'boolean') {
if (literalValue === true) {
generator.addWriteLiteral(' ' + attrName);
codegen.addWriteLiteral(' ' + attrName);
}
} else if (literalValue != null) {
generator.addWriteLiteral(' ' + attrName + '="' + escapeXmlAttr(literalValue) + '"');
codegen.addWriteLiteral(' ' + attrName + '="' + escapeXmlAttr(literalValue) + '"');
}
} else if (attrValue) {
generator.addWriteLiteral(' ' + attrName + '="');
generator.isInAttribute = true;
codegen.addWriteLiteral(' ' + attrName + '="');
codegen.isInAttribute = true;
// TODO Deal with escaping dynamic HTML attribute expression
generator.addWrite(attrValue);
generator.isInAttribute = false;
generator.addWriteLiteral('"');
codegen.addWrite(attrValue);
codegen.isInAttribute = false;
codegen.addWriteLiteral('"');
} else if (attr.argument) {
generator.addWriteLiteral(' ' + attrName + '(');
generator.addWriteLiteral(attr.argument);
generator.addWriteLiteral(')');
codegen.addWriteLiteral(' ' + attrName + '(');
codegen.addWriteLiteral(attr.argument);
codegen.addWriteLiteral(')');
}
}
}
if (this._dynamicAttributesExpressionArray) {
this._dynamicAttributesExpressionArray.forEach(function(attrsExpression) {
generator.addStaticVar('attrs', '__helpers.as');
codegen.addStaticVar('attrs', '__helpers.as');
let attrsFunctionCall = builder.functionCall('attrs', [attrsExpression]);
generator.addWrite(attrsFunctionCall);
codegen.addWrite(attrsFunctionCall);
});
}
// Body
if (hasBody) {
generator.addWriteLiteral('>');
generator.generateStatements(body);
generator.addWriteLiteral('</');
generator.addWrite(tagName);
generator.addWriteLiteral('>');
codegen.addWriteLiteral('>');
codegen.generateStatements(body);
codegen.addWriteLiteral('</');
codegen.addWrite(tagName);
codegen.addWriteLiteral('>');
} else {
if (startTagOnly) {
generator.addWriteLiteral('>');
codegen.addWriteLiteral('>');
} else if (allowSelfClosing) {
generator.addWriteLiteral('/>');
codegen.addWriteLiteral('/>');
} else {
generator.addWriteLiteral('></');
generator.addWrite(tagName);
generator.addWriteLiteral('>');
codegen.addWriteLiteral('></');
codegen.addWrite(tagName);
codegen.addWriteLiteral('>');
}
}
}

4
compiler/ast/Identifier.js
View File

@ -8,9 +8,9 @@ class Identifier extends Node {
this.name = def.name;
}
generateCode(generator) {
generateCode(codegen) {
var name = this.name;
generator.write(name);
codegen.write(name);
}
}

16
compiler/ast/If.js
View File

@ -17,7 +17,7 @@ class If extends Node {
this.else = def.else;
}
generateCode(generator) {
generateCode(codegen) {
if (this.else) {
this.else.matched = true;
@ -62,15 +62,15 @@ class If extends Node {
var test = this.test;
var body = this.body;
generator.write('if (');
generator.generateCode(test);
generator.write(') ');
generator.generateBlock(body);
codegen.write('if (');
codegen.generateCode(test);
codegen.write(') ');
codegen.generateBlock(body);
if (this.else) {
generator.write(' ');
generator.generateCode(this.else);
codegen.write(' ');
codegen.generateCode(this.else);
} else {
generator.write('\n');
codegen.write('\n');
}
}

4
compiler/ast/Literal.js
View File

@ -8,9 +8,9 @@ class Literal extends Node {
this.value = def.value;
}
generateCode(generator) {
generateCode(codegen) {
var value = this.value;
generator.writeLiteral(value);
codegen.writeLiteral(value);
}
}

14
compiler/ast/MemberExpression.js
View File

@ -10,20 +10,20 @@ class MemberExpression extends Node {
this.computed = def.computed;
}
generateCode(generator) {
generateCode(codegen) {
var object = this.object;
var property = this.property;
var computed = this.computed;
generator.generateCode(object);
codegen.generateCode(object);
if (computed) {
generator.write('[');
generator.generateCode(property);
generator.write(']');
codegen.write('[');
codegen.generateCode(property);
codegen.write(']');
} else {
generator.write('.');
generator.generateCode(property);
codegen.write('.');
codegen.generateCode(property);
}
}

10
compiler/ast/Program.js
View File

@ -7,12 +7,12 @@ class Program extends Node {
this.body = def.body;
}
generateCode(generator) {
generateCode(codegen) {
var body = this.body;
generator.generateStatements(body);
if (generator._bufferedWrites) {
generator._write('\n');
generator._flushBufferedWrites();
codegen.generateStatements(body);
if (codegen._bufferedWrites) {
codegen._write('\n');
codegen._flushBufferedWrites();
}
}
}

8
compiler/ast/Return.js
View File

@ -8,17 +8,17 @@ class Return extends Node {
this.argument = def.argument;
}
generateCode(generator) {
if (!generator.inFunction) {
generateCode(codegen) {
if (!codegen.inFunction) {
throw new Error('"return" not allowed outside a function body');
}
var argument = this.argument;
generator.write('return ');
codegen.write('return ');
if (argument) {
generator.generateCode(argument);
codegen.generateCode(argument);
}
}
}

12
compiler/ast/SelfInvokingFunction.js
View File

@ -10,17 +10,17 @@ class SelfInvokingFunction extends Node {
this.body = this.makeContainer(def.body);
}
generateCode(generator) {
generateCode(codegen) {
var params = this.params || [];
var args = this.args || [];
var body = this.body;
generator.write('(');
var functionDeclaration = generator.builder.functionDeclaration(null, params, body);
var functionCall = generator.builder.functionCall(functionDeclaration, args);
generator.generateCode(functionCall);
codegen.write('(');
var functionDeclaration = codegen.builder.functionDeclaration(null, params, body);
var functionCall = codegen.builder.functionCall(functionDeclaration, args);
codegen.generateCode(functionCall);
generator.write(')');
codegen.write(')');
}
}

12
compiler/ast/Slot.js
View File

@ -6,24 +6,24 @@ class Slot extends Node {
constructor(def) {
super('Slot');
this.onDone = def.onDone;
this.generatorSlot = null;
this.codegenSlot = null;
}
generateCode(generator) {
generateCode(codegen) {
if (this.onDone) {
generator.onDone((generator) => {
this.onDone(this, generator);
codegen.onDone((codegen) => {
this.onDone(this, codegen);
});
}
// At the time the code for this node is to be generated we instead
// create a slot. A slot is just a marker in the output code stream
// that we can later inject code into. The injection happens after
// the entire tree has been walked.
this.generatorSlot = generator.beginSlot(this);
this.codegenSlot = codegen.beginSlot(this);
}
setContent(content) {
this.generatorSlot.setContent(content);
this.codegenSlot.setContent(content);
}
toJSON() {

16
compiler/ast/TemplateRoot.js
View File

@ -17,14 +17,14 @@ class TemplateRoot extends Node {
this.body = this.makeContainer(def.body);
}
generateCode(generator) {
generateCode(codegen) {
var body = this.body;
generator.addStaticVar('str', '__helpers.s');
generator.addStaticVar('empty', '__helpers.e');
generator.addStaticVar('notEmpty', '__helpers.ne');
generator.addStaticVar('escapeXml', '__helpers.x');
codegen.addStaticVar('str', '__helpers.s');
codegen.addStaticVar('empty', '__helpers.e');
codegen.addStaticVar('notEmpty', '__helpers.ne');
codegen.addStaticVar('escapeXml', '__helpers.x');
var builder = generator.builder;
var builder = codegen.builder;
var program = builder.program;
var functionDeclaration = builder.functionDeclaration;
var vars = builder.vars;
@ -43,9 +43,9 @@ class TemplateRoot extends Node {
'(module.exports = require("marko").c(__filename)).c(create)'
]);
generator.generateCode(outputNode);
codegen.generateCode(outputNode);
var staticVars = generator.getStaticVars();
var staticVars = codegen.getStaticVars();
staticsSlot.setContent([
vars(createVarsArray(staticVars))

8
compiler/ast/Text.js
View File

@ -38,7 +38,7 @@ class Text extends Node {
return this.argument instanceof Node && this.argument.type === 'Literal';
}
generateHtmlCode(generator) {
generateHtmlCode(codegen) {
this.normalizeText();
var argument = this.argument;
@ -48,7 +48,7 @@ class Text extends Node {
return;
}
} else {
let builder = generator.builder;
let builder = codegen.builder;
// TODO Only escape if necessary
argument = builder.functionCall(
@ -56,10 +56,10 @@ class Text extends Node {
[argument]);
}
generator.addWrite(argument);
codegen.addWrite(argument);
}
normalizeText(generator) {
normalizeText(codegen) {
if (this.normalized) {
return;
}

14
compiler/ast/UnaryExpression.js
View File

@ -11,33 +11,33 @@ class UnaryExpression extends Node {
this.prefix = def.prefix === true;
}
generateCode(generator) {
generateCode(codegen) {
var argument = this.argument;
var operator = this.operator;
var prefix = this.prefix;
if (prefix) {
generator.write(operator);
codegen.write(operator);
if (operator === 'typeof') {
generator.write(' ');
codegen.write(' ');
}
}
var wrap = isCompoundExpression(argument);
if (wrap) {
generator.write('(');
codegen.write('(');
}
generator.generateCode(argument);
codegen.generateCode(argument);
if (wrap) {
generator.write(')');
codegen.write(')');
}
if (!prefix) {
generator.write(operator);
codegen.write(operator);
}
}

12
compiler/ast/UpdateExpression.js
View File

@ -11,29 +11,29 @@ class UpdateExpression extends Node {
this.prefix = def.prefix === true;
}
generateCode(generator) {
generateCode(codegen) {
var argument = this.argument;
var operator = this.operator;
var prefix = this.prefix;
if (prefix) {
generator.generateCode(operator);
codegen.generateCode(operator);
}
var wrap = isCompoundExpression(argument);
if (wrap) {
generator.write('(');
codegen.write('(');
}
generator.generateCode(argument);
codegen.generateCode(argument);
if (wrap) {
generator.write(')');
codegen.write(')');
}
if (!prefix) {
generator.generateCode(operator);
codegen.generateCode(operator);
}
}

24
compiler/ast/Vars.js
View File

@ -11,7 +11,7 @@ class Vars extends Node {
this.body = this.makeContainer(def.body);
}
generateCode(generator) {
generateCode(codegen) {
var declarations = this.declarations;
var kind = this.kind;
var isStatement = this.statement;
@ -21,7 +21,7 @@ class Vars extends Node {
if(!selfInvoking && hasBody) {
this.setFlag('selfInvoking');
return generator.builder.selfInvokingFunction([ this ]);
return codegen.builder.selfInvokingFunction([ this ]);
}
if (!declarations || !declarations.length) {
@ -32,10 +32,10 @@ class Vars extends Node {
var declaration = declarations[i];
if (i === 0) {
generator.write(kind + ' ');
codegen.write(kind + ' ');
} else {
generator.incIndent(4);
generator.writeLineIndent();
codegen.incIndent(4);
codegen.writeLineIndent();
}
var varId = declaration.id || declaration.name;
@ -45,7 +45,7 @@ class Vars extends Node {
}
// TODO Validate the variable name
generator.generateCode(varId);
codegen.generateCode(varId);
var initValue;
if (declaration.hasOwnProperty('init')) {
@ -55,24 +55,24 @@ class Vars extends Node {
}
if (initValue != null) {
generator.write(' = ');
generator.generateCode(initValue);
codegen.write(' = ');
codegen.generateCode(initValue);
}
if (i !== 0) {
generator.decIndent(4);
codegen.decIndent(4);
}
if (i < declarations.length - 1) {
generator.write(',\n');
codegen.write(',\n');
} else {
if (isStatement) {
generator.write(';\n');
codegen.write(';\n');
}
}
}
if(hasBody) {
generator.generateCode(body);
codegen.generateCode(body);
}
}
}

2
compiler/taglib-loader/loader-tag.js
View File

@ -165,7 +165,7 @@ TagHandlers.prototype = {
* A custom tag can be mapped to module that is is used
* to generate compile-time code for the custom tag. A
* node type is created based on the methods and methods
* exported by the code generator module.
* exported by the code codegen module.
*/
codeGenerator: function(value) {
var tag = this.tag;

8
taglibs/core/for-tag.js
View File

@ -1,18 +1,18 @@
var createLoopNode = require('./util/createLoopNode');
module.exports = function codeGenerator(elNode, generator) {
module.exports = function codeGenerator(elNode, codegen) {
var argument = elNode.argument;
if (!argument) {
generator.addError('Invalid <for> tag. Argument is missing. Example; <for(color in colors)>');
codegen.addError('Invalid <for> tag. Argument is missing. Example; <for(color in colors)>');
return elNode;
}
var builder = generator.builder;
var builder = codegen.builder;
var loopNode = createLoopNode(argument, elNode.body, builder);
if (loopNode.error) {
generator.addError(loopNode.error);
codegen.addError(loopNode.error);
return elNode;
}

12
test/codegen-test.js
View File

@ -12,7 +12,7 @@ var autotest = require('./autotest');
var CompileContext = require('../compiler/CompileContext');
var CodeGenerator = require('../compiler/CodeGenerator');
function createGenerator() {
function createCodeGenerator() {
var context = new CompileContext('dummy', 'dummy.marko', builder);
return new CodeGenerator(context);
}
@ -24,9 +24,9 @@ describe('compiler/codegen', function() {
var main = require(path.join(dir, 'index.js'));
var generateCodeFunc = main;
var ast = generateCodeFunc(builder);
var generator = createGenerator();
generator.generateCode(ast);
return generator.getCode();
var codegen = createCodeGenerator();
codegen.generateCode(ast);
return codegen.getCode();
});
it('should not allow a return outside a function', function() {
@ -37,8 +37,8 @@ describe('compiler/codegen', function() {
builder.returnStatement('foo')
]);
var generator = createGenerator();
generator.generateCode(rootNode);
var codegen = createCodeGenerator();
codegen.generateCode(rootNode);
}).to.throw('"return" not allowed outside a function body');
});
});

4
test/fixtures/codegen/autotest/node/index.js vendored
View File

@ -1,8 +1,8 @@
'use strict';
module.exports = function(builder) {
return builder.node(function(node, generator) {
var builder = generator.builder;
return builder.node(function(node, codegen) {
var builder = codegen.builder;
return builder.text(builder.literal('Hello World!'));
});
};

12
test/fixtures/codegen/autotest/slot-with-statements/index.js vendored
View File

@ -5,19 +5,19 @@ module.exports = function(builder) {
return builder.program([
builder.assignment('a', builder.literal('abc')),
builder.slot((slot, generator) => {
slot.setContent(generator.builder.vars(vars));
builder.slot((slot, codegen) => {
slot.setContent(codegen.builder.vars(vars));
}),
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'foo',
init: generator.builder.literal('abc')
init: codegen.builder.literal('abc')
});
}),
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'bar',
init: generator.builder.literal(123)
init: codegen.builder.literal(123)
});
}),
builder.assignment('b', builder.literal('def'))

8
test/fixtures/codegen/autotest/slot-with-writes-nested/index.js vendored
View File

@ -3,21 +3,21 @@
module.exports = function(builder) {
var vars = [];
var varsSlot = builder.slot((slot, generator) => {
slot.setContent(generator.builder.vars(vars));
var varsSlot = builder.slot((slot, codegen) => {
slot.setContent(codegen.builder.vars(vars));
});
return builder.program([
builder.ifStatement('true', [
builder.text(builder.literal('BEFORE - Hello World')),
varsSlot,
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'foo',
init: builder.literal('abc')
});
}),
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'bar',
init: builder.literal(123)

8
test/fixtures/codegen/autotest/slot-with-writes/index.js vendored
View File

@ -3,20 +3,20 @@
module.exports = function(builder) {
var vars = [];
var varsSlot = builder.slot((slot, generator) => {
slot.setContent(generator.builder.vars(vars));
var varsSlot = builder.slot((slot, codegen) => {
slot.setContent(codegen.builder.vars(vars));
});
return builder.program([
builder.text(builder.literal('BEFORE - Hello World')),
varsSlot,
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'foo',
init: builder.literal('abc')
});
}),
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'bar',
init: builder.literal(123)

12
test/fixtures/codegen/autotest/slot/index.js vendored
View File

@ -4,19 +4,19 @@ module.exports = function(builder) {
var vars = [];
return builder.program([
builder.slot((slot, generator) => {
slot.setContent(generator.builder.vars(vars));
builder.slot((slot, codegen) => {
slot.setContent(codegen.builder.vars(vars));
}),
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'foo',
init: generator.builder.literal('abc')
init: codegen.builder.literal('abc')
});
}),
builder.node(function(node, generator) {
builder.node(function(node, codegen) {
vars.push({
id: 'bar',
init: generator.builder.literal(123)
init: codegen.builder.literal(123)
});
})
]);

4
test/fixtures/taglib/scanned-tags/test-tag-code-generator-return-array/code-generator.js vendored
View File

@ -1,5 +1,5 @@
module.exports = function generateCode(elNode, generator) {
var builder = generator.builder;
module.exports = function generateCode(elNode, codegen) {
var builder = codegen.builder;
return [
builder.text(builder.literal('Hello ')),
builder.text(elNode.getAttributeValue('name'))

4
test/fixtures/taglib/scanned-tags/test-tag-code-generator-return-node/code-generator.js vendored
View File

@ -1,5 +1,5 @@
module.exports = function generateCode(elNode, generator) {
var builder = generator.builder;
module.exports = function generateCode(elNode, codegen) {
var builder = codegen.builder;
return builder.functionCall('out.write', [
builder.binaryExpression('"Hello "', '+', elNode.getAttributeValue('name'))
]);

4
test/fixtures/taglib/scanned-tags/test-tag-code-generator-return-self/code-generator.js vendored
View File

@ -1,5 +1,5 @@
module.exports = function generateCode(elNode, generator) {
var builder = generator.builder;
module.exports = function generateCode(elNode, codegen) {
var builder = codegen.builder;
elNode.setAttributeValue('foo', builder.literal('bar'));
return elNode;
};

4
test/fixtures/taglib/scanned-tags/test-tag-code-generator-return-tree/code-generator.js vendored
View File

@ -1,5 +1,5 @@
module.exports = function generateCode(elNode, generator) {
var builder = generator.builder;
module.exports = function generateCode(elNode, codegen) {
var builder = codegen.builder;
return builder.htmlElement(
'div',