Merge pull request #1072 from xzyfer/fix/elseif-duex

xzyfer · xzyfer · commit c8785121cf82 · 2015-04-08T10:47:59.000+10:00
Fix incorrect semantics of @else
diff --git a/prelexer.cpp b/prelexer.cpp
@@ -262,10 +262,9 @@ namespace Sass {
       return word<else_kwd>(src);
     }
     const char* elseif_directive(const char* src) {
-      return alternatives< word<else_kwd>,
-                           sequence< exactly< else_kwd >,
-                                     optional_css_whitespace,
-                                     word< if_after_else_kwd > > >(src);
+      return sequence< exactly< else_kwd >,
+                                optional_css_whitespace,
+                                word< if_after_else_kwd > >(src);
     }
 
     const char* kwd_for_directive(const char* src) {

Original file line number	Diff line number	Diff line change
`@@ -262,10 +262,9 @@ namespace Sass {`
`262`	`262`	`return word<else_kwd>(src);`
`263`	`263`	`}`
`264`	`264`	`const char* elseif_directive(const char* src) {`
`265`		`- return alternatives< word<else_kwd>,`
`266`		`- sequence< exactly< else_kwd >,`
`267`		`- optional_css_whitespace,`
`268`		`- word< if_after_else_kwd > > >(src);`
	`265`	`+ return sequence< exactly< else_kwd >,`
	`266`	`+ optional_css_whitespace,`
	`267`	`+ word< if_after_else_kwd > >(src);`
`269`	`268`	`}`
`270`	`269`
`271`	`270`	`const char* kwd_for_directive(const char* src) {`