[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler Compiler.cpp, 1.9, 1.10 Compiler.h, 1.9, 1.10

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

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

Modified Files:
	Compiler.cpp Compiler.h 
Log Message:
Try to associate CEL logics and XML descriptions.

Index: Compiler.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Compiler.h	4 Apr 2007 18:26:39 -0000	1.9
--- Compiler.h	9 Apr 2007 10:07:12 -0000	1.10
***************
*** 20,30 ****
--- 20,33 ----
     #include <Plan/Plan.h>
     #include <Compiler/Compiler-Option-Description.h>
+    #include <CEL/CEL-Atom.h>
   %}
   #define CBM_PLAN CBM::Plan
   #define CBM_COD  CBM::CompilerOptionDescriptions
+  #define CBM_CEL  CBM::CelAtom
  
  #else
  # define CBM_PLAN class Plan
  # define CBM_COD  class CompilerOptionDescriptions
+ # define CBM_CEL  class CelAtom
  #endif
  
***************
*** 143,146 ****
--- 146,151 ----
      virtual CBM_COD *OptionDescriptions(void);
  
+     virtual CBM_CEL *OptionLogics(void);
+ 
      virtual int supportedVersionNumber(void);
      virtual std::string supportedVersion(int _index);

Index: Compiler.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Compiler.cpp	5 Apr 2007 17:09:58 -0000	1.9
--- Compiler.cpp	9 Apr 2007 10:07:12 -0000	1.10
***************
*** 15,18 ****
--- 15,19 ----
  #include <CEL/CEL-Include.h>
  #include <CEL/CEL-Version.h>
+ #include <CEL/CEL-Reader.h>
  
  #include <System/System.h>
***************
*** 162,165 ****
--- 163,187 ----
  }
  
+ #include <iostream>
+ CBM::CelAtom *Compiler::OptionLogics(void)
+ {
+   std::string    tmp = compiler();
+   CBM::CelReader *R;
+   CBM::CelAtom   *A;
+ 
+   tmp+="/";
+   tmp+=relativeDescriptionDirectory();
+   tmp+="/options.xml";
+ 
+   R=new CBM::CelReader(tmp);
+   std::cerr << "CEL : " << tmp << std::endl;
+   A=R->parse();
+   delete(R);
+   if (A)
+     A->Evaluate();
+ 
+   return(A);
+ }
+ 
  void Compiler::supportedVersions(void)
  {