Created
April 17, 2014 23:25
-
-
Save simonwelsh/11016971 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp | |
index 8f931b4..96d5638 100644 | |
--- a/hphp/compiler/analysis/emitter.cpp | |
+++ b/hphp/compiler/analysis/emitter.cpp | |
@@ -6660,6 +6660,7 @@ void EmitterVisitor::fillFuncEmitterParams(FuncEmitter* fe, | |
ExpressionListPtr params, | |
bool builtin /*= false */) { | |
int numParam = params ? params->getCount() : 0; | |
+ std::cout << fe->name()->toCppString() << std::endl; | |
for (int i = 0; i < numParam; i++) { | |
ParameterExpressionPtr par( | |
static_pointer_cast<ParameterExpression>((*params)[i])); | |
diff --git a/hphp/compiler/type_annotation.cpp b/hphp/compiler/type_annotation.cpp | |
index f45b41d..5059129 100644 | |
--- a/hphp/compiler/type_annotation.cpp | |
+++ b/hphp/compiler/type_annotation.cpp | |
@@ -79,6 +79,9 @@ DataType TypeAnnotation::dataType(bool expectedType /*= false */) const { | |
if (!expectedType && (m_nullable || m_soft)) { | |
return KindOfUnknown; | |
} | |
+ if (m_nullable) { | |
+ std::cout << fullName() << std::endl << m_name << std::endl; | |
+ } | |
if (!strcasecmp(m_name.c_str(), "null") || | |
!strcasecmp(m_name.c_str(), "HH\\void")) { | |
return KindOfNull; | |
diff --git a/hphp/runtime/ext/mcrypt/ext_mcrypt.php b/hphp/runtime/ext/mcrypt/ext_mcrypt.php | |
index dd0f285..6d3a019 100644 | |
--- a/hphp/runtime/ext/mcrypt/ext_mcrypt.php | |
+++ b/hphp/runtime/ext/mcrypt/ext_mcrypt.php | |
@@ -30,6 +30,7 @@ function mcrypt_cbc(string $cipher, | |
* | |
* @return string - | |
*/ | |
+ | |
<<__Native>> | |
function mcrypt_cfb(string $cipher, | |
string $key, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment