compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28310

Modified Files:
	CEL-Reader.cpp 
Log Message:
Improved <cel-str*/> handling.
Debug facilities introduced.

Index: CEL-Reader.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Reader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CEL-Reader.cpp	11 Mar 2007 18:47:49 -0000	1.3
--- CEL-Reader.cpp	13 Mar 2007 20:29:44 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  
  #include <Base/XMLReader.h>
+ #include <iostream>
  
  using namespace CBM;
***************
*** 53,57 ****
  
      if (N->Name()=="cel-str") {
!       current=new CBM::CelStr(N->Value());
      }
  
--- 54,68 ----
  
      if (N->Name()=="cel-str") {
!       if (!N->Value().empty())
! 	current=new CBM::CelStr(N->Value());
!       else
! 	current=new CBM::CelStr("");
!     }
!     if (N->Name()=="cel-str-concat") {
!       current=new CBM::CelStrConcat();
!     }
! 
!     if (N->Name()=="cel-str-sp") {
!       current=new CBM::CelStrSp();
      }
  
***************
*** 157,163 ****
--- 168,180 ----
      }
  
+     if (N->Name()=="cel-debug") {
+       current=new CBM::CelDebug();
+     }
+ 
      if (current) {
        into->add(current);
        parse(N, current);
+     } else {
+       std::cerr << N->Name() << ": unkown CEL language entity" << std::endl;
      }
    }