[Compbench-devel] CompBenchmarks++/libcompbenchmarks/CEL CEL-Array.cpp, 1.2, 1.3 CEL-Array.h, 1.2, 1.3 CEL-Block.cpp, 1.1, 1.2 CEL-Block.h, 1.1, 1.2 CEL-Cond.cpp, 1.1, 1.2 CEL-Cond.h, 1.1, 1.2 CEL-Function.cpp, 1.1, 1.2 CEL-Function.h, 1.1, 1.2 CEL-Include.cpp, 1.1, 1.2 CEL-Include.h, 1.1, 1.2 CEL-Logic.cpp, 1.1, 1.2 CEL-Logic.h, 1.1, 1.2 CEL-Loop.cpp, 1.1, 1.2 CEL-Loop.h, 1.1, 1.2 CEL-Math.cpp, 1.1, 1.2 CEL-Math.h, 1.1, 1.2 CEL-Reader.cpp, 1.2, 1.3 CEL-Stack.cpp, 1.1, 1.2 CEL-Stack.h, 1.1, 1.2 CEL-Str.cpp, 1.1, 1.2 CEL-Str.h, 1.1, 1.2 CEL-Var.cpp, 1.2, 1.3 CEL-Var.h, 1.2, 1.3

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

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

Modified Files:
	CEL-Array.cpp CEL-Array.h CEL-Block.cpp CEL-Block.h 
	CEL-Cond.cpp CEL-Cond.h CEL-Function.cpp CEL-Function.h 
	CEL-Include.cpp CEL-Include.h CEL-Logic.cpp CEL-Logic.h 
	CEL-Loop.cpp CEL-Loop.h CEL-Math.cpp CEL-Math.h CEL-Reader.cpp 
	CEL-Stack.cpp CEL-Stack.h CEL-Str.cpp CEL-Str.h CEL-Var.cpp 
	CEL-Var.h 
Log Message:
Evaluate() renamed to evaluate();

Index: CEL-Cond.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Cond.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Cond.cpp	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Cond.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 31,35 ****
  }
  
! std::string CelCondIf::Evaluate(void)
  {
    int     n = childs.size();
--- 31,35 ----
  }
  
! std::string CelCondIf::evaluate(void)
  {
    int     n = childs.size();
***************
*** 55,59 ****
        return(NOK->Evaluate());
      else
!       return(0);
    }
  }
--- 55,59 ----
        return(NOK->Evaluate());
      else
!       return("0");
    }
  }

Index: CEL-Math.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Math.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Math.cpp	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Math.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 31,35 ****
  
  
! std::string CelMathInc::Evaluate(void)
  {
    int         i;
--- 31,35 ----
  
  
! std::string CelMathInc::evaluate(void)
  {
    int         i;
***************
*** 67,71 ****
  
  
! std::string CelMathDec::Evaluate(void)
  {
    int         i;
--- 67,71 ----
  
  
! std::string CelMathDec::evaluate(void)
  {
    int         i;

Index: CEL-Block.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Block.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Block.h	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Block.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 17,25 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelBlock();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelBlock();
    };
--- 17,25 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelBlock();
  
      virtual ~CelBlock();
    };

Index: CEL-Cond.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Cond.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Cond.h	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Cond.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 26,34 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelCondIf();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelCondIf();
    };
--- 26,33 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
    public:
      CelCondIf();
  
      virtual ~CelCondIf();
    };

Index: CEL-Var.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Var.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEL-Var.cpp	7 Mar 2007 18:00:21 -0000	1.2
--- CEL-Var.cpp	11 Mar 2007 18:47:49 -0000	1.3
***************
*** 31,35 ****
  }
  
! std::string CelVarSet::Evaluate(void)
  {
    int         n = childs.size();
--- 31,35 ----
  }
  
! std::string CelVarSet::evaluate(void)
  {
    int         n = childs.size();
***************
*** 67,71 ****
  }
  
! std::string CelVarGet::Evaluate(void)
  {
    int      n = childs.size();
--- 67,71 ----
  }
  
! std::string CelVarGet::evaluate(void)
  {
    int      n = childs.size();
***************
*** 78,81 ****
--- 78,82 ----
    
    N=childs[0];
+ 
    cv=varOwner()->VarGet(N->Evaluate());
    if (cv)
***************
*** 99,103 ****
  }
  
! std::string CelVarUndef::Evaluate(void)
  {
    int      n = childs.size();
--- 100,104 ----
  }
  
