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-03-09 08:04:38
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_inheritance/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2532/test/CppGenerator/facet_inheritance/impl Modified Files: TestMirror_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: TestMirror_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_inheritance/impl/TestMirror_impl.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TestMirror_impl.cc 5 Jan 2007 14:17:27 -0000 1.10 --- TestMirror_impl.cc 9 Mar 2007 08:04:32 -0000 1.11 *************** *** 1,13 **** /*** * TestMirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ --- 1,13 ---- /*** * TestMirror component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ *************** *** 42,46 **** throw(Components::CCMException) { ! CCM_InterfaceType::SmartPtr receptacle = ctx->get_connection_a_facet(); string str1 = "Hallo to first op()"; long size1 = receptacle->op1(str1); --- 42,46 ---- throw(Components::CCMException) { ! InterfaceType::SmartPtr receptacle = ctx->get_connection_a_facet(); string str1 = "Hallo to first op()"; long size1 = receptacle->op1(str1); *************** *** 50,54 **** long size2 = receptacle->op2(str2); assert(size2 == str2.length()); ! string str3 = "Hallo to third op()"; long size3 = receptacle->op3(str3); --- 50,54 ---- long size2 = receptacle->op2(str2); assert(size2 == str2.length()); ! string str3 = "Hallo to third op()"; long size3 = receptacle->op3(str3); |
|
From: Robert L. <rle...@us...> - 2007-03-09 07:35:55
|
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23558/src/templates/CppLocalTemplates Modified Files: MComponentDef MSupportsDefBase Added Files: MSupportsDefImplBase Log Message: bug fix: wrong supported interfaces --- NEW FILE: MSupportsDefImplBase --- , virtual public %(CCMSupportsType)s Index: MSupportsDefBase =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MSupportsDefBase,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MSupportsDefBase 6 Dec 2006 20:49:16 -0000 1.3 --- MSupportsDefBase 9 Mar 2007 07:35:50 -0000 1.4 *************** *** 1 **** ! , virtual public %(GenSupportsType)sAdapter \ No newline at end of file --- 1,2 ---- ! ! , virtual public %(GenSupportsType)sAdapter \ No newline at end of file Index: MComponentDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** MComponentDef 8 Mar 2007 13:38:50 -0000 1.29 --- MComponentDef 9 Mar 2007 07:35:49 -0000 1.30 *************** *** 39,45 **** class %(Identifier)s ! : virtual public ::Components::CCMObject ! %(MSupportsDefBase)s ! %(BaseType)s { public: --- 39,43 ---- class %(Identifier)s ! : virtual public ::Components::CCMObject %(BaseType)s %(MSupportsDefBase)s { public: *************** *** 355,359 **** class CCM_%(Identifier)s ! : virtual public ::Components::SessionComponent%(BaseType)s%(MSupportsDefBase)s { public: --- 353,357 ---- class CCM_%(Identifier)s ! : virtual public ::Components::SessionComponent %(BaseType)s %(MSupportsDefImplBase)s { public: |
|
From: Robert L. <rle...@us...> - 2007-03-08 14:47:18
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/test-prototype1 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5492/test/CppAssembly/test-prototype1 Added Files: Makefile prototype1.idl prototype1.assembly .cvsignore Log Message: new prototype --- NEW FILE: prototype1.assembly --- module Space { assembly implements Alien { component World::Worker alias "Worker" inner; connect inner.p1 to Ap1; connect inner.p2 to inner.r2; connect Ar3 to inner.r3; connect Ar4 to inner.r4; connect inner.p5a to inner.r5; connect inner.p5b to inner.r5; connect Ar10 to Ap10; connect Ar6a to inner.r6; connect Ar6b to inner.r6; connect Ar7a to inner.r7; connect Ar7b to inner.r7; }; }; // /module Space --- NEW FILE: .cvsignore --- gen --- NEW FILE: Makefile --- ITF="gen/idl/interface" COMP="gen/idl/component" SPACE_GEN="space/GEN_ccmtools_local_Space" all: local assembly local: ccmidl -idl3 -o gen/idl prototype1.idl ccmtools c++local -a -o gen/itf -I$(ITF) `find $(ITF) -name '*.idl'` ccmtools c++local -a -o gen/world -I$(ITF) -I$(COMP) $(COMP)/World/*.idl ccmtools c++local -a -o gen/space -I$(ITF) -I$(COMP) $(COMP)/Space/*.idl confix: ccmconfix -confix2 -o gen -pname "assembly-prototype2" -pversion "0.0.1" cd gen && confix2.py --bootstrap --configure --make --targets=check manual: local confix assembly: ccmtools c++assembly -o gen/space prototype1.idl prototype1.assembly check: local assembly confix clean: cd gen && confix2.py --make --targets=clean rm -rf gen --- NEW FILE: prototype1.idl --- module World { interface Data { long work(in string text); }; component Worker { provides Data p1; provides Data p2; uses Data r2; uses Data r3; uses multiple Data r4; provides Data p5a; provides Data p5b; uses multiple Data r5; uses multiple Data r6; uses multiple Data r7; }; home WorkerHome manages Worker {}; }; // /module World module Space { component Alien { provides World::Data Ap1; uses World::Data Ar3; uses multiple World::Data Ar4; provides World::Data Ap10; uses World::Data Ar10; uses World::Data Ar6a; uses World::Data Ar6b; uses multiple World::Data Ar7a; uses multiple World::Data Ar7b; }; home AlienHome manages Alien {}; }; // /module Space |
|
From: Robert L. <rle...@us...> - 2007-03-08 14:47:13
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/test-prototype1 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5373/test/CppAssembly/test-prototype1 Log Message: Directory /cvsroot/ccmtools/ccmtools/test/CppAssembly/test-prototype1 added to the repository |
|
From: Robert L. <rle...@us...> - 2007-03-08 14:45:27
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4753/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space Modified Files: Alien_gen.cc Log Message: new prototype Index: Alien_gen.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space/Alien_gen.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Alien_gen.cc 5 Mar 2007 10:46:14 -0000 1.6 --- Alien_gen.cc 8 Mar 2007 14:45:23 -0000 1.7 *************** *** 38,41 **** --- 38,44 ---- delegator = dynamic_cast< ::Components::ComponentDelegator*>(local_component); + Ap1_facet_impl = NULL; + Ap10_facet_impl = NULL; + Ar4_receptacle_counter = 0; Ar7a_receptacle_counter = 0; *************** *** 458,463 **** if(name == "Ar3") { ! connect_Ar3(::World::CCM_Data::SmartPtr( ! dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; --- 461,466 ---- if(name == "Ar3") { ! connect_Ar3(::World::Data::SmartPtr( ! dynamic_cast< ::World::Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; *************** *** 465,475 **** if(name == "Ar4") { ! return connect_Ar4(::World::CCM_Data::SmartPtr ! (dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); } if(name == "Ar10") { ! connect_Ar10(::World::CCM_Data::SmartPtr( ! dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; --- 468,478 ---- if(name == "Ar4") { ! return connect_Ar4(::World::Data::SmartPtr ! (dynamic_cast< ::World::Data*> (connection.ptr()))); } if(name == "Ar10") { ! connect_Ar10(::World::Data::SmartPtr( ! dynamic_cast< ::World::Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; *************** *** 477,482 **** if(name == "Ar6a") { ! connect_Ar6a(::World::CCM_Data::SmartPtr( ! dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; --- 480,485 ---- if(name == "Ar6a") { ! connect_Ar6a(::World::Data::SmartPtr( ! dynamic_cast< ::World::Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; *************** *** 484,489 **** if(name == "Ar6b") { ! connect_Ar6b(::World::CCM_Data::SmartPtr( ! dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; --- 487,492 ---- if(name == "Ar6b") { ! connect_Ar6b(::World::Data::SmartPtr( ! dynamic_cast< ::World::Data*> (connection.ptr()))); ::Components::Cookie ck; return ck; *************** *** 491,501 **** if(name == "Ar7a") { ! return connect_Ar7a(::World::CCM_Data::SmartPtr ! (dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); } if(name == "Ar7b") { ! return connect_Ar7b(::World::CCM_Data::SmartPtr ! (dynamic_cast< ::World::CCM_Data*> (connection.ptr()))); } --- 494,504 ---- if(name == "Ar7a") { ! return connect_Ar7a(::World::Data::SmartPtr ! (dynamic_cast< ::World::Data*> (connection.ptr()))); } if(name == "Ar7b") { ! return connect_Ar7b(::World::Data::SmartPtr ! (dynamic_cast< ::World::Data*> (connection.ptr()))); } |
|
From: Robert L. <rle...@us...> - 2007-03-08 14:45:27
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4753/test/CppAssembly/prototype1 Modified Files: Makefile Log Message: new prototype Index: Makefile =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 5 Mar 2007 09:21:20 -0000 1.3 --- Makefile 8 Mar 2007 14:45:23 -0000 1.4 *************** *** 11,21 **** ccmtools c++local -a -o gen/space -I$(ITF) -I$(COMP) $(COMP)/Space/*.idl copy: cp -p impl/space/*.h impl/space/*.cc gen/space/ cp -p impl/$(SPACE_GEN)/*.h impl/$(SPACE_GEN)/*.cc gen/$(SPACE_GEN)/ ! check: local copy ! ccmconfix -confix2 -o gen -pname "assembly-prototype2" -pversion "0.0.1" ! cd gen && confix2.py --bootstrap --configure --make --targets=check clean: --- 11,25 ---- ccmtools c++local -a -o gen/space -I$(ITF) -I$(COMP) $(COMP)/Space/*.idl + confix: + ccmconfix -confix2 -o gen -pname "assembly-prototype2" -pversion "0.0.1" + cd gen && confix2.py --bootstrap --configure --make --targets=check + + manual: local confix + copy: cp -p impl/space/*.h impl/space/*.cc gen/space/ cp -p impl/$(SPACE_GEN)/*.h impl/$(SPACE_GEN)/*.cc gen/$(SPACE_GEN)/ ! check: local copy confix clean: |
|
From: Robert L. <rle...@us...> - 2007-03-08 14:44:41
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4387/src/ccmtools/CppGenerator Modified Files: CppAssemblyGenerator.java Log Message: new prototype Index: CppAssemblyGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppAssemblyGenerator.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CppAssemblyGenerator.java 8 Mar 2007 13:38:51 -0000 1.9 --- CppAssemblyGenerator.java 8 Mar 2007 14:44:33 -0000 1.10 *************** *** 320,327 **** HashSet<String> include_set = new HashSet<String>(); StringBuilder code = new StringBuilder(); ! // TODO return code.toString(); } protected String variable_AssemblyInnerHomeInclude() { --- 320,352 ---- HashSet<String> include_set = new HashSet<String>(); StringBuilder code = new StringBuilder(); ! for (AssemblyElement e : currentAssembly.getElements()) ! { ! if (e instanceof Constant) ! { ! Constant c = (Constant) e; ! generateAssemblyInnerComponentInclude(c.getTarget(), include_set, code); ! } ! else if (e instanceof Attribute) ! { ! Attribute a = (Attribute) e; ! generateAssemblyInnerComponentInclude(a.getTarget(), include_set, code); ! } ! } return code.toString(); } + private void generateAssemblyInnerComponentInclude( Port target, Set<String> include_set, + StringBuilder code ) + { + String target_comp = target.getComponent(); + MComponentDef target_def = getAssemblyLocalComponents().get(target_comp); + String inc_name = getLocalCxxIncludeName(target_def); + if (!include_set.contains(inc_name)) + { + code.append("#include <" + inc_name + "_gen.h>\n"); + include_set.add(inc_name); + } + } + protected String variable_AssemblyInnerHomeInclude() { *************** *** 487,490 **** --- 512,516 ---- connect_code.append(impl_code); connect_code.append(TAB2 + "impl->target = f;\n"); + connect_code.append(TAB2 + "return ::Components::Cookie();\n"); disconnect_code.append(impl_code); disconnect_code.append(TAB2 + "impl->target.forget();\n"); *************** *** 505,509 **** disconnect_code.append(TAB2 + target_comp + "_->disconnect(\""); disconnect_code.append(target_name + "\", ck);\n"); - disconnect_code.append(TAB2 + "return;\n"); } else --- 531,534 ---- *************** *** 521,528 **** disconnect_code.append(TAB2 + target_comp + "_->disconnect(\""); disconnect_code.append(target_name + "\", " + source_name + "_);\n"); - disconnect_code.append(TAB2 + "return;\n"); } } connect_code.append(TAB + "}\n"); disconnect_code.append(TAB + "}\n"); } --- 546,553 ---- disconnect_code.append(TAB2 + target_comp + "_->disconnect(\""); disconnect_code.append(target_name + "\", " + source_name + "_);\n"); } } connect_code.append(TAB + "}\n"); + disconnect_code.append(TAB2 + "return;\n"); disconnect_code.append(TAB + "}\n"); } *************** *** 688,704 **** if (dataType.equals("AssemblyTargetVariable")) { ! return variable_AssemblyTargetVariable(); } return super.data_MProvidesDef(dataType, dataValue); } - protected String variable_AssemblyTargetVariable() - { - MProvidesDef provides = (MProvidesDef) currentNode; - MInterfaceDef iface = provides.getProvides(); - String iface_type = getLocalCxxName(iface, Text.SCOPE_SEPARATOR); - return TAB + iface_type + "::SmartPtr target;\n"; - } - protected String generateOperationImpl( MProvidesDef provides, MOperationDef op ) { --- 713,721 ---- if (dataType.equals("AssemblyTargetVariable")) { ! return TAB + "::Components::Object::SmartPtr target;\n"; } return super.data_MProvidesDef(dataType, dataValue); } protected String generateOperationImpl( MProvidesDef provides, MOperationDef op ) { *************** *** 712,721 **** code.append(" ").append(getOperationExcepts(op)).append("\n"); code.append("{\n"); code.append(TAB); if (!return_type.equals("void")) code.append("return "); ! code.append("this->target->").append(op.getIdentifier()).append("("); code.append(getOperationParamNames(op)); code.append(");\n"); code.append("}\n\n"); return code.toString(); --- 729,747 ---- code.append(" ").append(getOperationExcepts(op)).append("\n"); code.append("{\n"); + // + MInterfaceDef iface = provides.getProvides(); + String iface_type = getLocalCxxName(iface, Text.SCOPE_SEPARATOR); + code.append(TAB + iface_type + "* f_a_c_e_t = dynamic_cast< "); + code.append(iface_type + "*>(this->target.ptr());\n"); + code.append(TAB + "if(!f_a_c_e_t)\n"); + code.append(TAB2 + "throw ::Components::CCMException(::Components::SYSTEM_ERROR);\n"); + // code.append(TAB); if (!return_type.equals("void")) code.append("return "); ! code.append("f_a_c_e_t->").append(op.getIdentifier()).append("("); code.append(getOperationParamNames(op)); code.append(");\n"); + // code.append("}\n\n"); return code.toString(); *************** *** 739,743 **** StringBuilder result = new StringBuilder(); boolean empty = true; - Map<String, MComponentDef> map = getAssemblyLocalComponents(); for (AssemblyElement e : currentAssembly.getElements()) { --- 765,768 ---- |
|
From: Robert L. <rle...@us...> - 2007-03-08 13:38:57
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11158/src/ccmtools/CppGenerator Modified Files: CppAssemblyGenerator.java Log Message: new prototype Index: CppAssemblyGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppAssemblyGenerator.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CppAssemblyGenerator.java 5 Mar 2007 09:21:21 -0000 1.8 --- CppAssemblyGenerator.java 8 Mar 2007 13:38:51 -0000 1.9 *************** *** 144,150 **** protected String data_MComponentDef( String data_type, String data_value ) { ! if (data_type.equals("AssemblyInnerComponentVariable")) { ! return variable_AssemblyInnerComponentVariable(); } if (data_type.equals("AssemblyInnerComponentVariableCreation")) --- 144,151 ---- protected String data_MComponentDef( String data_type, String data_value ) { ! if (data_type.equals("AssemblyImplVariable")) { ! return variable_AssemblyInnerComponentVariable() ! + variable_AssemblySingleToMultipleCookieVariable(); } if (data_type.equals("AssemblyInnerComponentVariableCreation")) *************** *** 154,162 **** if (data_type.equals("AssemblyInnerComponentInclude")) { ! return variable_AssemblyInnerComponentInclude(); ! } ! if (data_type.equals("AssemblyInnerHomeInclude")) ! { ! return variable_AssemblyInnerHomeInclude(); } if (data_type.equals("AssemblyCcmActivate")) --- 155,159 ---- if (data_type.equals("AssemblyInnerComponentInclude")) { ! return variable_AssemblyInnerHomeInclude() + variable_AssemblyInnerComponentInclude(); } if (data_type.equals("AssemblyCcmActivate")) *************** *** 168,185 **** return variable_AssemblyCcmRemove(); } ! if(data_type.equals("AssemblyImplBase")) { ! // TODO ! return "/* AssemblyImplBase */"; } ! if(data_type.equals("AssemblyImplPrototype")) { ! // TODO ! return "// AssemblyImplPrototype"; } ! if(data_type.equals("AssemblyImplDefinition")) { ! // TODO ! return "// AssemblyImplDefinition"; } return super.data_MComponentDef(data_type, data_value); --- 165,187 ---- return variable_AssemblyCcmRemove(); } ! if (data_type.equals("AssemblyImplBase")) { ! return "\n" + TAB + ", virtual public ::Components::ComponentDelegator"; } ! if (data_type.equals("AssemblyImplPrototype")) { ! final String VV = TAB + "virtual "; ! final String O = "::Components::Object::SmartPtr"; ! final String C = "::Components::Cookie"; ! final String N = "::Components::FeatureName"; ! StringBuilder c = new StringBuilder(); ! c.append(VV + O + " provide(const std::string& name);\n"); ! c.append(VV + C + " connect(const " + N + "& name, " + O + " f);\n"); ! c.append(VV + "void disconnect(const " + N + "& name, " + C + " const& ck);\n"); ! return c.toString(); } ! if (data_type.equals("AssemblyImplDefinition")) { ! return variable_AssemblyImplDefinition(); } return super.data_MComponentDef(data_type, data_value); *************** *** 188,198 **** protected String variable_AssemblyInnerComponentVariable() { ! StringBuffer code = new StringBuffer(); Map<String, MComponentDef> map = getAssemblyLocalComponents(); for (String key : map.keySet()) { MComponentDef comp_def = map.get(key); ! String cpp_type = getLocalCxxName(comp_def, "::"); ! code.append(TAB + cpp_type + "::SmartPtr " + key + "_;\n"); for (Object o : comp_def.getFacets()) { --- 190,199 ---- protected String variable_AssemblyInnerComponentVariable() { ! StringBuilder code = new StringBuilder(); Map<String, MComponentDef> map = getAssemblyLocalComponents(); for (String key : map.keySet()) { MComponentDef comp_def = map.get(key); ! code.append(TAB + "::Components::CCMObject::SmartPtr " + key + "_;\n"); for (Object o : comp_def.getFacets()) { *************** *** 267,278 **** code_creation.append(TAB).append("assert("); code_creation.append(keyless_var).append(");\n"); ! final String obj_type = "::wamas::platform::utils::SmartPtr< ::Components::CCMObject>"; ! String obj_var = createLocalVar(local_var_map, obj_type, code_homes); ! code_creation.append(TAB).append(obj_var); ! code_creation.append(" = ").append(keyless_var).append("->create_component();\n"); ! String cpp_type = getLocalCxxName(comp_def, "::"); ! code_creation.append(TAB).append(key); ! code_creation.append("_.eat(dynamic_cast< ").append(cpp_type); ! code_creation.append("*>(").append(obj_var).append(".ptr()));\n"); } else --- 268,273 ---- code_creation.append(TAB).append("assert("); code_creation.append(keyless_var).append(");\n"); ! code_creation.append(TAB).append(key).append("_ = "); ! code_creation.append(keyless_var).append("->create_component();\n"); } else *************** *** 291,297 **** code_creation.append(key).append("_);\n"); } - StringBuilder result = new StringBuilder(); - result.append(code_homes); - result.append(code_creation); for (AssemblyElement e : currentAssembly.getElements()) { --- 286,289 ---- *************** *** 300,315 **** Constant c = (Constant) e; Port target = c.getTarget(); String value = c.getValue().toString(); StringBuilder code = new StringBuilder(); ! code.append(TAB); ! code.append(target.getComponent()); ! code.append("_->"); code.append(target.getConnector()); code.append("("); code.append(value); code.append(");\n"); ! result.append(code); } } return result.toString(); } --- 292,314 ---- Constant c = (Constant) e; Port target = c.getTarget(); + String target_comp = target.getComponent(); String value = c.getValue().toString(); StringBuilder code = new StringBuilder(); ! String target_type = getLocalCxxName(map.get(target_comp), "::") + "*"; ! String target_var = createLocalVar(local_var_map, target_type, code_homes); ! code.append(TAB + target_var + " = dynamic_cast< " + target_type + ">("); ! code.append(target_comp + "_.ptr());\n"); ! code.append(TAB + "assert(" + target_var + ");\n"); ! code.append(TAB + target_var + "->"); code.append(target.getConnector()); code.append("("); code.append(value); code.append(");\n"); ! code_creation.append(code); } } + StringBuilder result = new StringBuilder(); + result.append(code_homes); + result.append(code_creation); return result.toString(); } *************** *** 317,333 **** protected String variable_AssemblyInnerComponentInclude() { HashSet<String> include_set = new HashSet<String>(); ! StringBuffer code = new StringBuffer(); ! Map<String, MComponentDef> map = getAssemblyLocalComponents(); ! for (String key : map.keySet()) ! { ! MComponentDef comp_def = map.get(key); ! String inc_name = getLocalCxxIncludeName(comp_def); ! if (!include_set.contains(inc_name)) ! { ! code.append("#include <" + inc_name + "_gen.h>\n"); ! include_set.add(inc_name); ! } ! } return code.toString(); } --- 316,324 ---- protected String variable_AssemblyInnerComponentInclude() { + if (currentAssembly == null) + return ""; HashSet<String> include_set = new HashSet<String>(); ! StringBuilder code = new StringBuilder(); ! // TODO return code.toString(); } *************** *** 358,368 **** } ! protected String variable_AssemblyCcmActivate() { if (currentAssembly == null) return ""; MComponentDef comp_def = (MComponentDef) currentNode; ! StringBuilder activation_code = new StringBuilder(); ! HashSet<String> outer_facets = new HashSet<String>(); for (AssemblyElement e : currentAssembly.getElements()) { --- 349,358 ---- } ! protected String variable_AssemblySingleToMultipleCookieVariable() { if (currentAssembly == null) return ""; MComponentDef comp_def = (MComponentDef) currentNode; ! StringBuilder code = new StringBuilder(); for (AssemblyElement e : currentAssembly.getElements()) { *************** *** 370,392 **** { Connection c = (Connection) e; ! StringBuilder code = generate_AssemblyCcmActivate(c, comp_def, outer_facets); ! activation_code.append(code); } ! else if (e instanceof Attribute) { ! Attribute a = (Attribute) e; ! Port target = a.getTarget(); ! String source = a.getSource(); ! StringBuilder code = new StringBuilder(); ! code.append(TAB2); ! code.append(target.getComponent()); ! code.append("_->"); ! code.append(target.getConnector()); ! code.append("(this->"); ! code.append(source); ! code.append("_);\n"); ! activation_code.append(code); } } for (Object o : comp_def.getFacets()) { --- 360,421 ---- { Connection c = (Connection) e; ! Port source = c.getFacet(); ! if (source.getComponent() == null) ! { ! Port target = c.getReceptacle(); ! String target_comp = target.getComponent(); ! if (target_comp != null) ! { ! String source_name = source.getConnector(); ! MUsesDef outer_receptacle = getReceptacle(comp_def, source_name); ! MComponentDef inner_comp = getAssemblyLocalComponents().get(target_comp); ! String target_name = target.getConnector(); ! MUsesDef inner_receptacle = getReceptacle(inner_comp, target_name); ! boolean outer_multiple = outer_receptacle.isMultiple(); ! boolean inner_multiple = inner_receptacle.isMultiple(); ! if (outer_multiple != inner_multiple) ! { ! code.append(TAB).append("::Components::Cookie "); ! code.append(source_name).append("_;\n"); ! } ! } ! } } ! } ! return code.toString(); ! } ! ! protected String variable_AssemblyImplDefinition() ! { ! if (currentAssembly == null) ! return ""; ! MComponentDef comp_def = (MComponentDef) currentNode; ! StringBuilder provide = new StringBuilder(); ! StringBuilder connect = new StringBuilder(); ! StringBuilder disconnect = new StringBuilder(); ! HashSet<String> outer_facets = new HashSet<String>(); ! for (AssemblyElement e : currentAssembly.getElements()) ! { ! if (e instanceof Connection) { ! Connection c = (Connection) e; ! Port source = c.getFacet(); ! Port target = c.getReceptacle(); ! if (target.getComponent() == null) ! { ! // connect to an outer facet ! String target_name = target.getConnector(); ! outer_facets.add(target_name); ! generateProvideImpl(target_name, source, provide); ! } ! if (source.getComponent() == null) ! { ! // connect from an outer receptacle ! String source_name = source.getConnector(); ! generateConnectionImpl(source_name, target, connect, disconnect); ! } } } + // for (Object o : comp_def.getFacets()) { *************** *** 399,558 **** } } ! Map<String, MComponentDef> map = getAssemblyLocalComponents(); ! for (String key : map.keySet()) { ! activation_code.append(TAB2 + key + "_->configuration_complete();\n"); } ! return activation_code.toString(); } ! private StringBuilder generate_AssemblyCcmActivate( Connection c, MComponentDef comp_def, ! Set<String> outer_facets ) { ! StringBuilder code = new StringBuilder(); ! Port source = c.getFacet(); ! String source_value = getFacetValue(source, comp_def); ! Port target = c.getReceptacle(); String target_name = target.getConnector(); ! if (target.getComponent() == null) { ! // connect to an outer facet ! if (outer_multiple_receptacle_) ! { ! throw new RuntimeException("invalid loop"); ! } ! code.append(TAB2 + "if(" + target_name + "_) {\n"); String real_type = comp_def.getIdentifier() + "_" + target_name + "_impl"; ! code.append(TAB3 + real_type + "* facet = dynamic_cast<" + real_type + "*>(" ! + target_name + "_);\n"); ! code.append(TAB3 + "facet->target = "); ! outer_facets.add(target_name); ! code.append(source_value); ! code.append(";\n" + TAB2 + "}\n"); } else { ! // connect to the receptacle of an inner component ! if (outer_multiple_receptacle_) { ! // TODO ! code.append(TAB2 + "// TODO: multiple receptacle\n"); } else { ! code.append(TAB2); ! code.append(target.getComponent()); ! code.append("_->connect_"); ! code.append(target_name); ! code.append("("); ! code.append(source_value); ! code.append(");\n"); } } ! return code; } ! private static MUsesDef outer_receptacle_; ! ! private static boolean outer_multiple_receptacle_; ! private static String getFacetValue( Port source, MComponentDef comp_def ) { ! outer_receptacle_ = null; ! outer_multiple_receptacle_ = false; ! StringBuilder code = new StringBuilder(); ! String source_name = source.getConnector(); ! if (source.getComponent() == null) { ! // connect from an outer receptacle ! for (Object o : comp_def.getReceptacles()) { ! MUsesDef u = (MUsesDef) o; ! if (u.getIdentifier().equals(source_name)) { ! outer_receptacle_ = u; ! break; } } ! if (outer_receptacle_ == null) { ! throw new RuntimeException("cannot find receptacle: " + source_name); } - outer_multiple_receptacle_ = outer_receptacle_.isMultiple(); - if (outer_multiple_receptacle_) - code.append("ctx->get_connections_"); - else - code.append("ctx->get_connection_"); } ! else { ! // connect from the facet of an inner component ! code.append(source.getComponent()); ! code.append("_->provide_"); } ! code.append(source_name); ! code.append("()"); ! return code.toString(); } ! protected String variable_AssemblyCcmRemove() { - StringBuilder code = new StringBuilder(); Map<String, MComponentDef> map = getAssemblyLocalComponents(); ! for (String key : map.keySet()) { ! code.append(TAB2 + key + "_->remove();\n"); } ! return code.toString(); } ! private String variable_AssemblyDisconnect() { - if (currentAssembly == null) - return ""; StringBuilder code = new StringBuilder(); ! for (AssemblyElement e : currentAssembly.getElements()) { ! if (e instanceof Connection) ! { ! Connection c = (Connection) e; ! Port source = c.getFacet(); ! if (source.getComponent() == null) ! { ! code.append(TAB).append("if(receptacle==\""); ! code.append(source.getConnector()).append("\") {\n"); ! Port target = c.getReceptacle(); ! if (target.getComponent() == null) ! { ! // the user disconnects a receptacle which has been ! // connected to a facet implementation of the assembly ! code.append(TAB2).append("throw ::Components::Exception("); ! code.append("\"cannnot disconnect loop\");\n"); ! } ! else ! { ! // disconnect from inner component ! { ! // calculate 'outer_multiple_receptacle_' ! getFacetValue(source, currentAssembly.getCcmComponent()); ! } ! code.append(TAB2).append("try {\n"); ! if (outer_multiple_receptacle_) ! { ! // TODO disconnect multiple receptacle ! code.append(TAB3 + "// TODO: multiple receptacle\n"); ! } ! else ! { ! code.append(TAB3).append(target.getComponent()); ! code.append("_->disconnect_").append(target.getConnector()); ! code.append("();\n"); ! } ! code.append(TAB2).append("} catch(...) {/* OOPS */}\n"); ! code.append(TAB2).append("return;\n"); ! } ! code.append(TAB).append("}\n"); ! } ! } } return code.toString(); --- 428,623 ---- } } ! // ! StringBuilder c = new StringBuilder(); ! String CLS = comp_def.getIdentifier() + "_impl::"; ! final String O = "::Components::Object::SmartPtr"; ! final String C = "::Components::Cookie"; ! final String N = "::Components::FeatureName"; ! c.append(O + "\n" + CLS + "provide(const std::string& name)\n{\n"); ! c.append(provide); ! c.append(TAB + "throw ::Components::InvalidName();\n"); ! c.append("}\n\n"); ! c.append(C + "\n" + CLS + "connect(const " + N + "& name, " + O + " f)\n{\n"); ! c.append(connect); ! c.append(TAB + "throw ::Components::InvalidName();\n"); ! c.append("}\n\n"); ! c.append("void\n" + CLS + "disconnect(const " + N + "& name, " + C + " const& ck)\n{\n"); ! c.append(disconnect); ! c.append(TAB + "throw ::Components::InvalidName();\n"); ! c.append("}\n\n"); ! return c.toString(); ! } ! ! // connect to an outer facet ! private void generateProvideImpl( String target_name, Port source, StringBuilder code ) ! { ! code.append(TAB + "if(name==\"" + target_name + "\")\n"); ! code.append(TAB + "{\n"); ! if (source.getComponent() == null) { ! // special use case: facet/receptacle loop ! code.append(TAB2 + "return ::Components::Object::SmartPtr();\n"); } ! else ! { ! // connect from an inner facet ! code.append(TAB2 + "return " + source.getComponent()); ! code.append("_->provide_facet(\"" + source.getConnector() + "\");\n"); ! } ! code.append(TAB + "}\n"); } ! // connect from an outer receptacle ! private void generateConnectionImpl( String source_name, Port target, ! StringBuilder connect_code, StringBuilder disconnect_code ) { ! connect_code.append(TAB + "if(name==\"" + source_name + "\")\n"); ! connect_code.append(TAB + "{\n"); ! disconnect_code.append(TAB + "if(name==\"" + source_name + "\")\n"); ! disconnect_code.append(TAB + "{\n"); ! String target_comp = target.getComponent(); String target_name = target.getConnector(); ! MComponentDef comp_def = (MComponentDef) currentNode; ! if (target_comp == null) { ! // special use case: facet/receptacle loop String real_type = comp_def.getIdentifier() + "_" + target_name + "_impl"; ! String impl_code = TAB2 + real_type + "* impl = dynamic_cast<" + real_type + "*>(get_" ! + target_name + "());\n"; ! connect_code.append(impl_code); ! connect_code.append(TAB2 + "impl->target = f;\n"); ! disconnect_code.append(impl_code); ! disconnect_code.append(TAB2 + "impl->target.forget();\n"); } else { ! // connect to an inner receptacle ! MUsesDef outer_receptacle = getReceptacle(comp_def, source_name); ! MComponentDef inner_comp = getAssemblyLocalComponents().get(target_comp); ! MUsesDef inner_receptacle = getReceptacle(inner_comp, target_name); ! boolean outer_multiple = outer_receptacle.isMultiple(); ! boolean inner_multiple = inner_receptacle.isMultiple(); ! if (outer_multiple == inner_multiple) { ! // both receptacles are single or multiple ! connect_code.append(TAB2 + "return " + target_comp + "_->connect(\""); ! connect_code.append(target_name + "\", f);\n"); ! disconnect_code.append(TAB2 + target_comp + "_->disconnect(\""); ! disconnect_code.append(target_name + "\", ck);\n"); ! disconnect_code.append(TAB2 + "return;\n"); } else { ! if (outer_multiple) ! { ! throw new RuntimeException("cannot connect outer multiple receptacle " ! + source_name + " with inner single receptacle " + target_name); ! } ! // connect outer single receptacle with inner multiple receptacle ! connect_code.append(TAB2 + source_name + "_ = "); ! connect_code.append(target_comp + "_->connect(\""); ! connect_code.append(target_name + "\", f);\n"); ! connect_code.append(TAB2 + "return " + source_name + "_;\n"); ! disconnect_code.append(TAB2 + target_comp + "_->disconnect(\""); ! disconnect_code.append(target_name + "\", " + source_name + "_);\n"); ! disconnect_code.append(TAB2 + "return;\n"); } } ! connect_code.append(TAB + "}\n"); ! disconnect_code.append(TAB + "}\n"); } ! private static MUsesDef getReceptacle( MComponentDef comp_def, String name ) ! { ! for (Object o : comp_def.getReceptacles()) ! { ! MUsesDef u = (MUsesDef) o; ! if (u.getIdentifier().equals(name)) ! return u; ! } ! throw new RuntimeException("cannot find receptacle: " + name); ! } ! protected String variable_AssemblyCcmActivate() { ! if (currentAssembly == null) ! return ""; ! StringBuilder activation_code = new StringBuilder(); ! for (AssemblyElement e : currentAssembly.getElements()) { ! if (e instanceof Connection) { ! Connection c = (Connection) e; ! Port source = c.getFacet(); ! Port target = c.getReceptacle(); ! String source_comp = source.getComponent(); ! String target_comp = target.getComponent(); ! if (source_comp != null && target_comp != null) { ! activation_code.append(TAB2); ! activation_code.append(target_comp); ! activation_code.append("_->connect(\""); ! activation_code.append(target.getConnector()); ! activation_code.append("\", "); ! activation_code.append(source_comp); ! activation_code.append("_->provide_facet(\""); ! activation_code.append(source.getConnector()); ! activation_code.append("\"));\n"); } } ! else if (e instanceof Attribute) { ! Attribute a = (Attribute) e; ! activation_code.append(generateCopyAttribute(a, true)); } } ! Map<String, MComponentDef> map = getAssemblyLocalComponents(); ! for (String key : map.keySet()) { ! activation_code.append(TAB2 + key + "_->configuration_complete();\n"); } ! return activation_code.toString(); } ! private StringBuilder generateCopyAttribute( Attribute a, boolean create_block ) { Map<String, MComponentDef> map = getAssemblyLocalComponents(); ! Port target = a.getTarget(); ! String target_comp = target.getComponent(); ! String source = a.getSource(); ! StringBuilder code = new StringBuilder(); ! String target_type = getLocalCxxName(map.get(target_comp), "::") + "*"; ! String HEAD; ! if (create_block) { ! code.append(TAB2 + "{\n"); ! HEAD = TAB3; } ! else ! { ! HEAD = TAB2; ! } ! code.append(HEAD + target_type + " target = dynamic_cast< " + target_type + ">("); ! code.append(target_comp + "_.ptr());\n"); ! code.append(HEAD + "assert(target);\n"); ! code.append(HEAD + "target->"); ! code.append(target.getConnector()); ! code.append("(this->"); ! code.append(source); ! code.append("_);\n"); ! if (create_block) ! { ! code.append(TAB2 + "}\n"); ! } ! return code; } ! protected String variable_AssemblyCcmRemove() { StringBuilder code = new StringBuilder(); ! Map<String, MComponentDef> map = getAssemblyLocalComponents(); ! for (String key : map.keySet()) { ! code.append(TAB2 + key + "_->remove();\n"); } return code.toString(); *************** *** 625,632 **** return variable_AssemblyTargetVariable(); } - if (dataType.equals("AssemblyGetFacetCode")) - { - return variable_AssemblyGetFacetCode(); - } return super.data_MProvidesDef(dataType, dataValue); } --- 690,693 ---- *************** *** 640,676 **** } - protected String variable_AssemblyGetFacetCode() - { - if (currentAssembly == null) - return ""; - MProvidesDef provides = (MProvidesDef) currentNode; - StringBuilder result = new StringBuilder(); - result.append(TAB).append("if(ccm_activate_ok) {\n"); - result.append(TAB2).append("facet->target = "); - result.append(getAssemblyInitFacetTargetValue(provides)).append(";\n"); - result.append(TAB).append("}\n"); - return result.toString(); - } - - private String getAssemblyInitFacetTargetValue( MProvidesDef provides ) - { - String name = provides.getIdentifier(); - for (AssemblyElement e : currentAssembly.getElements()) - { - if (e instanceof Connection) - { - Connection c = (Connection) e; - Port target = c.getReceptacle(); - if (target.getComponent() == null && target.getConnector().equals(name)) - { - MComponentDef comp_def = currentAssembly.getCcmComponent(); - Port source = c.getFacet(); - return getFacetValue(source, comp_def); - } - } - } - throw new RuntimeException("facet " + name + " is not connected to an inner component"); - } - protected String generateOperationImpl( MProvidesDef provides, MOperationDef op ) { --- 701,704 ---- *************** *** 711,714 **** --- 739,743 ---- StringBuilder result = new StringBuilder(); boolean empty = true; + Map<String, MComponentDef> map = getAssemblyLocalComponents(); for (AssemblyElement e : currentAssembly.getElements()) { *************** *** 718,736 **** if (a.getSource().equals(source)) { - Port target = a.getTarget(); - StringBuilder code = new StringBuilder(); - code.append(TAB2); - code.append(target.getComponent()); - code.append("_->"); - code.append(target.getConnector()); - code.append("(this->"); - code.append(source); - code.append("_);\n"); if (empty) { ! result.append(TAB + "if(ccm_activate_ok) {\n"); empty = false; } ! result.append(code); } } --- 747,760 ---- if (a.getSource().equals(source)) { if (empty) { ! result.append(TAB + "if(ccm_activate_ok)\n" + TAB + "{\n"); ! result.append(generateCopyAttribute(a, false)); empty = false; } ! else ! { ! throw new RuntimeException("attribute \"" + source + "\""); ! } } } |
|
From: Robert L. <rle...@us...> - 2007-03-08 13:38:57
|
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11158/src/templates/CppLocalTemplates Modified Files: MProvidesDefAdapterVariableInit MProvidesDefGetFacetPointerInit MComponentDef MUsesDefAdapterDefinition MUsesDefAdapterDefinitionMultiple MProvidesDefAdapterDefinition MUsesDefAdapterVariableInit MProvidesDefGetFacetDefinition MProvidesDefImplRemove Log Message: new prototype Index: MProvidesDefAdapterVariableInit =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefAdapterVariableInit,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MProvidesDefAdapterVariableInit 5 Jan 2007 14:17:25 -0000 1.10 --- MProvidesDefAdapterVariableInit 8 Mar 2007 13:38:50 -0000 1.11 *************** *** 1,5 **** ! %(Identifier)s_facet_impl = local_component->get_%(Identifier)s(); ! %(Identifier)s_facet = %(ProvidesType)s::SmartPtr( ! new %(GenProvidesType)sAdapter(%(Identifier)s_facet_impl)); --- 1,3 ---- ! %(Identifier)s_facet_impl = NULL; Index: MUsesDefAdapterDefinitionMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterDefinitionMultiple,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MUsesDefAdapterDefinitionMultiple 5 Mar 2007 09:21:21 -0000 1.14 --- MUsesDefAdapterDefinitionMultiple 8 Mar 2007 13:38:50 -0000 1.15 *************** *** 7,15 **** throw ::Components::InvalidConnection(); } ! stringstream s; ! s << "CCM_%(Identifier)s:" << %(Identifier)s_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! %(Identifier)s_receptacles.insert(make_pair(ck, f)); ! return ck; } --- 7,24 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Cookie ck = delegator->connect("%(Identifier)s", f); ! %(Identifier)s_receptacles.insert(make_pair(ck, f)); ! return ck; ! } ! else ! { ! std::stringstream s; ! s << "CCM_" "%(Identifier)s" ":" << %(Identifier)s_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! %(Identifier)s_receptacles.insert(make_pair(ck, f)); ! return ck; ! } } *************** *** 22,34 **** throw ::Components::InvalidConnection(); } ! if(%(Identifier)s_receptacles.find(ck) != %(Identifier)s_receptacles.end()) { ! %(UsesType)s::SmartPtr f(%(Identifier)s_receptacles[ck]); %(Identifier)s_receptacles.erase(ck); return f; ! } ! else { ! throw ::Components::InvalidConnection(); } } --- 31,53 ---- throw ::Components::InvalidConnection(); } ! if(delegator) { ! delegator->disconnect("%(Identifier)s", ck); ! %(UsesType)s::SmartPtr f = %(Identifier)s_receptacles[ck]; %(Identifier)s_receptacles.erase(ck); return f; ! } ! else { ! if(%(Identifier)s_receptacles.find(ck) != %(Identifier)s_receptacles.end()) ! { ! %(UsesType)s::SmartPtr f = %(Identifier)s_receptacles[ck]; ! %(Identifier)s_receptacles.erase(ck); ! return f; ! } ! else ! { ! throw ::Components::InvalidConnection(); ! } } } Index: MProvidesDefAdapterDefinition =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefAdapterDefinition,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MProvidesDefAdapterDefinition 5 Jan 2007 14:17:25 -0000 1.10 --- MProvidesDefAdapterDefinition 8 Mar 2007 13:38:50 -0000 1.11 *************** *** 6,9 **** --- 6,24 ---- throw ::Components::InvalidConnection(); } + if(!%(Identifier)s_facet) + { + if(delegator) + { + ::Components::Object::SmartPtr o = delegator->provide("%(Identifier)s"); + if(o) + { + %(Identifier)s_facet.eat(dynamic_cast< %(ProvidesType)s*>(o.ptr())); + return %(Identifier)s_facet; + } + } + %(Identifier)s_facet_impl = local_component->get_%(Identifier)s(); + %(Identifier)s_facet = %(ProvidesType)s::SmartPtr( + new %(GenProvidesType)sAdapter(%(Identifier)s_facet_impl)); + } return %(Identifier)s_facet; } Index: MProvidesDefGetFacetPointerInit =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefGetFacetPointerInit,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MProvidesDefGetFacetPointerInit 21 Feb 2007 16:04:48 -0000 1.1 --- MProvidesDefGetFacetPointerInit 8 Mar 2007 13:38:50 -0000 1.2 *************** *** 1 **** --- 1,2 ---- %(Identifier)s_ = NULL; + Index: MProvidesDefImplRemove =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefImplRemove,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MProvidesDefImplRemove 3 Jan 2007 10:04:22 -0000 1.7 --- MProvidesDefImplRemove 8 Mar 2007 13:38:51 -0000 1.8 *************** *** 1,4 **** ! (dynamic_cast< %(GenProvidesType)sAdapter* >( ! %(Identifier)s_facet.ptr()))->validConnection(false); --- 1,8 ---- ! { ! %(GenProvidesType)sAdapter* a = ! dynamic_cast< %(GenProvidesType)sAdapter* >(%(Identifier)s_facet.ptr()); ! if(a) ! a->validConnection(false); ! } Index: MUsesDefAdapterDefinition =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterDefinition,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MUsesDefAdapterDefinition 5 Mar 2007 09:21:21 -0000 1.14 --- MUsesDefAdapterDefinition 8 Mar 2007 13:38:50 -0000 1.15 *************** *** 7,15 **** throw ::Components::InvalidConnection(); } ! if(%(Identifier)s_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! %(Identifier)s_receptacle = f; } --- 7,22 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! delegator->connect("%(Identifier)s", f); ! } ! else ! { ! if(%(Identifier)s_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! } ! %(Identifier)s_receptacle = f; } *************** *** 22,33 **** throw ::Components::InvalidConnection(); } ! if(!%(Identifier)s_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! // local_component->disconnect("%(Identifier)s"); ! %(UsesType)s::SmartPtr f = %(Identifier)s_receptacle; ! %(Identifier)s_receptacle.forget(); ! return f; } --- 29,46 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! delegator->disconnect("%(Identifier)s"); ! } ! else ! { ! if(!%(Identifier)s_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! } ! %(UsesType)s::SmartPtr f = %(Identifier)s_receptacle; ! %(Identifier)s_receptacle.forget(); ! return f; } Index: MUsesDefAdapterVariableInit =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterVariableInit,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MUsesDefAdapterVariableInit 5 Jan 2007 14:17:25 -0000 1.4 --- MUsesDefAdapterVariableInit 8 Mar 2007 13:38:51 -0000 1.5 *************** *** 1,3 **** - %(Identifier)s_receptacle = %(CCMUsesType)s::SmartPtr(); - --- 1 ---- Index: MProvidesDefGetFacetDefinition =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefGetFacetDefinition,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MProvidesDefGetFacetDefinition 27 Feb 2007 15:19:23 -0000 1.9 --- MProvidesDefGetFacetDefinition 8 Mar 2007 13:38:51 -0000 1.10 *************** *** 6,13 **** %(ComponentType)s_impl::get_%(Identifier)s() { ! %(ComponentType)s_%(Identifier)s_impl* facet = ! new %(ComponentType)s_%(Identifier)s_impl(this); ! %(AssemblyGetFacetCode)s ! %(Identifier)s_ = dynamic_cast< %(CCMProvidesType)s* >(facet); return %(Identifier)s_; } --- 6,15 ---- %(ComponentType)s_impl::get_%(Identifier)s() { ! if(%(Identifier)s_==NULL) ! { ! %(ComponentType)s_%(Identifier)s_impl* facet = ! new %(ComponentType)s_%(Identifier)s_impl(this); ! %(Identifier)s_ = dynamic_cast< %(CCMProvidesType)s* >(facet); ! } return %(Identifier)s_; } Index: MComponentDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** MComponentDef 5 Mar 2007 09:21:21 -0000 1.28 --- MComponentDef 8 Mar 2007 13:38:50 -0000 1.29 *************** *** 95,98 **** --- 95,99 ---- ::Components::Assembly::SmartPtr assembly; bool ValidConnection; + ::Components::ComponentDelegator* delegator; %(MProvidesDefAdapterVariable)s *************** *** 175,179 **** { context = NULL; ! ValidConnection = true; %(MProvidesDefAdapterVariableInit)s %(MUsesDefAdapterVariableInit)s --- 176,181 ---- { context = NULL; ! ValidConnection = local_component!=NULL; ! delegator = dynamic_cast< ::Components::ComponentDelegator*>(local_component); %(MProvidesDefAdapterVariableInit)s %(MUsesDefAdapterVariableInit)s *************** *** 405,409 **** #include <%(ComponentInclude)s_share.h> - %(AssemblyInnerComponentInclude)s %(OpenNamespace)s --- 407,410 ---- *************** *** 427,431 **** %(MAttributeDefVariable)s %(MSupportsDefVariable)s ! %(AssemblyInnerComponentVariable)s bool ccm_activate_ok; --- 428,432 ---- %(MAttributeDefVariable)s %(MSupportsDefVariable)s ! %(AssemblyImplVariable)s bool ccm_activate_ok; *************** *** 479,483 **** #include "%(Identifier)s_impl.h" %(MProvidesDefImplInclude)s ! %(AssemblyInnerHomeInclude)s %(OpenNamespace)s --- 480,484 ---- #include "%(Identifier)s_impl.h" %(MProvidesDefImplInclude)s ! %(AssemblyInnerComponentInclude)s %(OpenNamespace)s |
|
From: Robert L. <rle...@us...> - 2007-03-07 12:48:34
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5618/src/ccmtools/CppGenerator Modified Files: CppGenerator.java Log Message: bug fix: name of multi-receptacle map Index: CppGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppGenerator.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** CppGenerator.java 6 Mar 2007 14:20:40 -0000 1.40 --- CppGenerator.java 7 Mar 2007 12:48:27 -0000 1.41 *************** *** 1022,1031 **** else if (data_type.equals("MultipleReceptacleType")) { ! return create_MultipleReceptacleName(); } else if (data_type.equals("MultipleReceptacleName")) { ! return getLocalCxxNamespace(iface, Text.SCOPE_SEPARATOR) ! + create_MultipleReceptacleName(); } else if (data_type.startsWith("MOperation")) --- 1022,1035 ---- else if (data_type.equals("MultipleReceptacleType")) { ! MUsesDef uses = (MUsesDef) currentNode; ! MComponentDef component = uses.getComponent(); ! return getMultipleReceptacleType(component, uses); } else if (data_type.equals("MultipleReceptacleName")) { ! MUsesDef uses = (MUsesDef) currentNode; ! MComponentDef component = uses.getComponent(); ! return getLocalCxxNamespace(component, Text.SCOPE_SEPARATOR) ! + getMultipleReceptacleType(component, uses); } else if (data_type.startsWith("MOperation")) *************** *** 1046,1053 **** } ! private String create_MultipleReceptacleName() { - MUsesDef uses = (MUsesDef) currentNode; - MComponentDef component = uses.getComponent(); return component.getIdentifier() + "_" + uses.getIdentifier() + "_Connections"; } --- 1050,1055 ---- } ! private static String getMultipleReceptacleType( MComponentDef component, MUsesDef uses ) { return component.getIdentifier() + "_" + uses.getIdentifier() + "_Connections"; } |
|
From: Robert L. <rle...@us...> - 2007-03-06 14:47:11
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_types/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20413/test/CppGenerator/receptacle_types/impl Modified Files: Test_impl.cc Log Message: bug fix: wrong use of local impl. interfaces Index: Test_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/receptacle_types/impl/Test_impl.cc,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Test_impl.cc 5 Jan 2007 14:17:26 -0000 1.16 --- Test_impl.cc 6 Mar 2007 14:47:02 -0000 1.17 *************** *** 2,14 **** /*** * Test component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ --- 2,14 ---- /*** * Test component business logic implementation. ! * ! * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author ! * @version * * This file structure was automatically generated by CCM Tools * <http://ccmtools.sourceforge.net/> and contains a component's ! * implementation classes. ***/ *************** *** 45,50 **** throw ( Components::CCMException ) { ! CCM_TypeTest::SmartPtr type_test = ctx->get_connection_type_test(); ! { // basic types test cases --- 45,50 ---- throw ( Components::CCMException ) { ! ::TypeTest::SmartPtr type_test = ctx->get_connection_type_test(); ! { // basic types test cases *************** *** 54,58 **** assert(short_3 == 3); assert(short_r == 3+7); ! long long_2=3, long_3, long_r; long_r = type_test->op_b2(7,long_2, long_3); --- 54,58 ---- assert(short_3 == 3); assert(short_r == 3+7); ! long long_2=3, long_3, long_r; long_r = type_test->op_b2(7,long_2, long_3); *************** *** 60,64 **** assert(long_3 == 3); assert(long_r == 3+7); ! unsigned short ushort_2=3, ushort_3, ushort_r; ushort_r = type_test->op_b3(7,ushort_2, ushort_3); --- 60,64 ---- assert(long_3 == 3); assert(long_r == 3+7); ! unsigned short ushort_2=3, ushort_3, ushort_r; ushort_r = type_test->op_b3(7,ushort_2, ushort_3); *************** *** 66,70 **** assert(ushort_3 == 3); assert(ushort_r == 3+7); ! unsigned long ulong_2=3, ulong_3, ulong_r; ulong_r = type_test->op_b4(7,ulong_2, ulong_3); --- 66,70 ---- assert(ushort_3 == 3); assert(ushort_r == 3+7); ! unsigned long ulong_2=3, ulong_3, ulong_r; ulong_r = type_test->op_b4(7,ulong_2, ulong_3); *************** *** 72,76 **** assert(ulong_3 == 3); assert(ulong_r == 3+7); ! float float_2=3.0, float_3, float_r; float_r = type_test->op_b5(7.0,float_2, float_3); --- 72,76 ---- assert(ulong_3 == 3); assert(ulong_r == 3+7); ! float float_2=3.0, float_3, float_r; float_r = type_test->op_b5(7.0,float_2, float_3); *************** *** 78,82 **** assert(abs(float_3 - 3.0) < 0.001); assert(abs(float_r - (3.0+7.0)) < 0.001); ! double double_2=3.0, double_3, double_r; double_r = type_test->op_b6(7.0,double_2, double_3); --- 78,82 ---- assert(abs(float_3 - 3.0) < 0.001); assert(abs(float_r - (3.0+7.0)) < 0.001); ! double double_2=3.0, double_3, double_r; double_r = type_test->op_b6(7.0,double_2, double_3); *************** *** 103,107 **** assert(bool_3 == false); assert(bool_r == false && true); ! unsigned char uchar_2=3, uchar_3, uchar_r; uchar_r = type_test->op_b10(7,uchar_2, uchar_3); --- 103,107 ---- assert(bool_3 == false); assert(bool_r == false && true); ! unsigned char uchar_2=3, uchar_3, uchar_r; uchar_r = type_test->op_b10(7,uchar_2, uchar_3); *************** *** 109,113 **** assert(uchar_3 == 3); assert(uchar_r == 3+7); ! } --- 109,113 ---- assert(uchar_3 == 3); assert(uchar_r == 3+7); ! } *************** *** 119,124 **** assert(time_t_3 == 3); assert(time_t_r == 3+7); ! ! // Test case: enum Color {red, green, blue, black, orange}; Color Color_2,Color_3, Color_r; Color_2 = Color(blue); --- 119,124 ---- assert(time_t_3 == 3); assert(time_t_r == 3+7); ! ! // Test case: enum Color {red, green, blue, black, orange}; Color Color_2,Color_3, Color_r; Color_2 = Color(blue); |
|
From: Robert L. <rle...@us...> - 2007-03-06 14:46:30
|
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20375/src/templates/CppLocalTemplates Modified Files: MUsesDefConnectFacet MUsesDefConnectFacetMultiple Log Message: bug fix: wrong use of local impl. interfaces Index: MUsesDefConnectFacetMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefConnectFacetMultiple,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MUsesDefConnectFacetMultiple 5 Jan 2007 14:17:25 -0000 1.4 --- MUsesDefConnectFacetMultiple 6 Mar 2007 14:46:27 -0000 1.5 *************** *** 1,6 **** if(name == "%(Identifier)s") { ! return connect_%(Identifier)s(%(CCMUsesType)s::SmartPtr ! (dynamic_cast< %(CCMUsesType)s*> (connection.ptr()))); } --- 1,6 ---- if(name == "%(Identifier)s") { ! return connect_%(Identifier)s(%(UsesType)s::SmartPtr ! (dynamic_cast< %(UsesType)s*> (connection.ptr()))); } Index: MUsesDefConnectFacet =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefConnectFacet,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MUsesDefConnectFacet 5 Jan 2007 14:17:25 -0000 1.7 --- MUsesDefConnectFacet 6 Mar 2007 14:46:27 -0000 1.8 *************** *** 1,6 **** if(name == "%(Identifier)s") { ! connect_%(Identifier)s(%(CCMUsesType)s::SmartPtr( ! dynamic_cast< %(CCMUsesType)s*> (connection.ptr()))); ::Components::Cookie ck; return ck; --- 1,6 ---- if(name == "%(Identifier)s") { ! connect_%(Identifier)s(%(UsesType)s::SmartPtr( ! dynamic_cast< %(UsesType)s*> (connection.ptr()))); ::Components::Cookie ck; return ck; |
|
From: Robert L. <rle...@us...> - 2007-03-06 14:20:45
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10481/src/ccmtools/CppGenerator Modified Files: CppGenerator.java Log Message: bug fix: name of multi-receptacle map Index: CppGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppGenerator.java,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** CppGenerator.java 1 Mar 2007 15:55:20 -0000 1.39 --- CppGenerator.java 6 Mar 2007 14:20:40 -0000 1.40 *************** *** 1,23 **** /** ! * CCM Tools : C++ Code Generator Library ! * Leif Johnson <le...@am...> ! * Egon Teiniker <ego...@sa...> ! * Copyright (C) 2002 - 2005 Salomon Automation ! * ! * This library is free software; you can redistribute it and/or modify it under ! * the terms of the GNU Lesser General Public License as published by the Free ! * Software Foundation; either version 2.1 of the License, or (at your option) ! * any later version. [...2205 lines suppressed...] ! for (Iterator es = op.getExceptionDefs().iterator(); es.hasNext();) { ! MExceptionDef exception = (MExceptionDef) es.next(); String code = getLocalCxxName(exception, Text.SCOPE_SEPARATOR); ret.add(code); } ! if (ret.size() > 0) { String indent = "\n" + Text.tab(2); ! return "throw(::Components::CCMException," + indent + join("," + indent, ret) + " )"; } ! else { return "throw(::Components::CCMException)"; *************** *** 1246,1248 **** } } - --- 1159,1160 ---- |
|
From: Robert L. <rle...@us...> - 2007-03-06 09:51:59
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote/RemoteComponents In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8070/ccm/remote/RemoteComponents Modified Files: .cvsignore Removed Files: ccmtools.h ccmtools.cc Log Message: files generated by Mico removed --- ccmtools.h DELETED --- Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/RemoteComponents/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 17 Jul 2006 07:31:12 -0000 1.1 --- .cvsignore 6 Mar 2007 09:51:54 -0000 1.2 *************** *** 3,5 **** CCM.cc CCM.h ! ccm_CCM_Remote_RemoteComponents.py \ No newline at end of file --- 3,7 ---- CCM.cc CCM.h ! ccm_CCM_Remote_RemoteComponents.py ! ccmtools.h ! ccmtools.cc \ No newline at end of file --- ccmtools.cc DELETED --- |
|
From: Robert L. <rle...@us...> - 2007-03-05 10:46:18
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30909/test/CppAssembly/prototype1/impl/space Modified Files: Alien_impl.cc Alien_impl.h Log Message: new prototype Index: Alien_impl.h =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/Alien_impl.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Alien_impl.h 5 Mar 2007 10:26:20 -0000 1.6 --- Alien_impl.h 5 Mar 2007 10:46:14 -0000 1.7 *************** *** 28,32 **** { private: ! ::wamas::platform::utils::SmartPtr< ::Components::CCMObject> inner_; ::Components::Cookie Ar6a_; --- 28,32 ---- { private: ! ::Components::CCMObject::SmartPtr inner_; ::Components::Cookie Ar6a_; Index: Alien_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/Alien_impl.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Alien_impl.cc 5 Mar 2007 10:26:20 -0000 1.4 --- Alien_impl.cc 5 Mar 2007 10:46:14 -0000 1.5 *************** *** 142,145 **** --- 142,150 ---- inner_->connect("r2", inner_->provide_facet("p2")); + inner_->connect("r5", inner_->provide_facet("p5a")); + inner_->connect("r5", inner_->provide_facet("p5b")); + + inner_->configuration_complete(); + } catch(...) { throw Components::CCMException(Components::CREATE_ERROR); *************** *** 161,164 **** --- 166,171 ---- try { + inner_->remove(); + } catch(...) { throw Components::CCMException(Components::REMOVE_ERROR); |
|
From: Robert L. <rle...@us...> - 2007-03-05 10:46:18
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30909/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space Modified Files: Alien_gen.cc Log Message: new prototype Index: Alien_gen.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space/Alien_gen.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Alien_gen.cc 5 Mar 2007 10:26:20 -0000 1.5 --- Alien_gen.cc 5 Mar 2007 10:46:14 -0000 1.6 *************** *** 104,108 **** template<typename T> ! void generic_single_connect(T& receptacle, const std::string& name, const T& f, ::Components::ComponentDelegator* delegator) --- 104,108 ---- template<typename T> ! static void generic_single_connect(T& receptacle, const std::string& name, const T& f, ::Components::ComponentDelegator* delegator) *************** *** 134,138 **** template<typename T> ! T generic_single_disconnect(T& receptacle, const std::string& name, ::Components::ComponentDelegator* delegator) --- 134,138 ---- template<typename T> ! static T generic_single_disconnect(T& receptacle, const std::string& name, ::Components::ComponentDelegator* delegator) *************** *** 179,183 **** template<typename MAP, typename T> ! ::Components::Cookie generic_multiple_connect(MAP& receptacles, long& receptacle_counter, const std::string& name, const T& f, --- 179,183 ---- template<typename MAP, typename T> ! static ::Components::Cookie generic_multiple_connect(MAP& receptacles, long& receptacle_counter, const std::string& name, const T& f, *************** *** 212,216 **** template<typename MAP, typename T> ! T generic_multiple_disconnect(MAP& receptacles, const std::string& name, const ::Components::Cookie& ck, --- 212,216 ---- template<typename MAP, typename T> ! static T generic_multiple_disconnect(MAP& receptacles, const std::string& name, const ::Components::Cookie& ck, |
|
From: Robert L. <rle...@us...> - 2007-03-05 10:26:26
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23100/test/CppAssembly/prototype1/impl/space Modified Files: Alien_impl.cc Alien_impl.h Added Files: Alien_Ap10_impl.h Alien_Ap10_impl.cc Log Message: new prototype --- NEW FILE: Alien_Ap10_impl.cc --- /** * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net/> * * ::World::CCM_Data facet class implementation. * * // TODO: WRITE YOUR DESCRIPTION HERE! * * @author * @version **/ #include <cassert> #include <iostream> #include "Alien_Ap10_impl.h" using namespace std; namespace Space { Alien_Ap10_impl::Alien_Ap10_impl( Alien_impl* component_impl) : component(component_impl) { // OPTIONAL : IMPLEMENT ME HERE ! } Alien_Ap10_impl::~Alien_Ap10_impl() { // OPTIONAL : IMPLEMENT ME HERE ! } long Alien_Ap10_impl::work(const std::string& text) throw(::Components::CCMException) { ::World::Data* facet = dynamic_cast< ::World::Data*>(target.ptr()); if(!facet) throw ::Components::CCMException(::Components::SYSTEM_ERROR); return facet->work(text); } } // /namespace Space --- NEW FILE: Alien_Ap10_impl.h --- /* * This file was automatically generated by CCM Tools version 0.9.0 * <http://ccmtools.sourceforge.net/> * * ::World::CCM_Data facet class definition. */ #ifndef __FACET__Space_Ap10__H__ #define __FACET__Space_Ap10__H__ #include <World/Data.h> #include "Alien_impl.h" namespace Space { class Alien_Ap10_impl : virtual public ::World::CCM_Data { public: friend class Alien_impl; protected: Alien_impl* component; ::Components::Object::SmartPtr target; public: Alien_Ap10_impl( Alien_impl* component_impl); virtual ~Alien_Ap10_impl(); virtual long work(const std::string& text) throw(::Components::CCMException); }; } // /namespace Space #endif // __FACET__Space_Ap10__H__ Index: Alien_impl.h =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/Alien_impl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Alien_impl.h 5 Mar 2007 09:21:22 -0000 1.5 --- Alien_impl.h 5 Mar 2007 10:26:20 -0000 1.6 *************** *** 30,33 **** --- 30,36 ---- ::wamas::platform::utils::SmartPtr< ::Components::CCMObject> inner_; + ::Components::Cookie Ar6a_; + ::Components::Cookie Ar6b_; + bool ccm_activate_ok; Index: Alien_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/Alien_impl.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Alien_impl.cc 5 Mar 2007 09:21:22 -0000 1.3 --- Alien_impl.cc 5 Mar 2007 10:26:20 -0000 1.4 *************** *** 41,45 **** return inner_->provide_facet("p1"); } ! // TODO } --- 41,49 ---- return inner_->provide_facet("p1"); } ! if(facet=="Ap10") ! { ! return ::Components::Object::SmartPtr(); ! } ! throw ::Components::InvalidName(); } *************** *** 51,55 **** return inner_->connect("r3", facet); } ! // TODO } --- 55,86 ---- return inner_->connect("r3", facet); } ! if(receptacle=="Ar4") ! { ! return inner_->connect("r4", facet); ! } ! if(receptacle=="Ar10") ! { ! Alien_Ap10_impl* impl = dynamic_cast<Alien_Ap10_impl*>(get_Ap10()); ! impl->target = facet; ! } ! if(receptacle=="Ar6a") ! { ! Ar6a_ = inner_->connect("r6", facet); ! return Ar6a_; ! } ! if(receptacle=="Ar6b") ! { ! Ar6b_ = inner_->connect("r6", facet); ! return Ar6a_; ! } ! if(receptacle=="Ar7a") ! { ! return inner_->connect("r7", facet); ! } ! if(receptacle=="Ar7b") ! { ! return inner_->connect("r7", facet); ! } ! throw ::Components::InvalidName(); } *************** *** 62,66 **** return; } ! // TODO } --- 93,127 ---- return; } ! if(receptacle=="Ar4") ! { ! inner_->disconnect("r4", cookie); ! return; ! } ! if(receptacle=="Ar10") ! { ! Alien_Ap10_impl* impl = dynamic_cast<Alien_Ap10_impl*>(get_Ap10()); ! impl->target.forget(); ! } ! if(receptacle=="Ar6a") ! { ! inner_->disconnect("r6", Ar6a_); ! return; ! } ! if(receptacle=="Ar6b") ! { ! inner_->disconnect("r6", Ar6b_); ! return; ! } ! if(receptacle=="Ar7a") ! { ! inner_->disconnect("r7", cookie); ! return; ! } ! if(receptacle=="Ar7b") ! { ! inner_->disconnect("r7", cookie); ! return; ! } ! throw ::Components::InvalidName(); } *************** *** 79,82 **** --- 140,145 ---- try { + inner_->connect("r2", inner_->provide_facet("p2")); + } catch(...) { throw Components::CCMException(Components::CREATE_ERROR); *************** *** 110,117 **** Alien_impl::get_Ap1() { ! Alien_Ap1_impl* facet = ! new Alien_Ap1_impl(this); ! Ap1_ = dynamic_cast< ::World::CCM_Data* >(facet); return Ap1_; } --- 173,183 ---- Alien_impl::get_Ap1() { ! if(!Ap1_) ! { ! Alien_Ap1_impl* facet = ! new Alien_Ap1_impl(this); ! Ap1_ = dynamic_cast< ::World::CCM_Data* >(facet); ! } return Ap1_; } *************** *** 124,131 **** Alien_impl::get_Ap10() { ! Alien_Ap10_impl* facet = ! new Alien_Ap10_impl(this); ! Ap10_ = dynamic_cast< ::World::CCM_Data* >(facet); return Ap10_; } --- 190,200 ---- Alien_impl::get_Ap10() { ! if(!Ap10_) ! { ! Alien_Ap10_impl* facet = ! new Alien_Ap10_impl(this); ! Ap10_ = dynamic_cast< ::World::CCM_Data* >(facet); ! } return Ap10_; } |
|
From: Robert L. <rle...@us...> - 2007-03-05 10:26:23
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23100/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space Modified Files: Alien_gen.cc Log Message: new prototype Index: Alien_gen.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space/Alien_gen.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Alien_gen.cc 5 Mar 2007 09:21:21 -0000 1.4 --- Alien_gen.cc 5 Mar 2007 10:26:20 -0000 1.5 *************** *** 65,76 **** { ::Components::Object::SmartPtr o = delegator->provide("Ap1"); ! Ap1_facet.eat(dynamic_cast< ::World::Data*>(o.ptr())); ! } ! else ! { ! Ap1_facet_impl = local_component->get_Ap1(); ! Ap1_facet = ::World::Data::SmartPtr( ! new ::ccmtools::local::World::DataAdapter(Ap1_facet_impl)); } } return Ap1_facet; --- 65,77 ---- { ::Components::Object::SmartPtr o = delegator->provide("Ap1"); ! if(o) ! { ! Ap1_facet.eat(dynamic_cast< ::World::Data*>(o.ptr())); ! return Ap1_facet; ! } } + Ap1_facet_impl = local_component->get_Ap1(); + Ap1_facet = ::World::Data::SmartPtr( + new ::ccmtools::local::World::DataAdapter(Ap1_facet_impl)); } return Ap1_facet; *************** *** 89,100 **** { ::Components::Object::SmartPtr o = delegator->provide("Ap10"); ! Ap10_facet.eat(dynamic_cast< ::World::Data*>(o.ptr())); ! } ! else ! { ! Ap10_facet_impl = local_component->get_Ap10(); ! Ap10_facet = ::World::Data::SmartPtr( ! new ::ccmtools::local::World::DataAdapter(Ap10_facet_impl)); } } return Ap10_facet; --- 90,102 ---- { ::Components::Object::SmartPtr o = delegator->provide("Ap10"); ! if(o) ! { ! Ap10_facet.eat(dynamic_cast< ::World::Data*>(o.ptr())); ! return Ap10_facet; ! } } + Ap10_facet_impl = local_component->get_Ap10(); + Ap10_facet = ::World::Data::SmartPtr( + new ::ccmtools::local::World::DataAdapter(Ap10_facet_impl)); } return Ap10_facet; |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:26:23
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local/LocalComponents In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/ccm/local/LocalComponents Modified Files: ccmtools.h Added Files: ComponentDelegator.cc Log Message: new prototype Index: ccmtools.h =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/LocalComponents/ccmtools.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ccmtools.h 5 Jan 2007 14:09:35 -0000 1.1 --- ccmtools.h 5 Mar 2007 09:25:47 -0000 1.2 *************** *** 79,83 **** class HomeNotFound ! : public Exception { public: --- 79,83 ---- class HomeNotFound ! : public Exception { public: *************** *** 172,176 **** RemoveFailure(const FailureReason reason) throw(); virtual ~RemoveFailure() throw(); ! private: FailureReason reason_; --- 172,176 ---- RemoveFailure(const FailureReason reason) throw(); virtual ~RemoveFailure() throw(); ! private: FailureReason reason_; *************** *** 198,202 **** CCMException(const CCMExceptionReason reason) throw(); virtual ~CCMException() throw(); ! private: CCMExceptionReason reason_; --- 198,202 ---- CCMException(const CCMExceptionReason reason) throw(); virtual ~CCMException() throw(); ! private: CCMExceptionReason reason_; *************** *** 237,241 **** public: typedef wamas::platform::utils::SmartPtr<EnterpriseComponent> SmartPtr; ! virtual ~EnterpriseComponent() {} }; --- 237,241 ---- public: typedef wamas::platform::utils::SmartPtr<EnterpriseComponent> SmartPtr; ! virtual ~EnterpriseComponent() {} }; *************** *** 260,269 **** { public: ! typedef wamas::platform::utils::SmartPtr<CCMHome> SmartPtr; virtual ~CCMHome() {} virtual void remove_component(wamas::platform::utils::SmartPtr<CCMObject> component) ! throw(CCMException, RemoveFailure) = 0; }; --- 260,269 ---- { public: ! typedef wamas::platform::utils::SmartPtr<CCMHome> SmartPtr; virtual ~CCMHome() {} virtual void remove_component(wamas::platform::utils::SmartPtr<CCMObject> component) ! throw(CCMException, RemoveFailure) = 0; }; *************** *** 280,285 **** { public: ! typedef wamas::platform::utils::SmartPtr<KeylessCCMHome> SmartPtr; ! virtual ~KeylessCCMHome() {} --- 280,285 ---- { public: ! typedef wamas::platform::utils::SmartPtr<KeylessCCMHome> SmartPtr; ! virtual ~KeylessCCMHome() {} *************** *** 299,303 **** typedef wamas::platform::utils::SmartPtr<HomeExecutorBase> SmartPtr; ! virtual ~HomeExecutorBase() {} }; --- 299,303 ---- typedef wamas::platform::utils::SmartPtr<HomeExecutorBase> SmartPtr; ! virtual ~HomeExecutorBase() {} }; *************** *** 333,337 **** * Note: this method is NOT defined in the CCM specification!! */ ! virtual void unregister_home(const std::string& home_name) = 0; }; --- 333,337 ---- * Note: this method is NOT defined in the CCM specification!! */ ! virtual void unregister_home(const std::string& home_name) = 0; }; *************** *** 353,357 **** static HomeFinder* Instance(); static void destroy(); ! virtual ~HomeFinder() {} --- 353,357 ---- static HomeFinder* Instance(); static void destroy(); ! virtual ~HomeFinder() {} *************** *** 364,377 **** virtual CCMHome::SmartPtr find_home_by_type(const std::string& home_repid) throw(HomeNotFound); ! ! // Methods defined in Components::HomeRegistration virtual void register_home(CCMHome::SmartPtr home_ref, const std::string& home_name); virtual void unregister_home(CCMHome::SmartPtr home_ref); ! virtual void unregister_home(const std::string& home_name); ! protected: ! static HomeFinder* instance_; HomePoolMap HomePool; ! HomeFinder() {}; }; --- 364,377 ---- virtual CCMHome::SmartPtr find_home_by_type(const std::string& home_repid) throw(HomeNotFound); ! ! // Methods defined in Components::HomeRegistration virtual void register_home(CCMHome::SmartPtr home_ref, const std::string& home_name); virtual void unregister_home(CCMHome::SmartPtr home_ref); ! virtual void unregister_home(const std::string& home_name); ! protected: ! static HomeFinder* instance_; HomePoolMap HomePool; ! HomeFinder() {}; }; *************** *** 397,401 **** virtual ~CCMContext() {} ! virtual HomeExecutorBase* get_CCM_home() = 0; }; --- 397,401 ---- virtual ~CCMContext() {} ! virtual HomeExecutorBase* get_CCM_home() = 0; }; *************** *** 412,416 **** { public: ! typedef wamas::platform::utils::SmartPtr<SessionContext> SmartPtr; virtual ~SessionContext() {} --- 412,416 ---- { public: ! typedef wamas::platform::utils::SmartPtr<SessionContext> SmartPtr; virtual ~SessionContext() {} *************** *** 423,427 **** ***/ virtual Object* get_CCM_object() ! throw (IllegalState) = 0; }; --- 423,427 ---- ***/ virtual Object* get_CCM_object() ! throw (IllegalState) = 0; }; *************** *** 443,447 **** { public: ! typedef wamas::platform::utils::SmartPtr<SessionComponent> SmartPtr; virtual ~SessionComponent() {} --- 443,447 ---- { public: ! typedef wamas::platform::utils::SmartPtr<SessionComponent> SmartPtr; virtual ~SessionComponent() {} *************** *** 474,478 **** */ virtual void ccm_remove() ! throw (CCMException) = 0; }; --- 474,478 ---- */ virtual void ccm_remove() ! throw (CCMException) = 0; }; *************** *** 489,494 **** { public: ! typedef wamas::platform::utils::SmartPtr<SessionSynchronisation> SmartPtr; ! virtual ~SessionSynchronisation() {} --- 489,494 ---- { public: ! typedef wamas::platform::utils::SmartPtr<SessionSynchronisation> SmartPtr; ! virtual ~SessionSynchronisation() {} *************** *** 523,527 **** { public: ! typedef wamas::platform::utils::SmartPtr<Navigation> SmartPtr; virtual ~Navigation() {} --- 523,527 ---- { public: ! typedef wamas::platform::utils::SmartPtr<Navigation> SmartPtr; virtual ~Navigation() {} *************** *** 534,538 **** */ virtual Object::SmartPtr provide_facet(const std::string& name) ! throw(InvalidName) = 0; }; --- 534,538 ---- */ virtual Object::SmartPtr provide_facet(const std::string& name) ! throw(InvalidName) = 0; }; *************** *** 556,560 **** virtual ~Cookie(); bool operator< (const Cookie& ck) const; ! protected: virtual OctetSeq cookieValue() const; --- 556,560 ---- virtual ~Cookie(); bool operator< (const Cookie& ck) const; ! protected: virtual OctetSeq cookieValue() const; *************** *** 577,581 **** { public: ! typedef wamas::platform::utils::SmartPtr<Receptacles> SmartPtr; virtual ~Receptacles() {} --- 577,581 ---- { public: ! typedef wamas::platform::utils::SmartPtr<Receptacles> SmartPtr; virtual ~Receptacles() {} *************** *** 592,596 **** throw(InvalidName, InvalidConnection, AlreadyConnected, ExceededConnectionLimit) = 0; ! /* * Simplex receptacle: the operation will disassociate any object * reference currently connected to the receptacle - the cookie --- 592,596 ---- throw(InvalidName, InvalidConnection, AlreadyConnected, ExceededConnectionLimit) = 0; ! /* * Simplex receptacle: the operation will disassociate any object * reference currently connected to the receptacle - the cookie *************** *** 600,604 **** */ virtual void disconnect(const FeatureName& name, const Cookie& ck) ! throw(InvalidName, InvalidConnection, CookieRequired, NoConnection) = 0; }; --- 600,604 ---- */ virtual void disconnect(const FeatureName& name, const Cookie& ck) ! throw(InvalidName, InvalidConnection, CookieRequired, NoConnection) = 0; }; *************** *** 615,619 **** { public: ! typedef wamas::platform::utils::SmartPtr<CCMObject> SmartPtr; virtual ~CCMObject() {} --- 615,619 ---- { public: ! typedef wamas::platform::utils::SmartPtr<CCMObject> SmartPtr; virtual ~CCMObject() {} *************** *** 641,645 **** */ virtual void remove() ! throw(RemoveFailure) = 0; }; --- 641,645 ---- */ virtual void remove() ! throw(RemoveFailure) = 0; }; *************** *** 742,746 **** * Note: This is an CCM extension to support nested components. */ ! virtual void configuration_complete() = 0; }; --- 742,746 ---- * Note: This is an CCM extension to support nested components. */ ! virtual void configuration_complete() = 0; }; *************** *** 750,755 **** { public: ! typedef wamas::platform::utils::SmartPtr<AssemblyFactory> SmartPtr; ! virtual ~AssemblyFactory() {} --- 750,755 ---- { public: ! typedef wamas::platform::utils::SmartPtr<AssemblyFactory> SmartPtr; ! virtual ~AssemblyFactory() {} *************** *** 773,777 **** Assembly::SmartPtr assembly(new T()); return assembly; ! } }; --- 773,795 ---- Assembly::SmartPtr assembly(new T()); return assembly; ! } ! }; ! ! ! /** ! @interface ComponentDelegator ! */ ! class ComponentDelegator ! { ! public: ! virtual ~ComponentDelegator() {} ! ! typedef std::map<Cookie, Object::SmartPtr> Connections; ! ! virtual Object::SmartPtr provide(const std::string& facet) = 0; ! virtual Cookie connect(const FeatureName& receptacle, Object::SmartPtr facet) = 0; ! virtual void disconnect(const FeatureName& receptacle, const Cookie& cookie) = 0; ! ! void disconnect(const FeatureName& receptacle); }; --- NEW FILE: ComponentDelegator.cc --- #include "ccmtools.h" namespace Components { void ComponentDelegator::disconnect(const FeatureName& receptacle) { static Cookie dummy; this->disconnect(receptacle, dummy); } } // /namespace Components |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:26:22
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/ccm/remote Modified Files: Confix2.pkg Log Message: new prototype Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/Confix2.pkg,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.8 --- Confix2.pkg 5 Mar 2007 09:25:47 -0000 1.9 *************** *** 1,2 **** PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.7') --- 1,2 ---- PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.9.0') |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:26:22
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/ccm/local Modified Files: Confix2.pkg Log Message: new prototype Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/Confix2.pkg,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.8 --- Confix2.pkg 5 Mar 2007 09:25:47 -0000 1.9 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.7') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.9.0') |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:26:21
|
Update of /cvsroot/ccmtools/cpp-environment/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/utils Modified Files: Confix2.pkg Log Message: new prototype Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/utils/Confix2.pkg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.2 --- Confix2.pkg 5 Mar 2007 09:25:47 -0000 1.3 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.7') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.9.0') |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:25:54
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote/RemoteComponents In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/ccm/remote/RemoteComponents Modified Files: ccmtools.h ccmtools.cc Log Message: new prototype Index: ccmtools.h =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/RemoteComponents/ccmtools.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ccmtools.h 23 Jan 2007 10:55:09 -0000 1.3 --- ccmtools.h 5 Mar 2007 09:25:50 -0000 1.4 *************** *** 1,5 **** /* * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2006 by The Mico Team * * This file was automatically generated. DO NOT EDIT! --- 1,5 ---- /* * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2003 by The Mico Team * * This file was automatically generated. DO NOT EDIT! Index: ccmtools.cc =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/RemoteComponents/ccmtools.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ccmtools.cc 23 Jan 2007 10:55:10 -0000 1.3 --- ccmtools.cc 5 Mar 2007 09:25:50 -0000 1.4 *************** *** 1,10 **** /* * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2006 by The Mico Team * * This file was automatically generated. DO NOT EDIT! */ ! #include <ccmtools.h> --- 1,10 ---- /* * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2003 by The Mico Team * * This file was automatically generated. DO NOT EDIT! */ ! #include "ccmtools.h" |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:25:54
|
Update of /cvsroot/ccmtools/cpp-environment/externals In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/externals Modified Files: Confix2.pkg Log Message: new prototype Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/externals/Confix2.pkg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.3 --- Confix2.pkg 5 Mar 2007 09:25:50 -0000 1.4 *************** *** 1,3 **** PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.7') --- 1,3 ---- PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.9.0') |
|
From: Robert L. <rle...@us...> - 2007-03-05 09:25:53
|
Update of /cvsroot/ccmtools/cpp-environment/ccm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32019/ccm Modified Files: Confix2.pkg Log Message: new prototype Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/Confix2.pkg,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Confix2.pkg 13 Feb 2007 09:48:46 -0000 1.8 --- Confix2.pkg 5 Mar 2007 09:25:47 -0000 1.9 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.7') --- 1,2 ---- PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.9.0') |
1 message has been excluded from this view by a project administrator.
