Merge pull request #1363 from mgreter/fixes/issue_1355

Make empty `@return` statement a parser error

Author: mgreter

src/ast.hpp

@@ -306,7 +306,21 @@ namespace Sass {
       SUPPORTS,
       ATROOT,
       BUBBLE,
-      KEYFRAMERULE
+      KEYFRAMERULE,
+      DECLARATION,
+      ASSIGNMENT,
+      IMPORT_STUB,
+      IMPORT,
+      COMMENT,
+      WARNING,
+      RETURN,
+      EXTEND,
+      ERROR,
+      DEBUG,
+      WHILE,
+      EACH,
+      FOR,
+      IF
     };
   private:
     ADD_PROPERTY(Block*, block)
@@ -496,7 +510,7 @@ namespace Sass {
     Declaration(ParserState pstate,
                 String* prop, Expression* val, bool i = false)
     : Statement(pstate), property_(prop), value_(val), is_important_(i), is_indented_(false)
-    { }
+    { statement_type(DECLARATION); }
     ATTACH_OPERATIONS()
   };
 
@@ -514,7 +528,7 @@ namespace Sass {
                bool is_default = false,
                bool is_global = false)
     : Statement(pstate), variable_(var), value_(val), is_default_(is_default), is_global_(is_global)
-    { }
+    { statement_type(ASSIGNMENT); }
     ATTACH_OPERATIONS()
   };
 
@@ -532,7 +546,7 @@ namespace Sass {
       files_(vector<string>()),
       urls_(vector<Expression*>()),
       media_queries_(0)
-    { }
+    { statement_type(IMPORT); }
     vector<string>&      files()    { return files_; }
     vector<Expression*>& urls()     { return urls_; }
     ATTACH_OPERATIONS()
@@ -543,7 +557,7 @@ namespace Sass {
   public:
     Import_Stub(ParserState pstate, string f)
     : Statement(pstate), file_name_(f)
-    { }
+    { statement_type(IMPORT_STUB); }
     ATTACH_OPERATIONS()
   };
 
@@ -555,7 +569,7 @@ namespace Sass {
   public:
     Warning(ParserState pstate, Expression* msg)
     : Statement(pstate), message_(msg)
-    { }
+    { statement_type(WARNING); }
     ATTACH_OPERATIONS()
   };
 
@@ -567,7 +581,7 @@ namespace Sass {
   public:
     Error(ParserState pstate, Expression* msg)
     : Statement(pstate), message_(msg)
-    { }
+    { statement_type(ERROR); }
     ATTACH_OPERATIONS()
   };
 
@@ -579,7 +593,7 @@ namespace Sass {
   public:
     Debug(ParserState pstate, Expression* val)
     : Statement(pstate), value_(val)
-    { }
+    { statement_type(DEBUG); }
     ATTACH_OPERATIONS()
   };
 
@@ -592,7 +606,7 @@ namespace Sass {
   public:
     Comment(ParserState pstate, String* txt, bool is_important)
     : Statement(pstate), text_(txt), is_important_(is_important)
-    { }
+    { statement_type(COMMENT); }
     ATTACH_OPERATIONS()
   };
 
@@ -605,7 +619,7 @@ namespace Sass {
   public:
     If(ParserState pstate, Expression* pred, Block* con, Block* alt = 0)
     : Has_Block(pstate, con), predicate_(pred), alternative_(alt)
-    { }
+    { statement_type(IF); }
     ATTACH_OPERATIONS()
   };
 
@@ -622,7 +636,7 @@ namespace Sass {
         string var, Expression* lo, Expression* hi, Block* b, bool inc)
     : Has_Block(pstate, b),
       variable_(var), lower_bound_(lo), upper_bound_(hi), is_inclusive_(inc)
-    { }
+    { statement_type(FOR); }
     ATTACH_OPERATIONS()
   };
 
@@ -635,7 +649,7 @@ namespace Sass {
   public:
     Each(ParserState pstate, vector<string> vars, Expression* lst, Block* b)
     : Has_Block(pstate, b), variables_(vars), list_(lst)
-    { }
+    { statement_type(EACH); }
     ATTACH_OPERATIONS()
   };
 
@@ -647,7 +661,7 @@ namespace Sass {
   public:
     While(ParserState pstate, Expression* pred, Block* b)
     : Has_Block(pstate, b), predicate_(pred)
-    { }
+    { statement_type(WHILE); }
     ATTACH_OPERATIONS()
   };
 
@@ -659,7 +673,7 @@ namespace Sass {
   public:
     Return(ParserState pstate, Expression* val)
     : Statement(pstate), value_(val)
-    { }
+    { statement_type(RETURN); }
     ATTACH_OPERATIONS()
   };
 
@@ -671,7 +685,7 @@ namespace Sass {
   public:
     Extension(ParserState pstate, Selector* s)
     : Statement(pstate), selector_(s)
-    { }
+    { statement_type(EXTEND); }
     ATTACH_OPERATIONS()
   };
 

src/parser.cpp

@@ -2128,6 +2128,9 @@ namespace Sass {
 
   Return* Parser::parse_return_directive()
   {
+    // check that we do not have an empty list (ToDo: check if we got all cases)
+    if (peek_css < alternatives < exactly < ';' >, exactly < '}' >, end_of_file > >())
+    { css_error("Invalid CSS", " after ", ": expected expression (e.g. 1px, bold), was "); }
     return new (ctx.mem) Return(pstate, parse_list());
   }