! std::string CelVarUndef::evaluate(void)
  {
    int      n = childs.size();
***************
*** 106,110 ****
    if (n!=1)
      return("0");
!   
    N=childs[0];
    return(varOwner()->VarUndef(N->Evaluate()));
--- 107,111 ----
    if (n!=1)
      return("0");
! 
    N=childs[0];
    return(varOwner()->VarUndef(N->Evaluate()));

Index: CEL-Math.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Math.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Math.h	5 Mar 2007 20:32:40 -0000	1.1
--- CEL-Math.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 26,34 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelMathInc();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelMathInc();
    };
--- 26,34 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelMathInc();
  
      virtual ~CelMathInc();
    };
***************
*** 39,47 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelMathDec();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelMathDec();
    };
--- 39,47 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelMathDec();
  
      virtual ~CelMathDec();
    };

Index: CEL-Array.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Array.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEL-Array.cpp	8 Mar 2007 17:09:17 -0000	1.2
--- CEL-Array.cpp	11 Mar 2007 18:47:48 -0000	1.3
***************
*** 31,35 ****
  }
  
! std::string CelArrayDef::Evaluate(void)
  {
    int           n = childs.size();
--- 31,35 ----
  }
  
! std::string CelArrayDef::evaluate(void)
  {
    int           n = childs.size();
***************
*** 64,68 ****
  }
  
! std::string CelArrayAdd::Evaluate(void)
  {
    int           n = childs.size();
--- 64,68 ----
  }
  
! std::string CelArrayAdd::evaluate(void)
  {
    int           n = childs.size();
***************
*** 100,104 ****
  }
  
! std::string CelArraySize::Evaluate(void)
  {
    int           n = childs.size();
--- 100,104 ----
  }
  
! std::string CelArraySize::evaluate(void)
  {
    int           n = childs.size();
***************
*** 130,134 ****
  }
  
! std::string CelArrayGet::Evaluate(void)
  {
    int         n = childs.size();
--- 130,134 ----
  }
  
! std::string CelArrayGet::evaluate(void)
  {
    int         n = childs.size();
***************
*** 165,169 ****
  }
  
! std::string CelArrayUndef::Evaluate(void)
  {
    int      n = childs.size();
--- 165,169 ----
  }
  
! std::string CelArrayUndef::evaluate(void)
  {
    int      n = childs.size();

Index: CEL-Stack.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Stack.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Stack.cpp	5 Mar 2007 20:32:40 -0000	1.1
--- CEL-Stack.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 37,41 ****
  }
  
! std::string CelStackPush::Evaluate(void)
  {
    int           n = childs.size();
--- 37,41 ----
  }
  
! std::string CelStackPush::evaluate(void)
  {
    int           n = childs.size();
***************
*** 69,73 ****
  }
  
! std::string CelStackPop::Evaluate(void)
  {
    int           n = childs.size();
--- 69,73 ----
  }
  
! std::string CelStackPop::evaluate(void)
  {
    int           n = childs.size();

Index: CEL-Array.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Array.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEL-Array.h	8 Mar 2007 17:09:17 -0000	1.2
--- CEL-Array.h	11 Mar 2007 18:47:49 -0000	1.3
***************
*** 27,35 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelArrayDef();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelArrayDef();
    };
--- 27,35 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelArrayDef();
  
      virtual ~CelArrayDef();
    };
***************
*** 38,46 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelArrayAdd();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelArrayAdd();
    };
--- 38,46 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelArrayAdd();
  
      virtual ~CelArrayAdd();
    };
***************
*** 49,57 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelArraySize();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelArraySize();
    };
--- 49,56 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
    public:
      CelArraySize();
  
      virtual ~CelArraySize();
    };
***************
*** 60,68 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelArrayGet();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelArrayGet();
    };
--- 59,67 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelArrayGet();
  
      virtual ~CelArrayGet();
    };
***************
*** 71,79 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelArrayUndef();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelArrayUndef();
    };
--- 70,78 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelArrayUndef();
  
      virtual ~CelArrayUndef();
    };

Index: CEL-Var.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Var.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEL-Var.h	7 Mar 2007 18:00:21 -0000	1.2
--- CEL-Var.h	11 Mar 2007 18:47:49 -0000	1.3
***************
*** 27,35 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelVarSet();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelVarSet();
    };
--- 27,35 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelVarSet();
  
      virtual ~CelVarSet();
    };
***************
*** 38,46 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelVarGet();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelVarGet();
    };
--- 38,46 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelVarGet();
  
      virtual ~CelVarGet();
    };
***************
*** 49,57 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelVarUndef();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelVarUndef();
    };
--- 49,56 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
    public:
      CelVarUndef();
  
      virtual ~CelVarUndef();
    };

Index: CEL-Logic.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Logic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Logic.h	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Logic.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 26,34 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLogicTrue();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLogicTrue();
    };
--- 26,34 ----
    protected:
      virtual std::string xmlEntityName(void);
