- moved definition of ee to less surprising place

yast · Jun 25, 2012 · 1d9f467 · 1d9f467
1 parent 4ce7407
commit 1d9f467
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/liby2/src/genericfrontend.cc b/liby2/src/genericfrontend.cc
@@ -118,11 +118,6 @@ const char* ycp_error_exit_symbols[MAX_YCP_ERROR_EXIT_SYMBOLS] = {
 
 using std::string;
 
-namespace YaST
-{
-    ExecutionEnvironment ee;
-}
-
 Debugger *debugger_instance;
 
 /// fallback name of the program

diff --git a/libycp/src/ExecutionEnvironment.cc b/libycp/src/ExecutionEnvironment.cc
@@ -26,6 +26,9 @@ namespace YaST
 static const char * Y2RECURSIONLIMIT = "Y2RECURSIONLIMIT";
 
 
+    ExecutionEnvironment ee;
+
+
 ExecutionEnvironment::ExecutionEnvironment ()
     : m_filename ("")
     , m_forced_filename (false)

diff --git a/libycp/testsuite/tests/builtin/Backtrace.err b/libycp/testsuite/tests/builtin/Backtrace.err
@@ -21,8 +21,8 @@ Parsed:
 }
 ----------------------------------------------------------------------
 [YCP] tests/builtin/Backtrace.ycp:6 My test
-[libycp] ExecutionEnvironment.cc(backtrace):135 ------------- Backtrace begin -------------
+[libycp] ExecutionEnvironment.cc(backtrace):138 ------------- Backtrace begin -------------
 [YCP] tests/builtin/Backtrace.ycp:10 void aoo (integer value)
 [YCP] tests/builtin/Backtrace.ycp:14 void boo (integer value)
 [YCP] tests/builtin/Backtrace.ycp:17 void foo (integer foo_val)
-[libycp] ExecutionEnvironment.cc(backtrace):144 ------------- Backtrace end ---------------
+[libycp] ExecutionEnvironment.cc(backtrace):147 ------------- Backtrace end ---------------
diff --git a/libycp/testsuite/tests/statements/deep_recursion.err b/libycp/testsuite/tests/statements/deep_recursion.err
@@ -13,7 +13,7 @@ else
     return Multiply (10000, 42);
 }
 ----------------------------------------------------------------------
-[libycp] ExecutionEnvironment.cc(endlessRecursion):99 Recursion limit of 1001 call frames reached. Set the environment variable Y2RECURSIONLIMIT to change this
+[libycp] ExecutionEnvironment.cc(endlessRecursion):102 Recursion limit of 1001 call frames reached. Set the environment variable Y2RECURSIONLIMIT to change this
 [Interpreter] tests/statements/deep_recursion.ycp:5 Returning nil instead of calling the function.
 [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil
 [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil