wellton/hhvm
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Remove transform_foreach

Ver Código-Fonte 
Iteration opcodes work with locals that are correctly suspended/resumed
thru yield, transform_foreach not needed anymore.
Esse commit está contido em:
jan
2013-03-15 11:09:08 -07:00
commit de Sara Golemon
pai 2ebb2a93a1
commit 2db40741d0
5 arquivos alterados com 1479 adições e 1844 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
hphp/compiler/parser/hphp.tab.cpp
+739 -852
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
hphp/compiler/parser/parser.cpp
-22
Ver Arquivo
@@ -118,9 +118,6 @@ extern void create_generator(Parser *_p, Token &out, Token &params,
extern void transform_yield(Parser *_p, Token &stmts, int index,
Token *expr, bool assign);
extern void transform_yield_break(Parser *_p, Token &out);
extern void transform_foreach(Parser *_p, Token &out, Token &arr, Token &name,
Token &value, Token &stmt, int count,
bool hasValue, bool byRef);
namespace HPHP {
@@ -1410,8 +1407,6 @@ void Parser::onYield(Token &out, Token *expr, bool assign) {
}
FunctionContext &funcContext = m_funcContexts.back();
std::fill(funcContext.foreachHasYield.begin(),
funcContext.foreachHasYield.end(), true);
int index = ++funcContext.numYields;
transform_yield(this, out, index, expr, assign);
}
@@ -1485,12 +1480,6 @@ void Parser::onExpStatement(Token &out, Token &expr) {
exp->onParse(m_ar, m_file);
}
void Parser::onForEachStart() {
if (!m_funcContexts.empty()) {
m_funcContexts.back().foreachHasYield.push_back(false);
}
}
void Parser::onForEach(Token &out, Token &arr, Token &name, Token &value,
Token &stmt) {
if (value->exp && name->num()) {
@@ -1499,17 +1488,6 @@ void Parser::onForEach(Token &out, Token &arr, Token &name, Token &value,
}
checkAssignThis(name);
checkAssignThis(value);
if (!m_funcContexts.empty()) {
bool hasYield = m_funcContexts.back().foreachHasYield.back();
m_funcContexts.back().foreachHasYield.pop_back();
if (hasYield) {
int cnt = ++m_funcContexts.back().numForeaches;
transform_foreach(this, out, arr, name, value, stmt, cnt, value->exp,
value->exp ? value->num() == 1 : name->num() == 1);
return;
}
}
if (stmt->stmt && stmt->stmt->is(Statement::KindOfStatementList)) {
stmt->stmt = NEW_STMT(BlockStatement,
dynamic_pointer_cast<StatementList>(stmt->stmt));
hphp/compiler/parser/parser.h
-4
Ver Arquivo
@@ -248,7 +248,6 @@ private:
: isNotGenerator(false)
, isGenerator(false)
, numYields(0)
, numForeaches(0)
{}
// mark this function as generator; returns true on success
@@ -265,14 +264,11 @@ private:
void checkFinalAssertions() {
assert(!isGenerator || !isNotGenerator);
assert(foreachHasYield.empty());
}
bool isNotGenerator; // function determined to not be a generator
bool isGenerator; // function determined to be a generator
int numYields; // number of plain yield statements seen so far
int numForeaches; // number of foreach statements seen so far
std::vector<bool> foreachHasYield; // whether open foreach has yield
};
AnalysisResultPtr m_ar;
hphp/util/parser/hphp.y
+1 -114
Ver Arquivo
@@ -373,118 +373,6 @@ void transform_yield_break(Parser *_p, Token &out) {
_p->finishStatement(out, stmts2); out = 1;
}
// convert a foreach (by ref or not) to a normal for statement with
// an iterator object.
void transform_foreach(Parser *_p, Token &out, Token &arr, Token &name,
Token &value, Token &stmt, int count,
bool hasValue, bool byRef) {
out.reset();
std::string loopvar = FOREACH_VAR_PREFIX;
loopvar += boost::lexical_cast<std::string>(count);
Token init;
{
Token cname; cname.setText(byRef ?
"hphp_get_mutable_iterator" :
"hphp_get_iterator");
Token param1; _p->onCallParam(param1, NULL, arr, 0);
Token call; _p->onCall(call, 0, cname, param1, NULL);
Token lname; lname.setText(loopvar);
Token var; _p->onSynthesizedVariable(var, lname);
Token assign; _p->onAssign(assign, var, call, false);
if (byRef) {
// hphp_get_mutable_iterator will reset the array's internal pointer.
_p->onExprListElem(init, NULL, assign);
} else {
// We have to reset the iterator's pointer ourselves.
Token rname; rname.setText("rewind");
Token empty; empty = 1;
Token rcall; _p->onObjectMethodCall(rcall, assign, rname, empty);
_p->onExprListElem(init, NULL, rcall);
}
}
Token cond;
{
Token lname; lname.setText(loopvar);
Token var; _p->onSynthesizedVariable(var, lname);
Token pn; pn.setText("valid");
Token pname; _p->onName(pname, pn, Parser::VarName);
Token empty; empty = 1;
Token valid; _p->onObjectMethodCall(valid, var, pname, empty);
_p->onExprListElem(cond, NULL, valid);
}
Token step;
{
Token lname; lname.setText(loopvar);
Token var; _p->onSynthesizedVariable(var, lname);
Token pn; pn.setText("next");
Token pname; _p->onName(pname, pn, Parser::VarName);
Token empty; empty = 1;
Token next; _p->onObjectMethodCall(next, var, pname, empty);
_p->onExprListElem(step, NULL, next);
}
{
Token stmts0; _p->onStatementListStart(stmts0);
if (hasValue) {
Token skset;
{
Token lname; lname.setText(loopvar);
Token var; _p->onSynthesizedVariable(var, lname);
Token pn; pn->setText("key");
Token pname; _p->onName(pname, pn, Parser::VarName);
Token empty; empty = 1;
Token call; _p->onObjectMethodCall(call, var, pname, empty);
Token kset; _p->onAssign(kset, name, call, false);
_p->onExpStatement(skset, kset);
}
Token stmts1; _p->addStatement(stmts1, stmts0, skset);
Token svset;
{
Token lname; lname.setText(loopvar);
Token var; _p->onSynthesizedVariable(var, lname);
Token pn; pn.setText(byRef ? "currentRef" : "current");
Token pname; _p->onName(pname, pn, Parser::VarName);
Token empty; empty = 1;
Token call; _p->onObjectMethodCall(call, var, pname, empty);
Token vset; _p->onAssign(vset, value, call, byRef);
_p->onExpStatement(svset, vset);
}
Token stmts2; _p->addStatement(stmts2, stmts1, svset);
Token stmts3; _p->addStatement(stmts3, stmts2, stmt);
stmt.reset();
_p->finishStatement(stmt, stmts3); stmt = 1;
} else {
Token svset;
{
Token lname; lname.setText(loopvar);
Token var; _p->onSynthesizedVariable(var, lname);
Token pn; pn.setText(byRef ? "currentRef" : "current");
Token pname; _p->onName(pname, pn, Parser::VarName);
Token empty; empty = 1;
Token call; _p->onObjectMethodCall(call, var, pname, empty);
Token vset; _p->onAssign(vset, name, call, byRef);
_p->onExpStatement(svset, vset);
}
Token stmts1; _p->addStatement(stmts1, stmts0, svset);
Token stmts2; _p->addStatement(stmts2, stmts1, stmt);
stmt.reset();
_p->finishStatement(stmt, stmts2); stmt = 1;
}
}
_p->onFor(out, init, cond, step, stmt);
}
///////////////////////////////////////////////////////////////////////////////
static void user_attribute_check(Parser *_p) {
@@ -1185,8 +1073,7 @@ statement:
| T_INLINE_HTML { _p->onEcho($$, $1, 1);}
| T_FOREACH '(' expr
T_AS foreach_variable
foreach_optional_arg ')' { _p->onForEachStart();
_p->pushLabelScope();}
foreach_optional_arg ')' { _p->pushLabelScope();}
foreach_statement { _p->popLabelScope();
_p->onForEach($$,$3,$5,$6,$9);}
| T_DECLARE '(' declare_list ')'
hphp/util/parser/test/hphp.tab.cpp
+739 -852
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff