[Cpptool-cvs] rfta/src/pyrfta ExposeDeclarations.cpp,1.1,1.2 ExposeStatements.cpp,1.5,1.6 ExposeStatements2.cpp,1.2,1.3 ExposeVisitors.cpp,1.2,1.3

[<bl...@us...>]

Update of /cvsroot/cpptool/rfta/src/pyrfta
In directory sc8-pr-cvs1:/tmp/cvs-serv16976/src/pyrfta

Modified Files:
	ExposeDeclarations.cpp ExposeStatements.cpp 
	ExposeStatements2.cpp ExposeVisitors.cpp 
Log Message:
* fixed bug
* switch get/set to properties

Index: ExposeDeclarations.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/pyrfta/ExposeDeclarations.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExposeDeclarations.cpp	29 May 2003 09:53:49 -0000	1.1
--- ExposeDeclarations.cpp	29 May 2003 21:14:30 -0000	1.2
***************
*** 37,40 ****
--- 37,45 ----
        ;
  
+    class_<VariableName, VariableNamePtr, bases<Element>, boost::noncopyable>( "VariableName", 
+                                                               init< std::string >() )
+       .add_property( "name", &VariableName::getName )
+       ;
+ 
     class_<Parameters, ParametersPtr, bases<Element>, boost::noncopyable>( "Parameters" )
        ;

Index: ExposeStatements.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/pyrfta/ExposeStatements.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExposeStatements.cpp	28 May 2003 20:47:27 -0000	1.5
--- ExposeStatements.cpp	29 May 2003 21:14:30 -0000	1.6
***************
*** 32,37 ****
  
     class_<ConditionStatement, bases<Statement>, boost::noncopyable>( "ConditionStatement", no_init )
!       .def( "getCondition", &ConditionStatement::getCondition )
!       .def( "setCondition", &ConditionStatement::setCondition )
        .def( "getConditionChange", &ConditionStatement::getConditionChange )
        ;
--- 32,37 ----
  
     class_<ConditionStatement, bases<Statement>, boost::noncopyable>( "ConditionStatement", no_init )
!       .add_property( "condition", &ConditionStatement::getCondition, 
!                                   &ConditionStatement::setCondition )
        .def( "getConditionChange", &ConditionStatement::getConditionChange )
        ;
***************
*** 40,57 ****
                                                                         init<ExpressionPtr, StatementPtr>() )
       .def( init<ExpressionPtr, StatementPtr, StatementPtr>() )
!      .def( "getThenStatement", &IfStatement::getThenStatement )
!      .def( "setThenStatement", &IfStatement::setThenStatement )
       .def( "getThenStatementChange", &IfStatement::getThenStatementChange )
       .def( "hasElseStatement", &IfStatement::hasElseStatement )
!      .def( "getElseStatement", &IfStatement::getElseStatement )
!      .def( "setElseStatement", &IfStatement::setElseStatement )
       .def( "getElseStatementChange", &IfStatement::getElseStatementChange )
-      .def( "getThenStatement", &IfStatement::getThenStatement )
-      .def( "getThenStatement", &IfStatement::getThenStatement )
       ;
  
     class_<IterationStatement, bases<ConditionStatement>, boost::noncopyable >( "IterationStatement", no_init )
!       .def( "getIteratedStatement", &IterationStatement::getIteratedStatement )
!       .def( "setIteratedStatement", &IterationStatement::setIteratedStatement )
        .def( "getIteratedStatementChange", &IterationStatement::getIteratedStatementChange )
        ;
--- 40,55 ----
                                                                         init<ExpressionPtr, StatementPtr>() )
       .def( init<ExpressionPtr, StatementPtr, StatementPtr>() )
!      .add_property( "thenStatement", &IfStatement::getThenStatement, 
!                                      &IfStatement::setThenStatement )
       .def( "getThenStatementChange", &IfStatement::getThenStatementChange )
       .def( "hasElseStatement", &IfStatement::hasElseStatement )
!      .add_property( "elseStatement", &IfStatement::getElseStatement, 
!                                      &IfStatement::setElseStatement )
       .def( "getElseStatementChange", &IfStatement::getElseStatementChange )
       ;
  
     class_<IterationStatement, bases<ConditionStatement>, boost::noncopyable >( "IterationStatement", no_init )
!       .add_property( "iteratedStatement", &IterationStatement::getIteratedStatement, 
!                                           &IterationStatement::setIteratedStatement )
        .def( "getIteratedStatementChange", &IterationStatement::getIteratedStatementChange )
        ;

Index: ExposeStatements2.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/pyrfta/ExposeStatements2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExposeStatements2.cpp	6 Apr 2003 07:20:23 -0000	1.2
--- ExposeStatements2.cpp	29 May 2003 21:14:30 -0000	1.3
***************
*** 20,30 ****
     class_<ForStatement, ForStatementPtr, bases<IterationStatement>, boost::noncopyable >( "ForStatement", 
                                                                           init<ExpressionPtr, ExpressionPtr, ExpressionPtr, StatementPtr>() )
!       .def( "getDeclaration", &ForStatement::getDeclaration )
!       .def( "setDeclaration", &ForStatement::setDeclaration )
!       .def( "getDeclarationChange", &ForStatement::getDeclarationChange )
!       .def( "getIteration", &ForStatement::getIteration )
!       .def( "setIteration", &ForStatement::setIteration )
!       .def( "getIterationChange", &ForStatement::getIterationChange )
!       ;
  
     class_<SwitchStatement, SwitchStatementPtr, bases<ConditionStatement>, boost::noncopyable >( "SwitchStatement", 
--- 20,30 ----
     class_<ForStatement, ForStatementPtr, bases<IterationStatement>, boost::noncopyable >( "ForStatement", 
                                                                           init<ExpressionPtr, ExpressionPtr, ExpressionPtr, StatementPtr>() )
!      .add_property( "declaration", &ForStatement::getDeclaration, 
!                                    &ForStatement::setDeclaration )
!      .def( "getDeclarationChange", &ForStatement::getDeclarationChange )
!      .add_property( "iteration", &ForStatement::getIteration, 
!                                  &ForStatement::setIteration )
!      .def( "getIterationChange", &ForStatement::getIterationChange )
!      ;
  
     class_<SwitchStatement, SwitchStatementPtr, bases<ConditionStatement>, boost::noncopyable >( "SwitchStatement", 

Index: ExposeVisitors.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/pyrfta/ExposeVisitors.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExposeVisitors.cpp	6 Apr 2003 07:20:23 -0000	1.2
--- ExposeVisitors.cpp	29 May 2003 21:14:30 -0000	1.3
***************
*** 59,63 ****
     void visit( const ForStatementPtr &statement )
     {
!       call_method<void>( self, "visitForStatementStatement", object(statement) );
     }
  
--- 59,63 ----
     void visit( const ForStatementPtr &statement )
     {
!       call_method<void>( self, "visitForStatement", object(statement) );
     }