1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-25 17:48:07 +02:00

Remove the isEOF helper function and slightly re-factor EOF

Given how trivial the `isEOF` function is, we can simply inline the check at the various call-sites and remove the function (which ought to be ever so slightly more efficient as well).
Furthermore, this patch also changes the `EOF` primitive itself to a `Symbol` instead of an Object since that has the nice benefit of making it unclonable (thus preventing *accidentally* trying to send `EOF` from the worker-thread).
This commit is contained in:
Jonas Jenwald 2021-08-03 12:41:58 +02:00
parent 0b95d698d8
commit 766299016f
4 changed files with 16 additions and 35 deletions

View file

@ -20,7 +20,7 @@ import {
unreachable,
warn,
} from "../shared/util.js";
import { isCmd, isEOF, isName, isStream } from "./primitives.js";
import { EOF, isCmd, isName, isStream } from "./primitives.js";
import { Lexer } from "./parser.js";
import { MissingDataException } from "./core_utils.js";
import { Stream } from "./stream.js";
@ -773,7 +773,7 @@ const CMapFactory = (function CMapFactoryClosure() {
function parseBfChar(cMap, lexer) {
while (true) {
let obj = lexer.getObj();
if (isEOF(obj)) {
if (obj === EOF) {
break;
}
if (isCmd(obj, "endbfchar")) {
@ -792,7 +792,7 @@ const CMapFactory = (function CMapFactoryClosure() {
function parseBfRange(cMap, lexer) {
while (true) {
let obj = lexer.getObj();
if (isEOF(obj)) {
if (obj === EOF) {
break;
}
if (isCmd(obj, "endbfrange")) {
@ -810,7 +810,7 @@ const CMapFactory = (function CMapFactoryClosure() {
} else if (isCmd(obj, "[")) {
obj = lexer.getObj();
const array = [];
while (!isCmd(obj, "]") && !isEOF(obj)) {
while (!isCmd(obj, "]") && obj !== EOF) {
array.push(obj);
obj = lexer.getObj();
}
@ -825,7 +825,7 @@ const CMapFactory = (function CMapFactoryClosure() {
function parseCidChar(cMap, lexer) {
while (true) {
let obj = lexer.getObj();
if (isEOF(obj)) {
if (obj === EOF) {
break;
}
if (isCmd(obj, "endcidchar")) {
@ -843,7 +843,7 @@ const CMapFactory = (function CMapFactoryClosure() {
function parseCidRange(cMap, lexer) {
while (true) {
let obj = lexer.getObj();
if (isEOF(obj)) {
if (obj === EOF) {
break;
}
if (isCmd(obj, "endcidrange")) {
@ -864,7 +864,7 @@ const CMapFactory = (function CMapFactoryClosure() {
function parseCodespaceRange(cMap, lexer) {
while (true) {
let obj = lexer.getObj();
if (isEOF(obj)) {
if (obj === EOF) {
break;
}
if (isCmd(obj, "endcodespacerange")) {
@ -903,7 +903,7 @@ const CMapFactory = (function CMapFactoryClosure() {
objLoop: while (true) {
try {
const obj = lexer.getObj();
if (isEOF(obj)) {
if (obj === EOF) {
break;
} else if (isName(obj)) {
if (obj.name === "WMode") {