Improve parsing for complex number units

sass · Jan 18, 2016 · 945d4b0 · 945d4b0
1 parent aed868a
commit 945d4b0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/expand.cpp b/src/expand.cpp
@@ -188,7 +188,7 @@ namespace Sass {
  mq = Parser::from_c_str(mq->to_string(ctx.c_options).c_str(), ctx, mq->pstate()).parse_media_queries();
  Media_Block* mm = SASS_MEMORY_NEW(ctx.mem, Media_Block,
  m->pstate(),
- static_cast<List*>(mq),
+ static_cast<List*>(mq->perform(&eval)),
  m->block()->perform(this)->block(),
  0);
  mm->tabs(m->tabs());

diff --git a/src/prelexer.cpp b/src/prelexer.cpp
@@ -154,8 +154,7 @@ namespace Sass {
  >(src);
  }
 
- // Match CSS unit identifier.
- const char* unit_identifier(const char* src)
+ const char* one_unit(const char* src)
  {
  return sequence <
  optional < exactly <'-'> >,
@@ -170,6 +169,33 @@ namespace Sass {
  >(src);
  }
 
+ const char* multiple_units(const char* src)
+ {
+ return
+ sequence <
+ one_unit,
+ zero_plus <
+ sequence <
+ exactly <'*'>,
+ one_unit
+ >
+ >
+ >(src);
+ }
+
+ // Match CSS unit identifier.
+ const char* unit_identifier(const char* src)
+ {
+ return sequence <
+ multiple_units,
+ optional <
+ sequence <
+ exactly <'/'>,
+ multiple_units
+ > >
+ >(src);
+ }
+
  const char* identifier_alnums(const char* src)
  {
  return one_plus< identifier_alnum >(src);