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

Merge pull request #4829 from fkaelberer/optimize_parser_getObj

Browse Source 
small optimizations in parser.getObj(), lexer.getObj()
This commit is contained in:
Yury Delendik 2014-05-23 15:14:18 -05:00
commit f000c04b73
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/core/parser.js
View File

@ -55,55 +55,58 @@ var Parser = (function ParserClosure() {
} }
}, },
getObj: function Parser_getObj(cipherTransform) { getObj: function Parser_getObj(cipherTransform) {
if (isCmd(this.buf1, 'BI')) { // inline image var buf1 = this.buf1;
this.shift(); this.shift();
return this.makeInlineImage(cipherTransform);
} if (buf1 instanceof Cmd) {
if (isCmd(this.buf1, '[')) { // array switch (buf1.cmd) {
this.shift(); case 'BI': // inline image
var array = []; return this.makeInlineImage(cipherTransform);
while (!isCmd(this.buf1, ']') && !isEOF(this.buf1)) { case '[': // array
array.push(this.getObj(cipherTransform)); var array = [];
} while (!isCmd(this.buf1, ']') && !isEOF(this.buf1)) {
if (isEOF(this.buf1)) { array.push(this.getObj(cipherTransform));
error('End of file inside array'); }
} if (isEOF(this.buf1)) {
this.shift(); error('End of file inside array');
return array; }
}
if (isCmd(this.buf1, '<<')) { // dictionary or stream
this.shift();
var dict = new Dict(this.xref);
while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
if (!isName(this.buf1)) {
info('Malformed dictionary: key must be a name object');
this.shift(); this.shift();
continue; return array;
} case '<<': // dictionary or stream
var dict = new Dict(this.xref);
while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
if (!isName(this.buf1)) {
info('Malformed dictionary: key must be a name object');
this.shift();
continue;
}
var key = this.buf1.name; var key = this.buf1.name;
this.shift(); this.shift();
if (isEOF(this.buf1)) { if (isEOF(this.buf1)) {
break; break;
} }
dict.set(key, this.getObj(cipherTransform)); dict.set(key, this.getObj(cipherTransform));
} }
if (isEOF(this.buf1)) { if (isEOF(this.buf1)) {
error('End of file inside dictionary'); error('End of file inside dictionary');
} }
// Stream objects are not allowed inside content streams or // Stream objects are not allowed inside content streams or
// object streams. // object streams.
if (isCmd(this.buf2, 'stream')) { if (isCmd(this.buf2, 'stream')) {
return (this.allowStreams ? return (this.allowStreams ?
this.makeStream(dict, cipherTransform) : dict); this.makeStream(dict, cipherTransform) : dict);
}
this.shift();
return dict;
default: // simple object
return buf1;
} }
this.shift();
return dict;
} }
if (isInt(this.buf1)) { // indirect reference or integer
var num = this.buf1; if (isInt(buf1)) { // indirect reference or integer
this.shift(); var num = buf1;
if (isInt(this.buf1) && isCmd(this.buf2, 'R')) { if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
var ref = new Ref(num, this.buf1); var ref = new Ref(num, this.buf1);
this.shift(); this.shift();
@ -112,9 +115,9 @@ var Parser = (function ParserClosure() {
} }
return num; return num;
} }
if (isString(this.buf1)) { // string
var str = this.buf1; if (isString(buf1)) { // string
this.shift(); var str = buf1;
if (cipherTransform) { if (cipherTransform) {
str = cipherTransform.decryptString(str); str = cipherTransform.decryptString(str);
} }
@ -122,9 +125,7 @@ var Parser = (function ParserClosure() {
} }
// simple object // simple object
var obj = this.buf1; return buf1;
this.shift();
return obj;
}, },
makeInlineImage: function Parser_makeInlineImage(cipherTransform) { makeInlineImage: function Parser_makeInlineImage(cipherTransform) {
var lexer = this.lexer; var lexer = this.lexer;
@ -629,7 +630,7 @@ var Lexer = (function LexerClosure() {
var x = toHexDigit(ch); var x = toHexDigit(ch);
if (x != -1) { if (x != -1) {
var x2 = toHexDigit(this.nextChar()); var x2 = toHexDigit(this.nextChar());
if (x2 == -1) { if (x2 === -1) {
error('Illegal digit in hex char in name: ' + x2); error('Illegal digit in hex char in name: ' + x2);
} }
strBuf.push(String.fromCharCode((x << 4) | x2)); strBuf.push(String.fromCharCode((x << 4) | x2));
@ -695,7 +696,7 @@ var Lexer = (function LexerClosure() {
return EOF; return EOF;
} }
if (comment) { if (comment) {
if (ch === 0x0A || ch == 0x0D) { // LF, CR if (ch === 0x0A || ch === 0x0D) { // LF, CR
comment = false; comment = false;
} }
} else if (ch === 0x25) { // '%' } else if (ch === 0x25) { // '%'
@ -762,19 +763,19 @@ var Lexer = (function LexerClosure() {
if (knownCommandFound && !(possibleCommand in knownCommands)) { if (knownCommandFound && !(possibleCommand in knownCommands)) {
break; break;
} }
if (str.length == 128) { if (str.length === 128) {
error('Command token too long: ' + str.length); error('Command token too long: ' + str.length);
} }
str = possibleCommand; str = possibleCommand;
knownCommandFound = knownCommands && (str in knownCommands); knownCommandFound = knownCommands && (str in knownCommands);
} }
if (str == 'true') { if (str === 'true') {
return true; return true;
} }
if (str == 'false') { if (str === 'false') {
return false; return false;
} }
if (str == 'null') { if (str === 'null') {
return null; return null;
} }
return Cmd.get(str); return Cmd.get(str);