(file) Return to CMPI_Wql2Dnf.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / CMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Wql2Dnf.cpp between version 1.14 and 1.15

version 1.14, 2006/01/30 16:18:05 version 1.15, 2006/06/19 20:47:39
Line 61 
Line 61 
 # include <Pegasus/Common/ArrayImpl.h> # include <Pegasus/Common/ArrayImpl.h>
 #undef PEGASUS_ARRAY_T #undef PEGASUS_ARRAY_T
  
 #define PEGASUS_ARRAY_T eval_el  
 # include <Pegasus/Common/ArrayImpl.h>  
 #undef PEGASUS_ARRAY_T  
   
 #define PEGASUS_ARRAY_T stack_el  
 # include <Pegasus/Common/ArrayImpl.h>  
 #undef PEGASUS_ARRAY_T  
   
 #define PEGASUS_ARRAY_T TableauRow_WQL #define PEGASUS_ARRAY_T TableauRow_WQL
 # include <Pegasus/Common/ArrayImpl.h> # include <Pegasus/Common/ArrayImpl.h>
 #undef PEGASUS_ARRAY_T #undef PEGASUS_ARRAY_T
Line 180 
Line 172 
 } }
  
 // //
 // Evaluation heap element methods  
 //  
 stack_el eval_el::getFirst()  
 {  
    return stack_el(opn1, is_terminal1);  
 }  
   
 stack_el eval_el::getSecond()  
 {  
    return stack_el(opn2, is_terminal2);  
 }  
   
 void eval_el::setFirst(const stack_el s)  
 {  
      opn1 = s.opn;  
      is_terminal1 = s.is_terminal;  
 }  
   
 void eval_el::setSecond(const stack_el s)  
 {  
     opn2 = s.opn;  
     is_terminal2 = s.is_terminal;  
 }  
   
 void eval_el::assign_unary_to_first(const eval_el & assignee)  
 {  
     opn1 = assignee.opn1;  
     is_terminal1 = assignee.is_terminal1;  
 }  
   
 void eval_el::assign_unary_to_second(const eval_el & assignee)  
 {  
     opn2 = assignee.opn1;  
     is_terminal2 = assignee.is_terminal1;  
 }  
   
 // Ordering operators, so that op1 > op2 for all non-terminals  
 // and terminals appear in the second operand first  
 void eval_el::order(void)  
 {  
     int k;  
     if ((!is_terminal1) && (!is_terminal2))  
         if ((k = opn2) > opn1)  
         {  
             opn2 = opn1;  
             opn1 =  k;  
         }  
     else if ((is_terminal1) && (!is_terminal2))  
         if ((k = opn2) > opn1)  
         {  
             opn2 = opn1;  
             opn1 =  k;  
             is_terminal1 = false;  
             is_terminal2 = true;  
         }  
 }  
   
 //  
 // Helper function copied from WQLSelectStatement // Helper function copied from WQLSelectStatement
 // //
  


Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2