removed noop functions from parser

orfon · May 1, 2021 · dc50416 · oberhamsi · May 6, 2021 · grob
1 parent 0fe25e7
commit dc50416
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/lib/filter/arrays.js b/lib/filter/arrays.js
@@ -36,7 +36,7 @@ exports.length_is = (value, arg) => {
     if (isNaN(len)) {
         return '';
     }
-    if (value instanceof Array || typeof (value) === 'string' || value instanceof String) {
+    if (Array.isArray(value) || typeof (value) === 'string' || value instanceof String) {
         return value.length === len;
     }
     return '';

diff --git a/lib/parser.js b/lib/parser.js
@@ -37,14 +37,14 @@ const Parser = exports.Parser = function(tokens, environment, origin) {
 Parser.prototype.addEnvironmentExtensions = function() {
     if (this.environment.extensions.filters) {
         let filterExt = this.environment.extensions.filters;
-        if (!(filterExt instanceof Array)) {
+        if (!Array.isArray(filterExt)) {
             filterExt = [filterExt];
         }
         filterExt.forEach(extension => this.addFilters(extension));
     }
     if (this.environment.extensions.tags) {
         let tagExt = this.environment.extensions.tags;
-        if (!(tagExt instanceof Array)) {
+        if (!Array.isArray(tagExt)) {
             tagExt = [tagExt];
         }
         tagExt.forEach(extension => this.addTags(extension));
@@ -63,14 +63,7 @@ Parser.prototype.parse = function(parseUntil) {
             if (!token.contents) {
                 this.emptyVariable(token);
             }
-            let filterExpression;
-            try {
-                filterExpression = this.compileFilter(token.contents);
-            } catch (e if e instanceof TemplateSyntaxError) {
-                this.compileFilterError(token, e);
-                throw e;
-            }
-            let node = this.createVariableNode(filterExpression);
+            let node = this.createVariableNode(this.compileFilter(token.contents));
             this.extendNodeList(nodeList, node, token);
         } else if (token.tokenType === constants.TOKEN_BLOCK) {
             let command;
@@ -83,20 +76,11 @@ Parser.prototype.parse = function(parseUntil) {
                 this.prependToken(token);
                 return nodeList;
             }
-            this.enterCommand(command, token);
             let compileFunc = this.tags[command];
             if (!compileFunc || !(typeof (compileFunc) == 'function')) {
                 this.invalidBlockTag(token, command);
             }
-            let compiledResult;
-            try {
-                compiledResult = compileFunc(this, token);
-            } catch (e if e instanceof TemplateSyntaxError) {
-                this.compileFunctionError(token, e);
-                throw e;
-            }
-            this.extendNodeList(nodeList, compiledResult, token);
-            this.exitCommand();
+            this.extendNodeList(nodeList, compileFunc(this, token), token);
         }
     }
     if (parseUntil.length > 0) {
@@ -177,8 +161,3 @@ Parser.prototype.createNodeList = function() {
 Parser.prototype.error = function(token, msg) {
     return new TemplateSyntaxError(msg);
 };
-
-Parser.prototype.enterCommand = () => {};
-Parser.prototype.exitCommand = () => {};
-Parser.prototype.compileFunctionError = () => {};
-Parser.prototype.compileFilterError = () => {};
diff --git a/lib/tag/loop.js b/lib/tag/loop.js
@@ -25,7 +25,7 @@ ForNode.prototype.render = function(context) {
     let values = this.sequence.resolve(context, true) || [];
     if (typeof (values) === 'string') {
         values = values.split('');
-    } else if (!(values instanceof Array)) {
+    } else if (!Array.isArray(values)) {
         values = [values];
     }
     // FIXME if values is object put the property values into an array