[GME-commit] GMESRC/GME/ConstraintManager OCLTree.cpp,1.30,1.31
OCLTree.h,1.15,1.16 OclConstraint.cpp,1.8,1.9
OclConstraint.h,1.6,1.7 ocl.g,1.15,1.16
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Mon May 16 21:35:20 CDT 2005
Update of /project/gme-repository/GMESRC/GME/ConstraintManager
In directory escher:/tmp/cvs-serv27458
Modified Files:
OCLTree.cpp OCLTree.h OclConstraint.cpp OclConstraint.h ocl.g
Log Message:
Anantha's comments introduced for UDM.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: OCLTree.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/OCLTree.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** OCLTree.cpp 13 May 2005 22:48:03 -0000 1.30
--- OCLTree.cpp 16 May 2005 20:35:18 -0000 1.31
***************
*** 2837,2839 ****
--- 2837,2841 ----
}
+ //udmoclpat_ocltree_cpp_1 __please do not remove or change this line__
+
}; // namespace OclTree
Index: OCLTree.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/OCLTree.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** OCLTree.h 13 Oct 2004 15:17:54 -0000 1.15
--- OCLTree.h 16 May 2005 20:35:18 -0000 1.16
***************
*** 17,20 ****
--- 17,22 ----
#include "OclViolation.h"
+ //udmoclpat_ocltree_h_1 __please do not remove or change this line__
+
namespace OclTree
{
***************
*** 44,47 ****
--- 46,50 ----
class ContextNode;
class Constraint;
+ //udmoclpat_ocltree_h_2 __please do not remove or change this line__
typedef OclCommon::ContextStack< TypeSeq > TypeContextStack;
***************
*** 325,332 ****
//##############################################################################################################################################
! class LevelCounter
{
public:
! LevelCounter(int *count)
{
if (count)
--- 328,335 ----
//##############################################################################################################################################
! class LevelCounter
{
public:
! LevelCounter(int *count)
{
if (count)
***************
*** 664,670 ****
--- 667,678 ----
Constraint* CreateConstraint() const;
+ //udmoclpat_ocltree_h_3 __please do not remove or change this line__
+
friend ObjectNode;
friend CollectionNode;
};
+
+ //udmoclpat_ocltree_h_4 __please do not remove or change this line__
+
}; // namespace OclTree
Index: OclConstraint.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/OclConstraint.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OclConstraint.h 13 Oct 2004 15:17:54 -0000 1.6
--- OclConstraint.h 16 May 2005 20:35:18 -0000 1.7
***************
*** 97,101 ****
std::string GetReturnType() const;
OclCommon::FormalParameterVector GetFormalParameters() const;
! virtual std::string GetFullName() const;
State Parse();
--- 97,101 ----
std::string GetReturnType() const;
OclCommon::FormalParameterVector GetFormalParameters() const;
! virtual std::string GetFullName() const;
State Parse();
***************
*** 116,121 ****
OclTree::ViolationVector GetViolations();
void ClearViolations();
};
}; // namespace Ocl
! #endif // OCLConstraint_h
\ No newline at end of file
--- 116,122 ----
OclTree::ViolationVector GetViolations();
void ClearViolations();
+ //udmoclpat_oclconstraint_h_1 __please do not remove or change this line__
};
}; // namespace Ocl
! #endif // OCLConstraint_h
Index: ocl.g
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/ocl.g,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ocl.g 26 Jan 2005 17:28:24 -0000 1.15
--- ocl.g 16 May 2005 20:35:18 -0000 1.16
***************
*** 138,141 ****
--- 138,142 ----
#token UNDEFINED "undefined"
#token NULLL "null"
+ //udmoclpat_ocl_g_1 __please do not remove or change this line__
//======================================================================================================================================
***************
*** 147,150 ****
--- 148,153 ----
#token REAL " ( [0-9]+ . [0-9]* | [0-9]* . [0-9]+ ) { [eE] { [\-\+] } [0-9]+ } "
+ //udmoclpat_ocl_g_2 __please do not remove or change this line__
+
//======================================================================================================================================
// TOKEN CLASSES
***************
*** 249,252 ****
--- 252,256 ----
OclCommon::ExceptionPool m_ExceptionPool;
bool m_bOnlyContext;
+ //udmoclpat_ocl_g_3 __please do not remove or change this line__
>>
***************
*** 645,648 ****
--- 649,654 ----
>>
+ //udmoclpat_ocl_g_4 __please do not remove or change this line__
+
//######################################################################################################################################
// RULES
***************
*** 670,674 ****
wrap_colon [ First_expression ]
<< if ( m_bOnlyContext ) { IF_NO_EXC( $pConstraint = CreateConstraint( strName, pCNode, pNode, mapPositions ); ); return; } >>
! expression [ First_inputend, pNode ]
wrap_inputend
<< IF_EXC_NODE( pNode ) >>
--- 676,680 ----
wrap_colon [ First_expression ]
<< if ( m_bOnlyContext ) { IF_NO_EXC( $pConstraint = CreateConstraint( strName, pCNode, pNode, mapPositions ); ); return; } >>
! expression [ First_inputend, pNode ] //udmoclpat_ocl_g_5 __please do not remove or change this line__
wrap_inputend
<< IF_EXC_NODE( pNode ) >>
***************
*** 811,814 ****
--- 817,822 ----
;
+ //udmoclpat_ocl_g_6 __please do not remove or change this line__
+
//======================================================================================================================================
// expression
***************
*** 820,824 ****
(
letExpression [ First_expression, pDNode ]
! expression [ setFollow, $pNode ]
<< IF_EXC_NODE( pDNode ) >>
<< IF_EXC_NODE( pNode ) >>
--- 828,832 ----
(
letExpression [ First_expression, pDNode ]
! expression [ setFollow, $pNode ] //udmoclpat_ocl_g_7 __please do not remove or change this line__
<< IF_EXC_NODE( pDNode ) >>
<< IF_EXC_NODE( pNode ) >>
***************
*** 867,873 ****
expression [ First_then, pIfNode ]
wrap_then [ First_expression ]
! expression [ First_else, pThenNode ]
wrap_else [ First_expression ]
! expression [ First_endif, pElseNode ]
wrap_endif [ setFollow ]
<< IF_EXC_NODE( pIfNode ) >>
--- 875,881 ----
expression [ First_then, pIfNode ]
wrap_then [ First_expression ]
! expression [ First_else, pThenNode ] //udmoclpat_ocl_g_8 __please do not remove or change this line__
wrap_else [ First_expression ]
! expression [ First_endif, pElseNode ] //udmoclpat_ocl_g_9 __please do not remove or change this line__
wrap_endif [ setFollow ]
<< IF_EXC_NODE( pIfNode ) >>
***************
*** 1224,1228 ****
iteratorDeclaration [ First_expression, vecDeclarators, strDeclType, strAccName, strAccType, pAccNode, mapPositions ]
<< IF_EXC_NODE( pAccNode ) >>
! expression [ setFollow, pArgNode ]
<< IF_EXC_NODE( pArgNode ) >>
<< IF_NO_EXC( $pNode = CreateIterator( $strCallOperator, $strName, NULL, pArgNode, vecDeclarators, strDeclType, strAccName, strAccType, pAccNode, mapPositions ); ) >>
--- 1232,1236 ----
iteratorDeclaration [ First_expression, vecDeclarators, strDeclType, strAccName, strAccType, pAccNode, mapPositions ]
<< IF_EXC_NODE( pAccNode ) >>
! expression [ setFollow, pArgNode ] //udmoclpat_ocl_g_10 __please do not remove or change this line__
<< IF_EXC_NODE( pArgNode ) >>
<< IF_NO_EXC( $pNode = CreateIterator( $strCallOperator, $strName, NULL, pArgNode, vecDeclarators, strDeclType, strAccName, strAccType, pAccNode, mapPositions ); ) >>
***************
*** 1638,1641 ****
--- 1646,1651 ----
exception default : << PrintErrorToken( INPUTEND, First_inputend ); >>
+ //udmoclpat_ocl_g_11 __please do not remove or change this line__
+
} // END Of OCLParser
***************
*** 1653,1655 ****
#token "@" << ; >> // TODO; End of string
#token "[\n\r]" << mode( START ); skip(); newline(); >>
! #token "~[\n\r]+" << skip(); >>
\ No newline at end of file
--- 1663,1667 ----
#token "@" << ; >> // TODO; End of string
#token "[\n\r]" << mode( START ); skip(); newline(); >>
! #token "~[\n\r]+" << skip(); >>
!
! //udmoclpat_ocl_g_12 __please do not remove or change this line__
\ No newline at end of file
Index: OclConstraint.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ConstraintManager/OclConstraint.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OclConstraint.cpp 26 Jan 2005 17:28:24 -0000 1.8
--- OclConstraint.cpp 16 May 2005 20:35:18 -0000 1.9
***************
*** 12,15 ****
--- 12,17 ----
#include "OCLParser.h"
+ //udmoclpat_oclconstraint_cpp_1 __please do not remove or change this line__
+
namespace Ocl
{
***************
*** 328,331 ****
--- 330,334 ----
}
+ //udmoclpat_oclconstraint_cpp_2 __please do not remove or change this line__
}; // namespace Ocl
More information about the GME-commit
mailing list