Merge branch 'nesting-bug'

Author: SimonSapin

src/parser.rs

@@ -378,6 +378,9 @@ impl<'i, 't> Parser<'i, 't> {
                 stop_before: closing_delimiter,
             };
             result = nested_parser.parse_entirely(parse);
+            if let Some(block_type) = nested_parser.at_start_of {
+                consume_until_end_of_block(block_type, &mut *nested_parser.tokenizer);
+            }
         }
         consume_until_end_of_block(block_type, &mut *self.tokenizer);
         result

src/tests.rs

@@ -271,6 +271,17 @@ fn expect_no_error_token() {
 }
 
 
+/// https://github.com/servo/rust-cssparser/issues/71
+#[test]
+fn outer_block_end_consumed() {
+    let mut input = Parser::new("(calc(true))");
+    assert!(input.expect_parenthesis_block().is_ok());
+    assert!(input.parse_nested_block(|input| input.expect_function_matching("calc")).is_ok());
+    println!("{:?}", input.position());
+    assert_eq!(input.next(), Err(()));
+}
+
+
 fn run_color_tests<F: Fn(Result<Color, ()>) -> Json>(json_data: &str, to_json: F) {
     run_json_tests(json_data, |input| {
         to_json(input.parse_entirely(Color::parse))