From 7bcf9f0c9a8db7fa6cafeb4d34e0bdc6cead751d Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 23 Jul 2015 01:15:27 +0200
Subject: [PATCH] Use nested parsers as appropritate

---
 components/style/custom_properties.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/style/custom_properties.rs b/components/style/custom_properties.rs
index d7bc5bdc1a8..7b913989c87 100644
--- a/components/style/custom_properties.rs
+++ b/components/style/custom_properties.rs
@@ -46,14 +46,18 @@ fn parse_declaration_value(input: &mut Parser, references: &mut HashSet<Atom>) -
             }
 
             Token::Function(ref name) if name == "var" => {
-                try!(parse_var_function(input, references));
+                try!(input.parse_nested_block(|input| {
+                    parse_var_function(input, references)
+                }));
             }
 
             Token::Function(_) |
             Token::ParenthesisBlock |
             Token::CurlyBracketBlock |
             Token::SquareBracketBlock => {
-                try!(parse_declaration_value_block(input, references))
+                try!(input.parse_nested_block(|input| {
+                    parse_declaration_value_block(input, references)
+                }));
             }
 
             _ => {}
@@ -77,14 +81,18 @@ fn parse_declaration_value_block(input: &mut Parser, references: &mut HashSet<At
             }
 
             Token::Function(ref name) if name == "var" => {
-                try!(parse_var_function(input, references));
+                try!(input.parse_nested_block(|input| {
+                    parse_var_function(input, references)
+                }));
             }
 
             Token::Function(_) |
             Token::ParenthesisBlock |
             Token::CurlyBracketBlock |
             Token::SquareBracketBlock => {
-                try!(parse_declaration_value_block(input, references))
+                try!(input.parse_nested_block(|input| {
+                    parse_declaration_value_block(input, references)
+                }));
             }
 
             _ => {}