From efbb53323e1130ba48718f2552c96143dea1b349 Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Fri, 10 May 2013 15:40:03 -0700
Subject: [PATCH] clear aliases between namespaces

---
 hphp/test/zend/{bad => good}/zend/ns_060.php         | 0
 hphp/test/zend/{bad => good}/zend/ns_060.php.expectf | 0
 hphp/util/parser/parser.cpp                          | 1 +
 3 files changed, 1 insertion(+)
 rename hphp/test/zend/{bad => good}/zend/ns_060.php (100%)
 rename hphp/test/zend/{bad => good}/zend/ns_060.php.expectf (100%)

diff --git a/hphp/test/zend/bad/zend/ns_060.php b/hphp/test/zend/good/zend/ns_060.php
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_060.php
rename to hphp/test/zend/good/zend/ns_060.php
diff --git a/hphp/test/zend/bad/zend/ns_060.php.expectf b/hphp/test/zend/good/zend/ns_060.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_060.php.expectf
rename to hphp/test/zend/good/zend/ns_060.php.expectf
diff --git a/hphp/util/parser/parser.cpp b/hphp/util/parser/parser.cpp
index de8fe32e4..252f4d67c 100644
--- a/hphp/util/parser/parser.cpp
+++ b/hphp/util/parser/parser.cpp
@@ -307,6 +307,7 @@ void ParserBase::onNamespaceStart(const std::string &ns,
   }
   m_nsState = InsideNamespace;
   m_nsFileScope = file_scope;
+  m_aliases.clear();
 
   m_namespace = ns;
 }