[master] Finished merge of trac4094 (class evaluator)

diff --cc src/lib/eval/Makefile.am
index b2c939409a629dc9e266e43e2ca93f066dca594d,3c41c6aaa279e38ee5acee2ac614da0091a708e4..a54210890e4b23fc9043aa22ae2e180a04c5ab2e
--- 1/src/lib/eval/Makefile.am
--- 2/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@@ -13,13 -13,9 +13,14 @@@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIE
  lib_LTLIBRARIES = libkea-eval.la
  libkea_eval_la_SOURCES  =
  libkea_eval_la_SOURCES += eval_log.cc eval_log.h
+ libkea_eval_la_SOURCES += evaluate.cc evaluate.h
  libkea_eval_la_SOURCES += token.cc token.h
  
 +libkea_eval_la_SOURCES += parser.cc parser.h
 +libkea_eval_la_SOURCES += lexer.cc
 +libkea_eval_la_SOURCES += location.hh position.hh stack.hh
 +libkea_eval_la_SOURCES += eval_context.cc eval_context.h eval_context_decl.h
 +
  nodist_libkea_eval_la_SOURCES = eval_messages.h eval_messages.cc
  
  libkea_eval_la_CXXFLAGS = $(AM_CXXFLAGS)

diff --cc src/lib/eval/tests/Makefile.am
index 1dc5b350d29be0dfa3689ee4fc969636e6e1727a,655aa558561fd0cb81972434920d345fefc42692..77d0ad2bf191be28d404bebff9be6c789dab0d9b
--- 1/src/lib/eval/tests/Makefile.am
--- 2/src/lib/eval/tests/Makefile.am
+++ b/src/lib/eval/tests/Makefile.am
@@@ -26,7 -26,7 +26,8 @@@ if HAVE_GTES
  
  TESTS += libeval_unittests
  
 -libeval_unittests_SOURCES  = evaluate_unittest.cc
 +libeval_unittests_SOURCES  = context_unittest.cc
++libeval_unittests_SOURCES += evaluate_unittest.cc
  libeval_unittests_SOURCES += token_unittest.cc
  libeval_unittests_SOURCES += run_unittests.cc
  libeval_unittests_CXXFLAGS = $(AM_CXXFLAGS)

diff --cc src/lib/eval/token.h
Simple merge