Rename Error to ErrorRule

Author: mgreter

src/ast.cpp

@@ -327,10 +327,10 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  Error::Error(ParserState pstate, Expression_Obj msg)
+  ErrorRule::ErrorRule(ParserState pstate, Expression_Obj msg)
   : Statement(pstate), message_(msg)
   { statement_type(ERROR); }
-  Error::Error(const Error* ptr)
+  ErrorRule::ErrorRule(const ErrorRule* ptr)
   : Statement(ptr), message_(ptr->message_)
   { statement_type(ERROR); }
 
@@ -928,7 +928,7 @@ namespace Sass {
   IMPLEMENT_AST_OPERATORS(Media_Query);
   IMPLEMENT_AST_OPERATORS(Media_Query_Expression);
   IMPLEMENT_AST_OPERATORS(DebugRule);
-  IMPLEMENT_AST_OPERATORS(Error);
+  IMPLEMENT_AST_OPERATORS(ErrorRule);
   IMPLEMENT_AST_OPERATORS(WarningRule);
   IMPLEMENT_AST_OPERATORS(Assignment);
   IMPLEMENT_AST_OPERATORS(Return);

src/ast.hpp

@@ -668,11 +668,11 @@ namespace Sass {
   ///////////////////////////////
   // The Sass `@error` directive.
   ///////////////////////////////
-  class Error final : public Statement {
+  class ErrorRule final : public Statement {
     ADD_PROPERTY(Expression_Obj, message)
   public:
-    Error(ParserState pstate, Expression_Obj msg);
-    ATTACH_AST_OPERATIONS(Error)
+    ErrorRule(ParserState pstate, Expression_Obj msg);
+    ATTACH_AST_OPERATIONS(ErrorRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 

src/ast_fwd_decl.hpp

@@ -46,7 +46,7 @@ namespace Sass {
   class Import_Stub;
   class WarningRule;
 
-  class Error;
+  class ErrorRule;
   class DebugRule;
   class Comment;
 
@@ -146,7 +146,7 @@ namespace Sass {
   IMPL_MEM_OBJ(Import);
   IMPL_MEM_OBJ(Import_Stub);
   IMPL_MEM_OBJ(WarningRule);
-  IMPL_MEM_OBJ(Error);
+  IMPL_MEM_OBJ(ErrorRule);
   IMPL_MEM_OBJ(DebugRule);
   IMPL_MEM_OBJ(Comment);
   IMPL_MEM_OBJ(PreValue);

src/check_nesting.cpp

@@ -274,7 +274,7 @@ namespace Sass {
         // Ruby Sass doesn't distinguish variables and assignments
         Cast<Assignment>(child) ||
         Cast<WarningRule>(child) ||
-        Cast<Error>(child)
+        Cast<ErrorRule>(child)
     )) {
       error(child, traces, "Functions can only contain variable declarations and control directives.");
     }

src/debugger.hpp

@@ -585,9 +585,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " " << block->tabs() << std::endl;
     debug_ast(block->message(), ind + " : ");
-  } else if (Cast<Error>(node)) {
-    Error* block = Cast<Error>(node);
-    std::cerr << ind << "Error " << block;
+  } else if (Cast<ErrorRule>(node)) {
+    ErrorRule* block = Cast<ErrorRule>(node);
+    std::cerr << ind << "ErrorRule " << block;
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " " << block->tabs() << std::endl;
   } else if (Cast<DebugRule>(node)) {

src/eval.cpp

@@ -379,7 +379,7 @@ namespace Sass {
     return 0;
   }
 
-  Expression* Eval::operator()(Error* e)
+  Expression* Eval::operator()(ErrorRule* e)
   {
     Sass_Output_Style outstyle = options().output_style;
     options().output_style = NESTED;

src/eval.hpp

@@ -48,7 +48,7 @@ namespace Sass {
     Expression* operator()(While*);
     Expression* operator()(Return*);
     Expression* operator()(WarningRule*);
-    Expression* operator()(Error*);
+    Expression* operator()(ErrorRule*);
     Expression* operator()(DebugRule*);
 
     Expression* operator()(List*);

src/expand.cpp

@@ -466,7 +466,7 @@ namespace Sass {
     return 0;
   }
 
-  Statement* Expand::operator()(Error* e)
+  Statement* Expand::operator()(ErrorRule* e)
   {
     // eval handles this too, because errors may occur in functions
     e->perform(&eval);

src/expand.hpp

@@ -76,7 +76,7 @@ namespace Sass {
     Statement* operator()(Import*);
     Statement* operator()(Import_Stub*);
     Statement* operator()(WarningRule*);
-    Statement* operator()(Error*);
+    Statement* operator()(ErrorRule*);
     Statement* operator()(DebugRule*);
     Statement* operator()(Comment*);
     Statement* operator()(If*);

src/inspect.cpp

@@ -257,7 +257,7 @@ namespace Sass {
     append_delimiter();
   }
 
-  void Inspect::operator()(Error* error)
+  void Inspect::operator()(ErrorRule* error)
   {
     append_indentation();
     append_token("@error", error);