Merge branch 'next'

1 files changed, 14 insertions, 10 deletions

diff --git a/src/scope.cc b/src/scope.cc
index 99f6b669..64736ca3 100644
--- a/src/scope.cc
+++ b/src/scope.cc
@@ -42,15 +42,18 @@ void symbol_scope_t::define(const symbol_t::kind_t kind,
 {
   DEBUG("scope.symbols", "Defining '" << name << "' = " << def);
 
+  if (! symbols)
+    symbols = symbol_map();
+
   std::pair<symbol_map::iterator, bool> result
-    = symbols.insert(symbol_map::value_type(symbol_t(kind, name, def), def));
+    = symbols->insert(symbol_map::value_type(symbol_t(kind, name, def), def));
   if (! result.second) {
-    symbol_map::iterator i = symbols.find(symbol_t(kind, name));
-    assert(i != symbols.end());
-    symbols.erase(i);
+    symbol_map::iterator i = symbols->find(symbol_t(kind, name));
+    assert(i != symbols->end());
+    symbols->erase(i);
 
-    result = symbols.insert(symbol_map::value_type(symbol_t(kind, name, def),
-						   def));
+    result = symbols->insert(symbol_map::value_type(symbol_t(kind, name, def),
+						    def));
     if (! result.second)
       throw_(compile_error,
 	     _("Redefinition of '%1' in the same scope") << name);
@@ -60,10 +63,11 @@ void symbol_scope_t::define(const symbol_t::kind_t kind,
 expr_t::ptr_op_t symbol_scope_t::lookup(const symbol_t::kind_t kind,
 					const string& name)
 {
-  symbol_map::const_iterator i = symbols.find(symbol_t(kind, name));
-  if (i != symbols.end())
-    return (*i).second;
-
+  if (symbols) {
+    symbol_map::const_iterator i = symbols->find(symbol_t(kind, name));
+    if (i != symbols->end())
+      return (*i).second;
+  }
   return child_scope_t::lookup(kind, name);
 }