compbench-devel

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

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

Modified Files:
	Compiler-Option-Description.cpp Compiler-Option-Description.h 
Log Message:
<include/> supported.

Index: Compiler-Option-Description.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Description.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Compiler-Option-Description.cpp	14 Mar 2007 19:27:21 -0000	1.1
--- Compiler-Option-Description.cpp	14 Mar 2007 19:45:38 -0000	1.2
***************
*** 62,66 ****
  CompilerOptionDescriptions::CompilerOptionDescriptions(std::string _compilerId)
  {
!   std::string               fileName = _compilerId;
    XMLNode                   *root;
    XMLNode                   *N;
--- 62,70 ----
  CompilerOptionDescriptions::CompilerOptionDescriptions(std::string _compilerId)
  {
!   parse(_compilerId);
! }
! 
! void CompilerOptionDescriptions::parse(std::string _fileName)
! {
    XMLNode                   *root;
    XMLNode                   *N;
***************
*** 69,78 ****
    CompilerOptionDescription *D;
    XMLReader                 R;
  
!   fileName+="/description.xml";
! 
!   fileName=CBM::CelFullIncludeName(fileName);
!   root=R.read(fileName);
  
    if (!root)
      return;
--- 73,83 ----
    CompilerOptionDescription *D;
    XMLReader                 R;
+   XMLAttribute              *A;
  
!   _fileName+="/description.xml";
  
+   _fileName=CBM::CelFullIncludeName(_fileName);
+   root=R.read(_fileName);
+   
    if (!root)
      return;
***************
*** 87,93 ****
    for(i=0; i<n; i++) {
      N=root->getNode(i);
!     D=new CompilerOptionDescription(N);
!     options.push_back(D);
    }
  }
  
--- 92,108 ----
    for(i=0; i<n; i++) {
      N=root->getNode(i);
!     if (N->Name() == "option") {
!       D=new CompilerOptionDescription(N);
!       options.push_back(D);
!       continue;
!     }
! 
!     if (N->Name() == "include") {
!       A=N->getAttribute("description-path");
!       if (A)
! 	parse(A->Value());
!     }
    }
+ 
  }
  

Index: Compiler-Option-Description.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Description.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Compiler-Option-Description.h	14 Mar 2007 19:27:21 -0000	1.1
--- Compiler-Option-Description.h	14 Mar 2007 19:45:38 -0000	1.2
***************
*** 61,64 ****
--- 61,66 ----
  
    protected:
+     virtual void parse(std::string _fileName);
+ 
    public:
      CompilerOptionDescriptions(std::string _compilerId);