Merge pull request #8003 from Snuffleupagus/move-EOF-isEOF

Move `EOF`/`isEOF` from core/parser.js to core/primitives.js

src/core/cmap.js

@@ -36,12 +36,12 @@ var error = sharedUtil.error;
 var isInt = sharedUtil.isInt;
 var isString = sharedUtil.isString;
 var MissingDataException = sharedUtil.MissingDataException;
+var isEOF = corePrimitives.isEOF;
 var isName = corePrimitives.isName;
 var isCmd = corePrimitives.isCmd;
 var isStream = corePrimitives.isStream;
 var StringStream = coreStream.StringStream;
 var Lexer = coreParser.Lexer;
-var isEOF = coreParser.isEOF;
 
 var BUILT_IN_CMAPS = [
 // << Start unicode maps.

src/core/evaluator.js

@@ -65,6 +65,7 @@ var getLookupTableFactory = sharedUtil.getLookupTableFactory;
 var warn = sharedUtil.warn;
 var Dict = corePrimitives.Dict;
 var Name = corePrimitives.Name;
+var isEOF = corePrimitives.isEOF;
 var isCmd = corePrimitives.isCmd;
 var isDict = corePrimitives.isDict;
 var isName = corePrimitives.isName;
@@ -75,7 +76,6 @@ var JpegStream = coreStream.JpegStream;
 var Stream = coreStream.Stream;
 var Lexer = coreParser.Lexer;
 var Parser = coreParser.Parser;
-var isEOF = coreParser.isEOF;
 var PDFImage = coreImage.PDFImage;
 var ColorSpace = coreColorSpace.ColorSpace;
 var MurmurHash3_64 = coreMurmurHash3.MurmurHash3_64;

src/core/parser.js

@@ -38,10 +38,12 @@ var isInt = sharedUtil.isInt;
 var isNum = sharedUtil.isNum;
 var isString = sharedUtil.isString;
 var warn = sharedUtil.warn;
+var EOF = corePrimitives.EOF;
 var Cmd = corePrimitives.Cmd;
 var Dict = corePrimitives.Dict;
 var Name = corePrimitives.Name;
 var Ref = corePrimitives.Ref;
+var isEOF = corePrimitives.isEOF;
 var isCmd = corePrimitives.isCmd;
 var isDict = corePrimitives.isDict;
 var isName = corePrimitives.isName;
@@ -57,12 +59,6 @@ var NullStream = coreStream.NullStream;
 var PredictorStream = coreStream.PredictorStream;
 var RunLengthStream = coreStream.RunLengthStream;
 
-var EOF = {};
-
-function isEOF(v) {
-  return (v === EOF);
-}
-
 var MAX_LENGTH_TO_CACHE = 1000;
 
 var Parser = (function ParserClosure() {
@@ -1119,9 +1115,7 @@ var Linearization = {
   }
 };
 
-exports.EOF = EOF;
 exports.Lexer = Lexer;
 exports.Linearization = Linearization;
 exports.Parser = Parser;
-exports.isEOF = isEOF;
 }));

src/core/primitives.js

@@ -28,6 +28,8 @@
 
 var isArray = sharedUtil.isArray;
 
+var EOF = {};
+
 var Name = (function NameClosure() {
   function Name(name) {
     this.name = name;
@@ -268,6 +270,10 @@ var RefSetCache = (function RefSetCacheClosure() {
   return RefSetCache;
 })();
 
+function isEOF(v) {
+  return (v === EOF);
+}
+
 function isName(v, name) {
   return v instanceof Name && (name === undefined || v.name === name);
 }
@@ -293,12 +299,14 @@ function isStream(v) {
   return typeof v === 'object' && v !== null && v.getBytes !== undefined;
 }
 
+exports.EOF = EOF;
 exports.Cmd = Cmd;
 exports.Dict = Dict;
 exports.Name = Name;
 exports.Ref = Ref;
 exports.RefSet = RefSet;
 exports.RefSetCache = RefSetCache;
+exports.isEOF = isEOF;
 exports.isCmd = isCmd;
 exports.isDict = isDict;
 exports.isName = isName;

src/core/ps_parser.js

@@ -18,18 +18,18 @@
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     define('pdfjs/core/ps_parser', ['exports', 'pdfjs/shared/util',
-      'pdfjs/core/parser'], factory);
+      'pdfjs/core/primitives'], factory);
   } else if (typeof exports !== 'undefined') {
-    factory(exports, require('../shared/util.js'), require('./parser.js'));
+    factory(exports, require('../shared/util.js'), require('./primitives.js'));
   } else {
     factory((root.pdfjsCorePsParser = {}), root.pdfjsSharedUtil,
-      root.pdfjsCoreParser);
+      root.pdfjsCorePrimitives);
   }
-}(this, function (exports, sharedUtil, coreParser) {
+}(this, function (exports, sharedUtil, corePrimitives) {
 
 var error = sharedUtil.error;
 var isSpace = sharedUtil.isSpace;
-var EOF = coreParser.EOF;
+var EOF = corePrimitives.EOF;
 
 var PostScriptParser = (function PostScriptParserClosure() {
   function PostScriptParser(lexer) {