Merge pull request #29 from ericmorand/issue_24

Implement issue #24

Author: Eric MORAND

package.json

@@ -23,7 +23,7 @@
     "prepublish": "npm run build",
     "test": "TS_NODE_CACHE=0 npm run fastest",
     "fastest": "tape -r ts-node/register/type-check 'test/tests/**/*.ts' | tap-mocha-reporter spec",
-    "fastest2": "tape -r ts-node/register/type-check 'test/tests/unit/node/**/*.ts' | tap-mocha-reporter spec",
+    "fastest2": "tape -r ts-node/register/type-check 'test/tests/unit/expression-parser.ts' | tap-mocha-reporter spec",
     "build": "tsc && node tasks/build.js",
     "cover": "nyc npm t",
     "coverage": "nyc report --reporter=text-lcov | coveralls"

src/expression-parser.ts

@@ -713,16 +713,17 @@ class TwingExpressionParser {
         if (function_.isDeprecated()) {
             let message = `Twing Function "${function_.getName()}" is deprecated`;
 
-            // if (!is_bool(filter.getDeprecatedVersion())) {
-            //     message .= sprintf(' since version %s', filter.getDeprecatedVersion());
-            // }
-            // if (filter.getAlternative()) {
-            //     message .= sprintf('. Use "%s" instead', filter.getAlternative());
-            // }
-            // src = this.parser.getStream().getSourceContext();
-            // message .= sprintf(' in %s at line %d.', src.getPath() ?: src.getTemplateName(), line);
-            //
-            // @trigger_error(message, E_USER_DEPRECATED);
+            if (typeof function_.getDeprecatedVersion() !== 'boolean') {
+                message += ` since version ${function_.getDeprecatedVersion()}`;
+            }
+
+            if (function_.getAlternative()) {
+                message += `. Use "${function_.getAlternative()}" instead`;
+            }
+
+            let src = this.parser.getStream().getSourceContext();
+
+            message += ` in ${src.getPath() ? '' : src.getName()} at line ${line}.`;
 
             console.warn(message);
         }
@@ -744,16 +745,17 @@ class TwingExpressionParser {
         if (filter.isDeprecated()) {
             let message = `Twig Filter "${filter.getName()}" is deprecated`;
 
-            // if (!is_bool(filter.getDeprecatedVersion())) {
-            //     message .= sprintf(' since version %s', filter.getDeprecatedVersion());
-            // }
-            // if (filter.getAlternative()) {
-            //     message .= sprintf('. Use "%s" instead', filter.getAlternative());
-            // }
-            // src = this.parser.getStream().getSourceContext();
-            // message .= sprintf(' in %s at line %d.', src.getPath() ?: src.getTemplateName(), line);
-            //
-            // @trigger_error(message, E_USER_DEPRECATED);
+            if (typeof filter.getDeprecatedVersion() !== 'boolean') {
+                message += ` since version ${filter.getDeprecatedVersion()}`;
+            }
+
+            if (filter.getAlternative()) {
+                message += `. Use "${filter.getAlternative()}" instead`;
+            }
+
+            let src = this.parser.getStream().getSourceContext();
+
+            message += ` in ${src.getPath() ? '' : src.getName()} at line ${line}.`;
 
             console.warn(message);
         }

src/node-type.ts

@@ -2,7 +2,10 @@ enum TwingNodeType {
     NONE = 'NONE',
     CAPTURE = 'CAPTURE',
     OUTPUT = 'OUTPUT',
-    PRINT = 'PRINT'
+
+    ARRAY = 'array',
+    CONSTANT = 'constant',
+    PRINT = 'print',
 }
 
 export default TwingNodeType;

src/node.ts

@@ -177,18 +177,16 @@ class TwingNode implements TwingNodeInterface {
     }
 
     setTemplateName(name: string) {
-        let self = this;
-
         this.name = name;
 
-        this.nodes.forEach(function (node) {
+        for (let [k, node] of this.nodes) {
             try {
                 node.setTemplateName(name);
             }
             catch (e) {
                 throw e;
             }
-        });
+        };
     }
 
     getTemplateName() {

src/node/expression/array.ts

@@ -2,6 +2,7 @@ import TwingNodeExpression from "../expression";
 import TwingNodeExpressionConstant from "./constant";
 import TwingMap from "../../map";
 import TwingCompiler from "../../compiler";
+import TwingNodeType from "../../node-type";
 
 let array_chunk = require('locutus/php/array/array_chunk');
 let ctype_digit = require('locutus/php/ctype/ctype_digit');
@@ -12,15 +13,17 @@ class TwingNodeExpressionArray extends TwingNodeExpression {
     constructor(elements: TwingMap<string, TwingNodeExpression>, lineno: number) {
         super(elements, new TwingMap(), lineno);
 
+        this.type = TwingNodeType.ARRAY;
+
         this.index = -1;
 
-        this.getKeyValuePairs().forEach(function (pair) {
+        for (let pair of this.getKeyValuePairs()) {
             let expression = pair.key;
 
             if ((expression instanceof TwingNodeExpressionConstant) && (ctype_digit('' + expression.getAttribute('value'))) && (expression.getAttribute('value') > this.index)) {
                 this.index = expression.getAttribute('value');
             }
-        });
+        }
     }
 
     getKeyValuePairs(): Array<{key: TwingNodeExpression, value: TwingNodeExpression}> {

src/node/expression/constant.ts

@@ -2,10 +2,13 @@ import TwingNodeExpression from "../expression";
 import TwingMap from "../../map";
 import TwingNode from "../../node";
 import TwingCompiler from "../../compiler";
+import TwingNodeType from "../../node-type";
 
 class TwingNodeExpressionConstant extends TwingNodeExpression {
     constructor(value: TwingNode | string | number | boolean, lineno: number) {
         super(new TwingMap(), new TwingMap([['value', value]]), lineno);
+
+        this.type = TwingNodeType.CONSTANT;
     }
 
     compile(compiler: TwingCompiler) {

src/token-stream.ts

@@ -63,7 +63,7 @@ class TwingTokenStream {
             let line = token.getLine();
 
             throw new TwingSyntaxError(
-                `${message ? message : ''}Unexpected token "${TwingToken.typeToEnglish(token.getType())}" of value "${token.getValue()}" ("${TwingToken.typeToEnglish(type)}" expected${value ? ` with value "${value}"` : ''}).`,
+                `${message ? message + '. ' : ''}Unexpected token "${TwingToken.typeToEnglish(token.getType())}" of value "${token.getValue()}" ("${TwingToken.typeToEnglish(type)}" expected${value ? ` with value "${value}"` : ''}).`,
                 line,
                 this.source
             );