Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4976 from CodingFabian/restructure-evaluator-read

Browse Source 
Restructured EvaluatorPreprocessor_read to be more natural.
This commit is contained in:
Yury Delendik 2014-06-23 21:50:14 -05:00
commit bb7e7d33c5
1 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/evaluator.js
View File

@ -2104,21 +2104,7 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
var args = null; var args = null;
while (true) { while (true) {
var obj = this.parser.getObj(); var obj = this.parser.getObj();
if (isEOF(obj)) { if (isCmd(obj)) {
return false; // no more commands
}
if (!isCmd(obj)) {
// argument
if (obj !== null) {
if (!args) {
args = [];
}
args.push((obj instanceof Dict ? obj.getAll() : obj));
assert(args.length <= 33, 'Too many arguments');
}
continue;
}
var cmd = obj.cmd; var cmd = obj.cmd;
// Check that the command is valid // Check that the command is valid
var opSpec = OP_MAP[cmd]; var opSpec = OP_MAP[cmd];
@ -2131,7 +2117,7 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
var numArgs = opSpec.numArgs; var numArgs = opSpec.numArgs;
if (!opSpec.variableArgs) { if (!opSpec.variableArgs) {
// Some post script commands can be nested, e.g. /F2 /GS2 gs 5.711 Tf // Postscript commands can be nested, e.g. /F2 /GS2 gs 5.711 Tf
var argsLength = args !== null ? args.length : 0; var argsLength = args !== null ? args.length : 0;
if (argsLength !== numArgs) { if (argsLength !== numArgs) {
var nonProcessedArgs = this.nonProcessedArgs; var nonProcessedArgs = this.nonProcessedArgs;
@ -2168,6 +2154,19 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
operation.fn = fn; operation.fn = fn;
operation.args = args; operation.args = args;
return true; return true;
} else {
if (isEOF(obj)) {
return false; // no more commands
}
// argument
if (obj !== null) {
if (!args) {
args = [];
}
args.push((obj instanceof Dict ? obj.getAll() : obj));
assert(args.length <= 33, 'Too many arguments');
}
}
} }
}, },