+ 
+     virtual std::string evaluate(void);
    public:
      CelLogicTrue();
  
      virtual ~CelLogicTrue();
    };
***************
*** 39,47 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLogicFalse();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLogicFalse();
    };
--- 39,47 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelLogicFalse();
  
      virtual ~CelLogicFalse();
    };
***************
*** 52,60 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLogicOr();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLogicOr();
    };
--- 52,60 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelLogicOr();
  
      virtual ~CelLogicOr();
    };
***************
*** 66,74 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLogicAnd();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLogicAnd();
    };
--- 66,73 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
    public:
      CelLogicAnd();
  
      virtual ~CelLogicAnd();
    };
***************
*** 79,87 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLogicNot();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLogicNot();
    };
--- 78,85 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
    public:
      CelLogicNot();
  
      virtual ~CelLogicNot();
    };

Index: CEL-Logic.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Logic.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Logic.cpp	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Logic.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 30,34 ****
  }
  
! std::string CelLogicTrue::Evaluate(void)
  {
    return("1");
--- 30,34 ----
  }
  
! std::string CelLogicTrue::evaluate(void)
  {
    return("1");
***************
*** 50,54 ****
  
  
! std::string CelLogicFalse::Evaluate(void)
  {
    return("0");
--- 50,54 ----
  
  
! std::string CelLogicFalse::evaluate(void)
  {
    return("0");
***************
*** 71,75 ****
  
  
! std::string CelLogicOr::Evaluate(void)
  {
    int     i;
--- 71,75 ----
  
  
! std::string CelLogicOr::evaluate(void)
  {
    int     i;
***************
*** 100,104 ****
  }
  
! std::string CelLogicAnd::Evaluate(void)
  {
    int     i;
--- 100,104 ----
  }
  
! std::string CelLogicAnd::evaluate(void)
  {
    int     i;
***************
*** 129,133 ****
  }
  
! std::string CelLogicNot::Evaluate(void)
  {
    int     n = childs.size();
--- 129,133 ----
  }
  
! std::string CelLogicNot::evaluate(void)
  {
    int     n = childs.size();

Index: CEL-Block.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Block.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Block.cpp	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Block.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 21,25 ****
  }
  
! std::string CelBlock::Evaluate(void)
  {
    int           n = childs.size();
--- 21,25 ----
  }
  
! std::string CelBlock::evaluate(void)
  {
    int           n = childs.size();

Index: CEL-Loop.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Loop.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Loop.cpp	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Loop.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 21,25 ****
  }
  
! std::string CelLoop::Evaluate(void)
  {
    int     n = childs.size();
--- 21,25 ----
  }
  
! std::string CelLoop::evaluate(void)
  {
    int     n = childs.size();
***************
*** 64,68 ****
  
  
! std::string CelLoopBreak::Evaluate(void)
  {
    return("0");
--- 64,68 ----
  
  
! std::string CelLoopBreak::evaluate(void)
  {
    return("0");

Index: CEL-Function.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Function.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Function.h	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Function.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 28,36 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelFunctionDef();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelFunctionDef();
    };
--- 28,36 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelFunctionDef();
  
      virtual ~CelFunctionDef();
    };
***************
*** 39,60 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelFunctionCall();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelFunctionCall();
    };
  
   class CelFunctionReturn : public CelFunction {
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelFunctionReturn();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelFunctionReturn();
    };
  }
  
--- 39,61 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
    public:
      CelFunctionCall();
  
      virtual ~CelFunctionCall();
    };
  
+   /*
   class CelFunctionReturn : public CelFunction {
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelFunctionReturn();
  
      virtual ~CelFunctionReturn();
    };
+   */
  }
  

Index: CEL-Loop.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Loop.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Loop.h	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Loop.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 17,25 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLoop();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLoop();
    };
--- 17,25 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelLoop();
  
      virtual ~CelLoop();
    };
***************
*** 30,38 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelLoopBreak();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelLoopBreak();
    };
--- 30,38 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelLoopBreak();
  
      virtual ~CelLoopBreak();
    };

Index: CEL-Include.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Include.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Include.cpp	6 Mar 2007 19:30:01 -0000	1.1
--- CEL-Include.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 22,26 ****
  }
  
! std::string CelInclude::Evaluate(void)
  {
    int           n = childs.size();
--- 22,26 ----
  }
  
! std::string CelInclude::evaluate(void)
  {
    int           n = childs.size();

Index: CEL-Include.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Include.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Include.h	6 Mar 2007 19:30:01 -0000	1.1
--- CEL-Include.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 17,25 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelInclude();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelInclude();
    };
--- 17,25 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelInclude();
  
      virtual ~CelInclude();
    };

