Remove directives. Fixes #157

mapbox · Sep 21, 2012 · 4a9b5b5 · 4a9b5b5
1 parent 101026f
commit 4a9b5b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 41 deletions.
diff --git a/lib/carto/index.js b/lib/carto/index.js
@@ -38,7 +38,7 @@ var carto = {
         error = options.indent + error.join('\n' + options.indent) + '\033[0m\n';
 
         message = options.indent + message + stylize(ctx.message, 'red');
-        ctx.filename && (message += stylize(' in ', 'red') + ctx.filename);
+        if (ctx.filename) (message += stylize(' in ', 'red') + ctx.filename);
 
         util.error(message, error);
 
@@ -51,7 +51,7 @@ var carto = {
 };
 
 [ 'call', 'color', 'comment', 'definition', 'dimension',
-  'directive', 'element', 'expression', 'filterset', 'filter', 'field',
+  'element', 'expression', 'filterset', 'filter', 'field',
   'keyword', 'layer', 'literal', 'operation', 'quoted', 'imagefilter',
   'reference', 'rule', 'ruleset', 'selector', 'style', 'url', 'value',
   'variable', 'zoom', 'invalid', 'fontset'

diff --git a/lib/carto/tree/directive.js b/lib/carto/tree/directive.js