- WIP #5 Improve error reporting

soywiz-archive · Mar 3, 2013 · c0583b3 · c0583b3
1 parent 5b268b9
commit c0583b3
Show file tree

Hide file tree

Showing 7 changed files with 239 additions and 224 deletions.
diff --git a/lib/SandboxPolicy.js b/lib/SandboxPolicy.js
@@ -12,7 +12,7 @@ var SandboxPolicy = (function () {
         this.allowedFunctions = [];
         this.allowedFilters = [
             'upper', 
-            'empty'
+            'default'
         ];
     }
     return SandboxPolicy;

diff --git a/lib/SandboxPolicy.ts b/lib/SandboxPolicy.ts
@@ -1,7 +1,7 @@
 export class SandboxPolicy {
 	allowedTags: string[] = ['for', 'endfor', 'if', 'endif', 'include', 'sandbox', 'endsandbox'];
 	allowedFunctions: string[] = [];
-	allowedFilters: string[] = ['upper', 'empty'];
+	allowedFilters: string[] = ['upper', 'default'];
 
 	constructor() {
 	}

diff --git a/lib/parser/TemplateParser.js b/lib/parser/TemplateParser.js
diff --git a/lib/runtime/RuntimeContext.js b/lib/runtime/RuntimeContext.js
@@ -141,8 +141,11 @@ var RuntimeContext = (function () {
             return this.$call(this.languageContext.functions, $function, $arguments, $argumentNames);
         }
     };
-    RuntimeContext.prototype.filter = function ($function, $arguments) {
-        return this.$call(this.languageContext.filters, $function, $arguments);
+    RuntimeContext.prototype.filter = function (filterName, $arguments) {
+        if(this.languageContext.filters[filterName] === undefined) {
+            throw (new Error("Invalid filter type '" + filterName + "'"));
+        }
+        return this.$call(this.languageContext.filters, filterName, $arguments);
     };
     RuntimeContext.prototype.test = function ($function, $arguments) {
         return this.$call(this.languageContext.tests, $function, $arguments);

diff --git a/lib/runtime/RuntimeContext.ts b/lib/runtime/RuntimeContext.ts
@@ -143,8 +143,9 @@ export class RuntimeContext {
 		}
 	}
 
-	filter($function: any, $arguments: any[]) {
-		return this.$call(this.languageContext.filters, $function, $arguments);
+	filter(filterName: any, $arguments: any[]) {
+		if (this.languageContext.filters[filterName] === undefined) throw (new Error("Invalid filter type '" + filterName + "'"));
+		return this.$call(this.languageContext.filters, filterName, $arguments);
 	}
 
 	test($function: any, $arguments: any[]) {

diff --git a/test/fixtures/syntax/exceptions/unknown_filter.set b/test/fixtures/syntax/exceptions/unknown_filter.set
@@ -0,0 +1,11 @@
+=== TITLE
+find an unknown filter
+
+=== INPUT
+{ }
+
+=== TEMPLATE:main
+{{ test|my_unknown_filter }}
+
+=== EXCEPTION
+Invalid filter type 'my_unknown_filter'
diff --git a/test/fixtures/tags/sandbox/sandbox.set b/test/fixtures/tags/sandbox/sandbox.set
@@ -6,7 +6,7 @@ sandbox tag
 
 === TEMPLATE:sandboxed
 {{ __sandboxed|upper }}
-{% if not true|empty %}yes{% endif %}
+{% if not false|default(false) %}yes{% endif %}
 
 === TEMPLATE:main
 {% sandbox %}