Fix some minor things

Summary: Fix llap/rlap again, fix lexing errors

Auditors: alpert
This commit is contained in:
Emily Eisenberg 2013-07-15 12:06:26 -07:00
parent 09311de814
commit 975234e813
3 changed files with 4 additions and 4 deletions

View File

@ -62,7 +62,7 @@ Lexer.prototype.lex = function(pos) {
}
// We didn't match any of the tokens, so throw an error.
throw "Unexpected character: '" + input[0] + "' at position " + this._pos;
throw "Unexpected character: '" + input[0] + "' at position " + pos;
};
module.exports = Lexer;

View File

@ -337,7 +337,7 @@ Parser.prototype.parseNucleus = function(pos) {
var group = this.parseGroup(nucleus.position);
if (group) {
return new ParseResult(
new ParseNode(nucleus.type.slice(1), nucleus.text),
new ParseNode(nucleus.type.slice(1), group.result),
group.position);
} else {
throw "Parse error: Expected group after '" + nucleus.text + "'";

View File

@ -129,10 +129,10 @@ var buildGroup = function(style, color, group, prev) {
return makeSpan("mord mspace " + spacingClassMap[group.value]);
}
} else if (group.type === "llap") {
var inner = makeSpan("", buildExpression(style, color, group.value));
var inner = makeSpan("", [buildGroup(style, color, group.value)]);
return makeSpan("llap " + style.cls(), [inner]);
} else if (group.type === "rlap") {
var inner = makeSpan("", buildExpression(style, color, group.value));
var inner = makeSpan("", [buildGroup(style, color, group.value)]);
return makeSpan("rlap " + style.cls(), [inner]);
} else if (group.type === "punct") {
return makeSpan("mpunct" + color, [textit(group.value)]);