Menu
▾
▴
ccmtools-cvs — Notification of CVS commits for the CCM Tools
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(86) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(114) |
Feb
(254) |
Mar
(166) |
Apr
(122) |
May
(131) |
Jun
(59) |
Jul
(201) |
Aug
(85) |
Sep
(80) |
Oct
(64) |
Nov
(103) |
Dec
(36) |
| 2005 |
Jan
(231) |
Feb
(204) |
Mar
(71) |
Apr
(54) |
May
(50) |
Jun
(120) |
Jul
(17) |
Aug
(124) |
Sep
(75) |
Oct
(154) |
Nov
(37) |
Dec
(143) |
| 2006 |
Jan
(346) |
Feb
(170) |
Mar
|
Apr
|
May
(273) |
Jun
(113) |
Jul
(427) |
Aug
(570) |
Sep
(212) |
Oct
(550) |
Nov
(348) |
Dec
(314) |
| 2007 |
Jan
(709) |
Feb
(223) |
Mar
(104) |
Apr
(24) |
May
(11) |
Jun
(3) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_constants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/test/CppRemoteGenerator/facet_constants/impl Modified Files: Test_iface_impl.cc Log Message: version 0.8.7 merged Index: Test_iface_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_constants/impl/Test_iface_impl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Test_iface_impl.cc 5 Jan 2007 18:58:54 -0000 1.8 --- Test_iface_impl.cc 13 Feb 2007 10:16:11 -0000 1.9 *************** *** 23,40 **** : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST << endl; } --- 23,40 ---- : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST() << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST() << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST() << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST() << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST() << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST() << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST() << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST() << endl; } *************** *** 48,52 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 48,52 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 55,59 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 55,59 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 62,66 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 62,66 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 69,73 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 69,73 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 76,80 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 76,80 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 83,87 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 83,87 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 90,94 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 90,94 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 97,101 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 97,101 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 104,108 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 104,108 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 111,115 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 111,115 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/doc/manual Modified Files: CcmtoolsManual.pdf CcmtoolsManual.tex Log Message: version 0.8.7 merged Index: CcmtoolsManual.pdf =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.pdf,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvsYMfkn1 and /tmp/cvsNkqOAS differ Index: CcmtoolsManual.tex =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.tex,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CcmtoolsManual.tex 24 Jan 2007 15:35:31 -0000 1.6 --- CcmtoolsManual.tex 13 Feb 2007 10:16:11 -0000 1.7 *************** *** 40,44 **** \include{HelloWorldExample/HelloWorldExample} \include{InterfaceDefinitionLanguage/InterfaceDefinitionLanguage} ! %\include{ComponentModel/ComponentModel} \include{LoginExample/LoginExample} --- 40,44 ---- \include{HelloWorldExample/HelloWorldExample} \include{InterfaceDefinitionLanguage/InterfaceDefinitionLanguage} ! \include{ComponentModel/ComponentModel} \include{LoginExample/LoginExample} |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/src/ccmtools Modified Files: Constants.java Log Message: version 0.8.7 merged Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Constants.java 19 Jan 2007 12:07:17 -0000 1.22 --- Constants.java 13 Feb 2007 10:16:12 -0000 1.23 *************** *** 24,28 **** { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.5"; public static final String CPP_PATH = "cpp"; --- 24,28 ---- { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.7"; public static final String CPP_PATH = "cpp"; |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/doc/DevelopmentNotes Added Files: TODOs.txt Log Message: version 0.8.7 merged --- NEW FILE: TODOs.txt --- CCM Tools TODOs =============== o) Start Scripts (ccmtools/bin) - add Windows start scripts - add Ant tasks for ccmtools generators o) IDL Parser - improve ccmmodel -validator - add support for List, Set and Map types which could be mapped to IDL sequences in the remote case. o) Java Generators - generate local adapters into a ccmtools::local namespace - improve Any-Plugin mechanism - use the IDL 'native' keyword and separate the Plugin implementation from the ccmtools implementations. - add multi-threading support for business logic (e.g. synchronized local adapters) - provides a get_session_context() methods which can throw a CCMException in the case that a client did not call configuration_complete(). - separate interface Type from CCM_Type. o) C++ Generators - refactor CppGenerator and CppRemoteGenerator test cases - remove redundant tests. - refactor generator implementation towards JET templates (see Java generators). - improve Any-Plugin mechanism - use the IDL 'native' keyword and separate the Plugin implementation from the ccmtools implementations. - together with the new C++ generator, we can use the new IDL parser and remove the old one (ANTLR based) from the project. - add multi-threading support for business logic (e.g. synchronized local adapters or single threaded POA policy) - provides a get_session_context() methods which can throw a CCMException in the case that a client did not call configuration_complete(). - use SmartPtr for the facet factory methods get_facet() of a component's impl class. - For a given interface, separate Type from CCM_Type and eliminate exception declarations from CCM_Type. Local adapters have to catch all known and unknown business logic exceptions and convert them into legal exceptions of the Type interface. |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_module_constants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/test/CppRemoteGenerator/facet_module_constants/impl Modified Files: Test_iface_impl.cc Log Message: version 0.8.7 merged Index: Test_iface_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_module_constants/impl/Test_iface_impl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Test_iface_impl.cc 5 Jan 2007 18:58:48 -0000 1.8 --- Test_iface_impl.cc 13 Feb 2007 10:16:12 -0000 1.9 *************** *** 25,42 **** : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST << endl; } --- 25,42 ---- : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST() << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST() << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST() << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST() << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST() << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST() << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST() << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST() << endl; } *************** *** 50,54 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 50,54 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 57,61 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 57,61 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 64,68 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 64,68 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 71,75 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 71,75 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 78,82 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 78,82 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 85,89 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 85,89 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 92,96 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 92,96 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 99,103 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 99,103 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 106,110 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 106,110 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 113,117 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 113,117 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:16
|
Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/test/CppRemoteGenerator/receptacle_module_costants/impl Modified Files: Test_impl.cc Test_ifaceIn_impl.cc Log Message: version 0.8.7 merged Index: Test_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl/Test_impl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Test_impl.cc 5 Jan 2007 18:58:47 -0000 1.8 --- Test_impl.cc 13 Feb 2007 10:16:11 -0000 1.9 *************** *** 54,103 **** { bool result = receptacle->getBooleanValue(); ! assert(result == Constants::BOOLEAN_CONST); } { unsigned char result = receptacle->getOctetValue(); ! assert(result == Constants::OCTET_CONST); } { short result = receptacle->getShortValue(); ! assert(result == Constants::SHORT_CONST); } { unsigned short result = receptacle->getUnsignedShortValue(); ! assert(result == Constants::USHORT_CONST); } { long result = receptacle->getLongValue(); ! assert(result == Constants::LONG_CONST); } { unsigned long result = receptacle->getUnsignedLongValue(); ! assert(result == Constants::ULONG_CONST); } { char result = receptacle->getCharValue(); ! assert(result == Constants::CHAR_CONST); } { string result = receptacle->getStringValue(); ! assert(result == Constants::STRING_CONST); } { float result = receptacle->getFloatValue(); ! assert(abs(result - Constants::FLOAT_CONST) < 0.001); } { double result = receptacle->getDoubleValue(); ! assert(abs(result - Constants::DOUBLE_CONST) < 0.0001); } } --- 54,103 ---- { bool result = receptacle->getBooleanValue(); ! assert(result == Constants::BOOLEAN_CONST()); } { unsigned char result = receptacle->getOctetValue(); ! assert(result == Constants::OCTET_CONST()); } { short result = receptacle->getShortValue(); ! assert(result == Constants::SHORT_CONST()); } { unsigned short result = receptacle->getUnsignedShortValue(); ! assert(result == Constants::USHORT_CONST()); } { long result = receptacle->getLongValue(); ! assert(result == Constants::LONG_CONST()); } { unsigned long result = receptacle->getUnsignedLongValue(); ! assert(result == Constants::ULONG_CONST()); } { char result = receptacle->getCharValue(); ! assert(result == Constants::CHAR_CONST()); } { string result = receptacle->getStringValue(); ! assert(result == Constants::STRING_CONST()); } { float result = receptacle->getFloatValue(); ! assert(abs(result - Constants::FLOAT_CONST()) < 0.001); } { double result = receptacle->getDoubleValue(); ! assert(abs(result - Constants::DOUBLE_CONST()) < 0.0001); } } Index: Test_ifaceIn_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl/Test_ifaceIn_impl.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Test_ifaceIn_impl.cc 5 Jan 2007 18:58:47 -0000 1.8 --- Test_ifaceIn_impl.cc 13 Feb 2007 10:16:11 -0000 1.9 *************** *** 25,42 **** : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST << endl; } --- 25,42 ---- : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST() << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST() << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST() << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST() << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST() << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST() << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST() << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST() << endl; } *************** *** 50,54 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 50,54 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 57,61 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 57,61 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 64,68 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 64,68 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 71,75 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 71,75 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 78,82 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 78,82 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 85,89 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 85,89 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 92,96 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 92,96 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 99,103 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 99,103 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 106,110 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 106,110 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 113,117 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 113,117 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:14
|
Update of /cvsroot/ccmtools/ccmtools/bin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/bin Added Files: ccmns.bat ccmjava.bat ccmidl.bat ccmmodel.bat Log Message: version 0.8.7 merged --- NEW FILE: ccmjava.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set CLASSPATH=%CCMTOOLS_HOME%\lib\antlr.jar;%CCMTOOLS_HOME%\lib\java-cup-11a.jar;%CCMTOOLS_HOME%\lib\commons-cli-1.0.jar;%CCMTOOLS_HOME%\lib\jdom.jar;%CCMTOOLS_HOME%\lib\ccmtools.jar;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.generator.java.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end --- NEW FILE: ccmns.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError echo Run CORBA naming service on port 5050... echo (orbd -ORBInitialPort 5050) %JAVA_HOME%\bin\orbd -ORBInitialPort 5050 goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! :end --- NEW FILE: ccmmodel.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set CLASSPATH=%CCMTOOLS_HOME%\lib\antlr.jar;%CCMTOOLS_HOME%\lib\java-cup-11a.jar;%CCMTOOLS_HOME%\lib\commons-cli-1.0.jar;%CCMTOOLS_HOME%\lib\jdom.jar;%CCMTOOLS_HOME%\lib\ccmtools.jar;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.parser.idl.metamodel.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end --- NEW FILE: ccmidl.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set CLASSPATH=%CCMTOOLS_HOME%\lib\antlr.jar;%CCMTOOLS_HOME%\lib\java-cup-11a.jar;%CCMTOOLS_HOME%\lib\commons-cli-1.0.jar;%CCMTOOLS_HOME%\lib\jdom.jar;%CCMTOOLS_HOME%\lib\ccmtools.jar;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.generator.idl.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:14
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270 Modified Files: ChangeLog Added Files: BRANCHES Log Message: version 0.8.7 merged --- NEW FILE: BRANCHES --- $Id: BRANCHES,v 1.1 2007/02/13 10:16:11 rlechner Exp $ : | +-- RELEASE-0_8_5 |\ | *--------------------------+ RELEASE-0_8-BRANCH | | : : | | | + RELEASE-0_8_7 (February 13, 2007) | /| +<-- merged 2007-02-13 ----* | | v | v Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** ChangeLog 24 Jan 2007 15:49:16 -0000 1.59 --- ChangeLog 13 Feb 2007 10:16:11 -0000 1.60 *************** *** 2,5 **** --- 2,16 ---- ============================================================================ + RELEASE-0.8.7 (February 13, 2007) + ---------------------------------------------------------------------------- + *) Bugfix: Windows paths, parser rule for preprocessor lines + + RELEASE-0.8.6 (January 26, 2007) + ---------------------------------------------------------------------------- + *) Refactoring: Interface constants in C++ + Changed the mapping of IDL interface constants from static const members + to static getter methods (using the same name sa the defined constants). + This refactoring was triggert by an Interix problem reported by Duft Markus. + RELEASE-0.8.5 (January 24, 2007) RELEASE-0.8.4 (January 16, 2007) |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:51:07
|
Update of /cvsroot/ccmtools/cpp-environment In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13856 Modified Files: ChangeLog Log Message: version 0.8.7 merged Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ChangeLog 24 Jan 2007 15:43:36 -0000 1.12 --- ChangeLog 13 Feb 2007 09:50:59 -0000 1.13 *************** *** 2,5 **** --- 2,6 ---- ============================================================================ + RELEASE-0.8.7 (February 13, 2007) RELEASE-0.8.5 (January 24, 2007) RELEASE-0.8.4 (January 16, 2007) |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:48:55
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13065/ccm/local Modified Files: Confix2.pkg Log Message: version 0.8.7 merged Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/Confix2.pkg,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 --- Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.8 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:48:53
|
Update of /cvsroot/ccmtools/cpp-environment/externals In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13065/externals Modified Files: Confix2.pkg Log Message: version 0.8.7 merged Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/externals/Confix2.pkg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Confix2.pkg 19 Jan 2007 11:58:11 -0000 1.2 --- Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.3 *************** *** 1,3 **** PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.5') --- 1,3 ---- PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:48:50
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13065/ccm/remote Modified Files: Confix2.pkg Log Message: version 0.8.7 merged Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/Confix2.pkg,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 --- Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.8 *************** *** 1,2 **** PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:48:50
|
Update of /cvsroot/ccmtools/cpp-environment/ccm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13065/ccm Modified Files: Confix2.pkg Log Message: version 0.8.7 merged Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/Confix2.pkg,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 --- Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.8 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:48:49
|
Update of /cvsroot/ccmtools/cpp-environment/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13065/utils Modified Files: Confix2.pkg Log Message: version 0.8.7 merged Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/utils/Confix2.pkg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Confix2.pkg 19 Jan 2007 11:58:12 -0000 1.1 --- Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.2 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:45:14
|
Update of /cvsroot/ccmtools/cpp-environment/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11836/utils Modified Files: Tag: RELEASE-0_8-BRANCH Confix2.pkg Log Message: Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/utils/Confix2.pkg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Confix2.pkg 25 Jan 2007 10:31:00 -0000 1.1.2.1 --- Confix2.pkg 13 Feb 2007 09:45:08 -0000 1.1.2.2 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.6') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:45:14
|
Update of /cvsroot/ccmtools/cpp-environment/externals In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11836/externals Modified Files: Tag: RELEASE-0_8-BRANCH Confix2.pkg Log Message: Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/externals/Confix2.pkg,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** Confix2.pkg 25 Jan 2007 10:31:01 -0000 1.2.2.1 --- Confix2.pkg 13 Feb 2007 09:45:08 -0000 1.2.2.2 *************** *** 1,3 **** PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.6') --- 1,3 ---- PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.7') |
|
From: Robert L. <rle...@us...> - 2007-02-13 09:10:23
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31404 Modified Files: Tag: RELEASE-0_8-BRANCH ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/ChangeLog,v retrieving revision 1.59.2.1 retrieving revision 1.59.2.2 diff -C2 -d -r1.59.2.1 -r1.59.2.2 *** ChangeLog 26 Jan 2007 08:18:29 -0000 1.59.2.1 --- ChangeLog 13 Feb 2007 09:10:19 -0000 1.59.2.2 *************** *** 2,5 **** --- 2,9 ---- ============================================================================ + RELEASE-0.8.7 (February 13, 2007) + ---------------------------------------------------------------------------- + *) Bugfix: Windows paths, parser rule for preprocessor lines + RELEASE-0.8.6 (January 26, 2007) ---------------------------------------------------------------------------- |
|
From: Robert L. <rle...@us...> - 2007-02-13 07:35:23
|
Update of /cvsroot/ccmtools/ccmtools/doc/uml In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28835/doc/uml Modified Files: AssemblyMetamodel.xml.zip Log Message: ccm assembly metamodel Index: AssemblyMetamodel.xml.zip =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/uml/AssemblyMetamodel.xml.zip,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs7ro9Hk and /tmp/cvsCnGClB differ |
|
From: Robert L. <rle...@us...> - 2007-02-13 07:35:23
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28835/src/ccmtools/parser/assembly/metamodel Modified Files: QualifiedName.java Log Message: ccm assembly metamodel Index: QualifiedName.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/QualifiedName.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** QualifiedName.java 12 Feb 2007 16:01:13 -0000 1.3 --- QualifiedName.java 13 Feb 2007 07:34:45 -0000 1.4 *************** *** 27,35 **** } ! private Module container_; ! void postProcessing( Module container ) { ! container_ = container; } } --- 27,40 ---- } ! private Module scope_; ! /** ! * defines the scope of this qualified name ! * ! * @param scope scope of this qualified name (or null for global scope) ! */ ! void postProcessing( Module scope ) { ! scope_ = scope; } } |
|
From: Robert L. <rle...@us...> - 2007-02-12 16:01:35
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17108/src/ccmtools/parser/assembly/metamodel Modified Files: Constant.java Module.java Assembly.java Attribute.java Port.java Connection.java QualifiedName.java Component.java ModelElement.java AssemblyElement.java Model.java Log Message: ccm assembly metamodel Index: Component.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Component.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Component.java 12 Feb 2007 14:08:31 -0000 1.2 --- Component.java 12 Feb 2007 16:01:13 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; /** *************** *** 27,30 **** --- 28,42 ---- } + void postProcessing( Assembly parent, Map<String, Component> components ) + { + parent_ = parent; + idl_name_.postProcessing(parent.getParent()); + if (components.containsKey(name_)) + { + throw new RuntimeException("inner component \"" + name_ + "\" already exists"); + } + components.put(name_, this); + } + public void prettyPrint( PrintStream out, String offset ) { Index: Connection.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Connection.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Connection.java 12 Feb 2007 14:08:31 -0000 1.2 --- Connection.java 12 Feb 2007 16:01:13 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; /** *************** *** 27,30 **** --- 28,38 ---- } + void postProcessing( Assembly parent, Map<String, Component> components ) + { + parent_ = parent; + facet_.postProcessing(components); + receptacle_.postProcessing(components); + } + public void prettyPrint( PrintStream out, String offset ) { Index: AssemblyElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/AssemblyElement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssemblyElement.java 12 Feb 2007 14:08:31 -0000 1.2 --- AssemblyElement.java 12 Feb 2007 16:01:13 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; /** *************** *** 18,20 **** --- 19,31 ---- { public abstract void prettyPrint( PrintStream out, String offset ); + + protected Assembly parent_; + + /** + * call this method after model creation + * + * @param parent the assembly + * @param components map with all known inner components + */ + abstract void postProcessing( Assembly parent, Map<String, Component> components ); } Index: Constant.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Constant.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Constant.java 12 Feb 2007 14:08:31 -0000 1.2 --- Constant.java 12 Feb 2007 16:01:12 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; /** *************** *** 27,30 **** --- 28,37 ---- } + void postProcessing( Assembly parent, Map<String, Component> components ) + { + parent_ = parent; + target_.postProcessing(components); + } + public void prettyPrint( PrintStream out, String offset ) { Index: Attribute.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Attribute.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Attribute.java 12 Feb 2007 14:08:31 -0000 1.3 --- Attribute.java 12 Feb 2007 16:01:12 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- import java.io.PrintStream; + import java.util.Map; /** *************** *** 27,30 **** --- 28,38 ---- } + void postProcessing( Assembly parent, Map<String, Component> components ) + { + parent_ = parent; + target_.postProcessing(components); + source_.postProcessing(components); + } + public void prettyPrint( PrintStream out, String offset ) { Index: Model.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Model.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Model.java 12 Feb 2007 14:08:31 -0000 1.3 --- Model.java 12 Feb 2007 16:01:17 -0000 1.4 *************** *** 29,32 **** --- 29,43 ---- /** + * call this method after model creation + */ + public void postProcessing() + { + for (int i = 0; i < elements_.size(); ++i) + { + elements_.get(i).postProcessing(null); + } + } + + /** * prints the model to an output stream * *************** *** 35,39 **** public void prettyPrint( PrintStream out ) { ! for(int i=0; i<elements_.size(); ++i) { elements_.get(i).prettyPrint(out, ""); --- 46,50 ---- public void prettyPrint( PrintStream out ) { ! for (int i = 0; i < elements_.size(); ++i) { elements_.get(i).prettyPrint(out, ""); Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/ModelElement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModelElement.java 12 Feb 2007 14:08:31 -0000 1.2 --- ModelElement.java 12 Feb 2007 16:01:13 -0000 1.3 *************** *** 25,27 **** --- 25,44 ---- public abstract void prettyPrint( PrintStream out, String offset ); + + protected Module parent_; + + /** + * returns the parent Module of this element (or null) + */ + public Module getParent() + { + return parent_; + } + + /** + * call this method after model creation + * + * @param parent namespace or null + */ + abstract void postProcessing( Module parent ); } Index: QualifiedName.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/QualifiedName.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QualifiedName.java 12 Feb 2007 14:08:31 -0000 1.2 --- QualifiedName.java 12 Feb 2007 16:01:13 -0000 1.3 *************** *** 21,28 **** qn_ = qn; } ! public String toString() { return qn_; } } --- 21,35 ---- qn_ = qn; } ! public String toString() { return qn_; } + + private Module container_; + + void postProcessing( Module container ) + { + container_ = container; + } } Index: Assembly.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Assembly.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Assembly.java 12 Feb 2007 14:08:31 -0000 1.3 --- Assembly.java 12 Feb 2007 16:01:12 -0000 1.4 *************** *** 11,16 **** --- 11,20 ---- import java.io.PrintStream; + import java.util.HashMap; import java.util.Vector; + /** + * defines one assembly + */ public class Assembly extends ModelElement { *************** *** 26,29 **** --- 30,46 ---- } + private HashMap<String, Component> components_; + + void postProcessing( Module parent ) + { + parent_ = parent; + idl_name_.postProcessing(parent); + components_ = new HashMap<String, Component>(); + for (int i = 0; i < elements_.size(); ++i) + { + elements_.get(i).postProcessing(this, components_); + } + } + public void prettyPrint( PrintStream out, String offset ) { Index: Port.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Port.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Port.java 12 Feb 2007 14:08:31 -0000 1.3 --- Port.java 12 Feb 2007 16:01:12 -0000 1.4 *************** *** 10,13 **** --- 10,15 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Map; + /** * facet or receptacle *************** *** 49,51 **** --- 51,64 ---- return component_ + "." + connector_; } + + void postProcessing( Map<String, Component> components ) + { + if (component_ != null) + { + if (!components.containsKey(component_)) + { + throw new RuntimeException("inner component \"" + component_ + "\" is undefined"); + } + } + } } Index: Module.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Module.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Module.java 12 Feb 2007 14:08:31 -0000 1.3 --- Module.java 12 Feb 2007 16:01:12 -0000 1.4 *************** *** 26,29 **** --- 26,38 ---- } + void postProcessing( Module parent ) + { + parent_ = parent; + for (int i = 0; i < children_.size(); ++i) + { + children_.get(i).postProcessing(this); + } + } + public void prettyPrint( PrintStream out, String offset ) { |
|
From: Robert L. <rle...@us...> - 2007-02-12 16:01:24
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17108/src/ccmtools/parser/assembly Modified Files: Main.java Log Message: ccm assembly metamodel Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/Main.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Main.java 12 Feb 2007 14:08:31 -0000 1.2 --- Main.java 12 Feb 2007 16:01:17 -0000 1.3 *************** *** 49,53 **** throw new IllegalStateException("invalid root element: " + root.value.getClass().getName()); ! return (Model) root.value; } } --- 49,55 ---- throw new IllegalStateException("invalid root element: " + root.value.getClass().getName()); ! Model result = (Model) root.value; ! result.postProcessing(); ! return result; } } |
|
From: Robert L. <rle...@us...> - 2007-02-12 15:09:10
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26384/src/ccmtools/parser/idl3 Modified Files: idl3new.g Log Message: bug fix in "preprocessor line" rule Index: idl3new.g =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/idl3new.g,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** idl3new.g 19 Jan 2007 12:06:50 -0000 1.12 --- idl3new.g 12 Feb 2007 15:09:06 -0000 1.13 *************** *** 1,3 **** ! header { /* CCM Tools : IDL3 Parser --- 1,3 ---- ! header { /* CCM Tools : IDL3 Parser *************** *** 60,64 **** [...1912 lines suppressed...] // <value_inheritance_spec,19> event_header returns [MEventDef event = null] ! { ! event = new MEventDefImpl(); ! String id = null; } : ( "custom" { event.setCustom(true); } )? "eventtype" id = identifier *************** *** 2505,2509 **** identifier returns [String identifier = null] ! : i:IDENT { identifier = i.getText(); } { helper.checkKeyword(identifier) }? ; --- 2505,2509 ---- identifier returns [String identifier = null] ! : i:IDENT { identifier = i.getText(); } { helper.checkKeyword(identifier) }? ; |
|
From: Robert L. <rle...@us...> - 2007-02-12 14:08:36
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3679/src/ccmtools/parser/assembly Modified Files: bnf.txt assembly.flex Main.java assembly.cup Log Message: ccm assembly metamodel Index: assembly.cup =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/assembly.cup,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assembly.cup 9 Feb 2007 14:42:14 -0000 1.1 --- assembly.cup 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 5,9 **** import java.util.Vector; import java_cup.runtime.*; - import ccmtools.parser.assembly.metamodel.*; parser code --- 5,8 ---- *************** *** 50,61 **** ! nonterminal Model model; ! nonterminal ModelElement model_element, module, assembly; ! nonterminal Vector<ModelElement> model_element_list; ! nonterminal AssemblyElement assembly_element; ! nonterminal Vector<AssemblyElement> assembly_element_list; ! nonterminal QualifiedName qualified_name; ! nonterminal Port port, internal_port, external_port; ! nonterminal Value value; --- 49,60 ---- ! nonterminal ccmtools.parser.assembly.metamodel.Model model; ! nonterminal ccmtools.parser.assembly.metamodel.ModelElement model_element, module, assembly; ! nonterminal Vector<ccmtools.parser.assembly.metamodel.ModelElement> model_element_list; ! nonterminal ccmtools.parser.assembly.metamodel.AssemblyElement assembly_element; ! nonterminal Vector<ccmtools.parser.assembly.metamodel.AssemblyElement> assembly_element_list; ! nonterminal ccmtools.parser.assembly.metamodel.QualifiedName qualified_name; ! nonterminal ccmtools.parser.assembly.metamodel.Port port, internal_port, external_port; ! nonterminal ccmtools.parser.assembly.metamodel.Value value; *************** *** 72,76 **** | {: ! RESULT = new Model(); :} ; --- 71,75 ---- | {: ! RESULT = new ccmtools.parser.assembly.metamodel.Model(); :} ; *************** *** 100,104 **** | {: ! RESULT = new Vector<ModelElement>(); :} ; --- 99,103 ---- | {: ! RESULT = new Vector<ccmtools.parser.assembly.metamodel.ModelElement>(); :} ; *************** *** 107,113 **** module ::= ! MODULE NAME:v1 LBRACE model_element_list:v2 RBRACE {: ! RESULT = new Module(v1, v2); :} ; --- 106,112 ---- module ::= ! MODULE NAME:v1 LBRACE model_element_list:v2 RBRACE SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Module(v1, v2); :} ; *************** *** 116,122 **** assembly ::= ! ASSEMBLY NAME:v1 IMPLEMENTS qualified_name:v2 LBRACE assembly_element_list:v3 RBRACE {: ! RESULT = new Assembly(v1, v2, v3); :} ; --- 115,121 ---- assembly ::= ! ASSEMBLY NAME:v1 IMPLEMENTS qualified_name:v2 LBRACE assembly_element_list:v3 RBRACE SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Assembly(v1, v2, v3); :} ; *************** *** 127,136 **** QN:v1 {: ! RESULT = new QualifiedName(v1); :} | NAME:v1 {: ! RESULT = new QualifiedName(v1); :} ; --- 126,135 ---- QN:v1 {: ! RESULT = new ccmtools.parser.assembly.metamodel.QualifiedName(v1); :} | NAME:v1 {: ! RESULT = new ccmtools.parser.assembly.metamodel.QualifiedName(v1); :} ; *************** *** 146,150 **** | {: ! RESULT = new Vector<AssemblyElement>(); :} ; --- 145,149 ---- | {: ! RESULT = new Vector<ccmtools.parser.assembly.metamodel.AssemblyElement>(); :} ; *************** *** 155,174 **** COMPONENT qualified_name:v1 NAME:v2 SEMICOLON {: ! RESULT = new Component(v1, v2); :} | CONNECT port:v1 TO port:v2 SEMICOLON {: ! RESULT = new Connection(v1, v2); :} | ATTRIBUTE internal_port:v1 EQUAL external_port:v2 SEMICOLON {: ! RESULT = new Attribute(v1, v2); :} | CONSTANT internal_port:v1 EQUAL value:v2 SEMICOLON {: ! RESULT = new Constant(v1, v2); :} ; --- 154,173 ---- COMPONENT qualified_name:v1 NAME:v2 SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Component(v1, v2); :} | CONNECT port:v1 TO port:v2 SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Connection(v1, v2); :} | ATTRIBUTE internal_port:v1 EQUAL external_port:v2 SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Attribute(v1, v2); :} | CONSTANT internal_port:v1 EQUAL value:v2 SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Constant(v1, v2); :} ; *************** *** 193,197 **** NAME:v1 DOT NAME:v2 {: ! RESULT = new Port(v1, v2); :} ; --- 192,196 ---- NAME:v1 DOT NAME:v2 {: ! RESULT = new ccmtools.parser.assembly.metamodel.Port(v1, v2); :} ; *************** *** 202,211 **** NAME:v1 {: ! RESULT = new Port(v1); :} | THIS DOT NAME:v1 {: ! RESULT = new Port(v1); :} ; --- 201,210 ---- NAME:v1 {: ! RESULT = new ccmtools.parser.assembly.metamodel.Port(v1); :} | THIS DOT NAME:v1 {: ! RESULT = new ccmtools.parser.assembly.metamodel.Port(v1); :} ; *************** *** 216,225 **** STRING:v1 {: ! RESULT = new Text(v1); :} | NUMBER:v1 {: ! RESULT = new Number(v1); :} ; --- 215,224 ---- STRING:v1 {: ! RESULT = new ccmtools.parser.assembly.metamodel.Text(v1); :} | NUMBER:v1 {: ! RESULT = new ccmtools.parser.assembly.metamodel.Number(v1); :} ; Index: bnf.txt =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/bnf.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bnf.txt 9 Feb 2007 14:42:14 -0000 1.2 --- bnf.txt 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 7,13 **** model_element := module | assembly ! module := "module" NAME "{" (model_element)* "}" ! assembly := "assembly" NAME "implements" QN "{" (assembly_element)* "}" assembly_element := component | connection | attribute | constant --- 7,13 ---- model_element := module | assembly ! module := "module" NAME "{" (model_element)* "}" ";" ! assembly := "assembly" NAME "implements" QN "{" (assembly_element)* "}" ";" assembly_element := component | connection | attribute | constant Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/Main.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Main.java 5 Feb 2007 15:41:56 -0000 1.1 --- Main.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,21 **** package ccmtools.parser.assembly; public final class Main { - /** - * @param args - */ public static void main( String[] args ) { ! // TODO Auto-generated method stub } } --- 10,53 ---- package ccmtools.parser.assembly; + import java.io.FileReader; + import ccmtools.parser.assembly.metamodel.Model; + public final class Main { public static void main( String[] args ) { ! if (args.length != 1) ! { ! Main m = new Main(); ! System.err.println(m.getClass().getName() + " assembly-description-file"); ! System.exit(1); ! } ! else ! try ! { ! Model m = Main.parse(args[0]); ! m.prettyPrint(System.out); ! } ! catch (Exception e) ! { ! e.printStackTrace(System.err); ! System.exit(1); ! } ! } ! ! public static Model parse( String assembly_description_file ) throws Exception ! { ! FileReader reader = new FileReader(assembly_description_file); ! AssemblyLexer lexer = new AssemblyLexer(reader); ! lexer.current_input_filename = assembly_description_file; ! AssemblyParser parser = new AssemblyParser(lexer); ! parser.current_input_filename = assembly_description_file; ! java_cup.runtime.Symbol root = parser.parse(); ! if (root == null || root.value == null) ! throw new NullPointerException("parsing failed"); ! if (!(root.value instanceof Model)) ! throw new IllegalStateException("invalid root element: " ! + root.value.getClass().getName()); ! return (Model) root.value; } } Index: assembly.flex =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/assembly.flex,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assembly.flex 9 Feb 2007 14:42:14 -0000 1.1 --- assembly.flex 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 29,33 **** { StringBuilder out = new StringBuilder(); ! out.append(file_name); out.append(" line "); out.append(yyline); --- 29,33 ---- { StringBuilder out = new StringBuilder(); ! out.append(current_input_filename); out.append(" line "); out.append(yyline); |
|
From: Robert L. <rle...@us...> - 2007-02-12 14:08:35
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3679/src/ccmtools/parser/assembly/metamodel Modified Files: Module.java Connection.java Component.java Number.java Constant.java Assembly.java Attribute.java Port.java Value.java QualifiedName.java ModelElement.java AssemblyElement.java Text.java Model.java Log Message: ccm assembly metamodel Index: Component.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Component.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Component.java 5 Feb 2007 15:41:56 -0000 1.1 --- Component.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * defines an inner component + */ public class Component extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- name_ = name; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "component " + idl_name_ + " " + name_ + " ;"); + } } Index: Text.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Text.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Text.java 9 Feb 2007 14:42:13 -0000 1.1 --- Text.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 18,20 **** --- 18,25 ---- value_ = value; } + + public String toString() + { + return "\"" + value_ + "\""; + } } Index: Connection.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Connection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Connection.java 5 Feb 2007 15:41:56 -0000 1.1 --- Connection.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * connects a facet with a receptacle + */ public class Connection extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- receptacle_ = receptacle; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "connect " + facet_ + " to " + receptacle_ + " ;"); + } } Index: AssemblyElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/AssemblyElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssemblyElement.java 5 Feb 2007 15:41:56 -0000 1.1 --- AssemblyElement.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** --- 10,20 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * One line of an assembly description. + */ public abstract class AssemblyElement { + public abstract void prettyPrint( PrintStream out, String offset ); } Index: Constant.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Constant.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Constant.java 9 Feb 2007 14:42:13 -0000 1.1 --- Constant.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * sets the attribute of an inner component to a constant value + */ public class Constant extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- value_ = value; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "constant " + target_ + " = " + value_ + " ;"); + } } Index: Attribute.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Attribute.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Attribute.java 9 Feb 2007 14:42:13 -0000 1.2 --- Attribute.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * connects an attribute of the assembly with the attribute of an inner component + */ public class Attribute extends AssemblyElement { *************** *** 21,23 **** --- 26,33 ---- source_ = source; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "attribute " + target_ + " = " + source_ + " ;"); + } } Index: Model.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Model.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Model.java 9 Feb 2007 14:42:13 -0000 1.2 --- Model.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,22 **** --- 10,42 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; import java.util.Vector; + /** + * The root element of the ccmtools assembly metamodel. + */ public class Model { private Vector<ModelElement> elements_ = new Vector<ModelElement>(); + /** + * adds a new ModelElement + */ public void add( ModelElement e ) { elements_.add(e); } + + /** + * prints the model to an output stream + * + * @param out the output stream + */ + public void prettyPrint( PrintStream out ) + { + for(int i=0; i<elements_.size(); ++i) + { + elements_.get(i).prettyPrint(out, ""); + } + } } Index: Number.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Number.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Number.java 9 Feb 2007 14:42:13 -0000 1.1 --- Number.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 9, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 9, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,13 **** --- 10,16 ---- package ccmtools.parser.assembly.metamodel; + /** + * a number (integer or floating point) + */ public class Number extends Value { *************** *** 18,20 **** --- 21,28 ---- value_ = value; } + + public String toString() + { + return value_; + } } Index: Value.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Value.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Value.java 9 Feb 2007 14:42:13 -0000 1.1 --- Value.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 9, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 9, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + /** + * defines a constant value for attributs + */ public abstract class Value { + public abstract String toString(); } Index: ModelElement.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/ModelElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ModelElement.java 5 Feb 2007 15:41:56 -0000 1.1 --- ModelElement.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; + + /** + * Top level element of the model. + */ public abstract class ModelElement { *************** *** 18,20 **** --- 23,27 ---- name_ = name; } + + public abstract void prettyPrint( PrintStream out, String offset ); } Index: QualifiedName.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/QualifiedName.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QualifiedName.java 5 Feb 2007 15:41:56 -0000 1.1 --- QualifiedName.java 12 Feb 2007 14:08:31 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** --- 10,28 ---- package ccmtools.parser.assembly.metamodel; + /** + * a qualified name + */ public final class QualifiedName { + private String qn_; + + public QualifiedName( String qn ) + { + qn_ = qn; + } + + public String toString() + { + return qn_; + } } Index: Assembly.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Assembly.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Assembly.java 9 Feb 2007 14:42:13 -0000 1.2 --- Assembly.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; import java.util.Vector; *************** *** 24,26 **** --- 25,37 ---- elements_ = elements; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "assembly " + name_ + " implements " + idl_name_ + " {"); + for (int i = 0; i < elements_.size(); ++i) + { + elements_.get(i).prettyPrint(out, offset + " "); + } + out.println(offset + "};"); + } } Index: Port.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Port.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Port.java 9 Feb 2007 14:42:13 -0000 1.2 --- Port.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,13 **** --- 10,16 ---- package ccmtools.parser.assembly.metamodel; + /** + * facet or receptacle + */ public final class Port { *************** *** 38,40 **** --- 41,51 ---- connector_ = connector; } + + public String toString() + { + if (component_ == null) + return "this." + connector_; + else + return component_ + "." + connector_; + } } Index: Module.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Module.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Module.java 9 Feb 2007 14:42:13 -0000 1.2 --- Module.java 12 Feb 2007 14:08:31 -0000 1.3 *************** *** 10,15 **** --- 10,19 ---- package ccmtools.parser.assembly.metamodel; + import java.io.PrintStream; import java.util.Vector; + /** + * a namespace + */ public class Module extends ModelElement { *************** *** 21,23 **** --- 25,37 ---- children_ = children; } + + public void prettyPrint( PrintStream out, String offset ) + { + out.println(offset + "module " + name_ + " {"); + for (int i = 0; i < children_.size(); ++i) + { + children_.get(i).prettyPrint(out, offset + " "); + } + out.println(offset + "};"); + } } |
|
From: Robert L. <rle...@us...> - 2007-02-12 14:08:35
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3679 Modified Files: build.xml Log Message: ccm assembly metamodel Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** build.xml 9 Feb 2007 14:42:14 -0000 1.74 --- build.xml 12 Feb 2007 14:08:31 -0000 1.75 *************** *** 80,83 **** --- 80,101 ---- </target> + <target name="compile.AssemblyMain" depends="generate.AssemblyLexer, generate.AssemblyParser"> + <javac srcdir="${src}/ccmtools/parser/assembly:${src-gen}/ccmtools/parser/assembly" + destdir="${build}/classes" + debug="on" source="1.5" target="1.5" verbose="off"> + <classpath refid="compile.classpath" /> + </javac> + </target> + + <target name="jar.AssemblyMain" depends="compile.AssemblyMain"> + <jar jarfile="${lib}/assembly.jar" + basedir="${build}/classes" + includes="ccmtools/parser/assembly/**"> + <manifest> + <attribute name="Main-Class" value="ccmtools.parser.assembly.Main" /> + </manifest> + </jar> + </target> + <!-- Compile ccmtools source code --> |
1 message has been excluded from this view by a project administrator.
