From 42c88dc137752e49143627416c585436721f0226 Mon Sep 17 00:00:00 2001 From: Christian Aistleitner Date: Mon, 19 Mar 2012 23:36:48 +0000 Subject: [PATCH] Follow up to r114126: Being more conservative for HipHop compiler --- includes/parser/Preprocessor_HipHop.hphp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/parser/Preprocessor_HipHop.hphp b/includes/parser/Preprocessor_HipHop.hphp index 0cf2e8a0a7..aedcac23a5 100644 --- a/includes/parser/Preprocessor_HipHop.hphp +++ b/includes/parser/Preprocessor_HipHop.hphp @@ -444,7 +444,8 @@ class Preprocessor_HipHop implements Preprocessor { } elseif ( $found === 'line-end' ) { $piece = $stack->getTop(); // A heading must be open, otherwise \n wouldn't have been in the search list - assert( '$piece->open === "\n"' ); + assert( $piece->open === "\n" ); // Passing the assert condition directly instead of string, as + // HPHP /compiler/ chokes on strings when ASSERT_ACTIVE != 0. $part = $piece->getCurrentPart(); // Search back through the input to see if it has a proper close // Do this using the reversed string since the other solutions (end anchor, etc.) are inefficient -- 2.20.1