Index: CEL-Reader.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Reader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEL-Reader.cpp	6 Mar 2007 19:32:33 -0000	1.2
--- CEL-Reader.cpp	11 Mar 2007 18:47:49 -0000	1.3
***************
*** 140,146 ****
        current=new CBM::CelFunctionCall();
      }
!     if (N->Name()=="cel-function-return") {
        current=new CBM::CelFunctionReturn();
!     }
  
      if (N->Name()=="cel-stack-push") {
--- 140,148 ----
        current=new CBM::CelFunctionCall();
      }
!     /*
!       if (N->Name()=="cel-function-return") {
        current=new CBM::CelFunctionReturn();
!       }
!     */
  
      if (N->Name()=="cel-stack-push") {

Index: CEL-Function.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Function.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Function.cpp	5 Mar 2007 20:32:39 -0000	1.1
--- CEL-Function.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 58,62 ****
  }
  
! std::string CelFunctionDef::Evaluate(void)
  {
    int           n = childs.size();
--- 58,62 ----
  }
  
! std::string CelFunctionDef::evaluate(void)
  {
    int           n = childs.size();
***************
*** 99,103 ****
  }
  
! std::string CelFunctionCall::Evaluate(void)
  {
    int           n = childs.size();
--- 99,103 ----
  }
  
! std::string CelFunctionCall::evaluate(void)
  {
    int           n = childs.size();
***************
*** 113,116 ****
--- 113,117 ----
    N=childs[0];
    cf=celFunctionGet(N->Evaluate());
+ 
    if (cf) {
      n=cf->function->Childs().size();
***************
*** 131,134 ****
--- 132,137 ----
  }
  
+ /*
+ 
  CelFunctionReturn::CelFunctionReturn()
  {
***************
*** 141,150 ****
  
  
! std::string CelFunctionReturn::Evaluate(void)
  {
    int           n = childs.size();
  
    CelAtom       *N;
!   std::string   r = "0";
  
    if (n!=1)
--- 144,153 ----
  
  
! std::string CelFunctionReturn::evaluate(void)
  {
    int           n = childs.size();
  
    CelAtom       *N;
!   std::string   r;
  
    if (n!=1)
***************
*** 152,156 ****
    
    N=childs[0];
!   return(N->Evaluate());
  }
  
--- 155,162 ----
    
    N=childs[0];
!   r=N->Evaluate();
!   varOwner()->varDone();
!   varOwner()->arrayDone();
!   return(r);
  }
  
***************
*** 158,159 ****
--- 164,166 ----
  {
  }
+ */

Index: CEL-Stack.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Stack.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Stack.h	5 Mar 2007 20:32:40 -0000	1.1
--- CEL-Stack.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 27,35 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelStackPush();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelStackPush();
    };
--- 27,35 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelStackPush();
  
      virtual ~CelStackPush();
    };
***************
*** 38,46 ****
    protected:
      virtual std::string xmlEntityName(void);
    public:
      CelStackPop();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelStackPop();
    };
--- 38,46 ----
    protected:
      virtual std::string xmlEntityName(void);
+     virtual std::string evaluate(void);
+ 
    public:
      CelStackPop();
  
      virtual ~CelStackPop();
    };

Index: CEL-Str.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Str.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Str.cpp	5 Mar 2007 20:32:40 -0000	1.1
--- CEL-Str.cpp	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 27,31 ****
  
  
! std::string CelStr::Evaluate(void)
  {
    return(string);
--- 27,31 ----
  
  
! std::string CelStr::evaluate(void)
  {
    return(string);
***************
*** 49,53 ****
  }
  
! std::string CelStrConcat::Evaluate(void)
  { 
    std::string r = "";
--- 49,53 ----
  }
  
! std::string CelStrConcat::evaluate(void)
  { 
    std::string r = "";

Index: CEL-Str.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Str.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CEL-Str.h	5 Mar 2007 20:32:40 -0000	1.1
--- CEL-Str.h	11 Mar 2007 18:47:49 -0000	1.2
***************
*** 21,29 ****
      virtual std::string xmlValue(void);
  
    public:
      CelStr(std::string _string);
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelStr();
    };
--- 21,29 ----
      virtual std::string xmlValue(void);
  
+     virtual std::string evaluate(void);
+ 
    public:
      CelStr(std::string _string);
  
      virtual ~CelStr();
    };
***************
*** 33,41 ****
      virtual std::string xmlEntityName(void);
  
    public:
      CelStrConcat();
  
-     virtual std::string Evaluate(void);
- 
      virtual ~CelStrConcat();
    };
--- 33,41 ----
      virtual std::string xmlEntityName(void);
  
+     virtual std::string evaluate(void);
+ 
    public:
      CelStrConcat();
  
      virtual ~CelStrConcat();
    };