Attachment #27113 for bug #46081

View | Details | Raw Unified | Return to bug 46081
Collapse All | Expand All





void
IDLType::writeUnionAccessors(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
									IDLTypedef const *activeTypedef ) const{
	string typespec,dcl;
	getCPPStubDeclarator(IDL_PARAM_IN,"",typespec,dcl,activeTypedef);
	ostr


void
IDLType::writeUnionModifiers(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
									IDLTypedef const *activeTypedef ) const{
	string typespec,dcl;
	getCPPStubDeclarator(IDL_PARAM_IN,"param",typespec,dcl,activeTypedef);
	ostr


void
IDLType::writeUnionReferents(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
							IDLTypedef const *activeTypedef ) const{
}

IDLType const &


	// misc stuff
	void getCPPMemberDeclarator(string const &id,string &typespec,string &dcl,
								IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeTypedef(ostream &ostr,Indent &indent,IDLCompilerState &state,
					  IDLElement &dest,IDLScope const &scope,
					  IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}

	// struct / exception stuff
	void getCPPStructCtorDeclarator(string const &id,string &typespec, string &dcl,
									IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeCPPStructCtor(ostream &ostr,Indent &indent,string const &id,
							IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeCPPStructPacker(ostream &ostr,Indent &indent,string const &id,
							  IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeCPPStructUnpacker(ostream &ostr,Indent &indent,string const &id,
								IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	

	}
	void writeCPPStubMarshalCode(IDL_param_attr attr,string const &id,
								 ostream &ostr, Indent &indent,
								 IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	string getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeCPPStubDemarshalCode(IDL_param_attr attr,string const &id,
								   ostream &ostr,Indent &indent,
								   IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}

	// stub return stuff
	void getCPPStubReturnDeclarator(string const &id,string &typespec, string &dcl,
									IDLTypedef const *activeTypedef ) const {
		typespec = "void";
		dcl = id;
	}
	void writeCPPStubReturnPrepCode(ostream &ostr,Indent &indent,
									IDLTypedef const *activeTypedef ) const {
	}
	string getCPPStubReturnAssignment() const {
		return "";
	}
	void writeCPPStubReturnDemarshalCode(ostream &ostr,Indent &indent,
										 IDLTypedef const *activeTypedef ) const {
	}

	// skel stuff
	void getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
							IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeCPPSkelDemarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
								   IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	string getCPPSkelParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}
	void writeCPPSkelMarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
								 IDLTypedef const *activeTypedef ) const {
		throw IDLExVoid();
	}

	// skel return stuff
	void getCSkelReturnDeclarator(string const &id,string &typespec,string &dcl,
								  IDLTypedef const *activeTypedef ) const {
		typespec = "void";
		dcl = id;
	}
	void writeCPPSkelReturnPrepCode(ostream &ostr,Indent &indent,bool passthru,
									IDLTypedef const *activeTypedef ) const {
	}
	string getCPPSkelReturnAssignment(bool passthru,
									  IDLTypedef const *activeTypedef ) const {
		return "";
	}
	void writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
									   IDLTypedef const *activeTypedef ) const {
	}
	string getInvalidReturn() const {
		return "return;";

	
	// misc stuff
	void getCPPMemberDeclarator(string const &id,string &typespec,string &dcl,
								IDLTypedef const *activeTypedef ) const {
		typespec = IDL_CORBA_NS "::String_mgr";
		dcl = id;
	}
	void writeTypedef(ostream &ostr,Indent &indent,IDLCompilerState &state,
					  IDLElement &dest,IDLScope const &scope,
					  IDLTypedef const *activeTypedef ) const {
		ostr
		<< indent << "typedef char *" << ' '
		<< dest.getCPPIdentifier() << ';' << endl;


	// struct / exception stuff
	void getCPPStructCtorDeclarator(string const &id,string &typespec,string &dcl,
									IDLTypedef const *activeTypedef ) const {
		typespec = "char const";
		dcl = "*_par_" + id;
	}
	void writeCPPStructCtor(ostream &ostr,Indent &indent,string const &id,
							IDLTypedef const *activeTypedef ) const {
		ostr << indent << id << " = _par_" << id << ';' << endl;
	}
	void writeCPPStructPacker(ostream &ostr,Indent &indent,string const &id,
							  IDLTypedef const *activeTypedef ) const {
		ostr << indent << "_cstruct." << id
		<< " = " IDL_CORBA_NS "::string_dup("<< id << ");" << endl;
	}
	void writeCPPStructUnpacker(ostream &ostr,Indent &indent,string const &id,
								IDLTypedef const *activeTypedef ) const {
		ostr << indent << id
		<< " = " IDL_CORBA_NS "::string_dup(_cstruct." << id << ");" << endl;
	}

	
	void
	writeUnionModifiers(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
					  IDLTypedef const *activeTypedef ) const{
		ostr
		<< indent << "void " << id << "(char const *param){" << endl;
		ostr

  
	void
	writeUnionAccessors(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
					  IDLTypedef const *activeTypedef ) const{
		ostr
		<< indent << "char const *" << id << "() const {" << endl;
		ostr

		}
	}
	string getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
		switch (attr) {
		case IDL_PARAM_INOUT:
			return "&"+id;


	// stub return stuff
	void getCPPStubReturnDeclarator(string const &id,string &typespec,string &dcl,
									IDLTypedef const *activeTypedef ) const {
		typespec = "char";
		dcl = "*" + id;
	}
	void writeCPPStubReturnPrepCode(ostream &ostr,Indent &indent,
									IDLTypedef const *activeTypedef ) const {
		ostr << indent << "char *_retval = NULL;" << endl;
	}
	string getCPPStubReturnAssignment() const {
		return "_retval = ";
	}
	void writeCPPStubReturnDemarshalCode(ostream &ostr,Indent &indent,
										 IDLTypedef const *activeTypedef ) const {
		ostr << indent << "return _retval;" << endl;
	}

	// skel stuff
	void getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
							IDLTypedef const *activeTypedef ) const {
		typespec = attr == IDL_PARAM_IN ? "char const" : "char";
		dcl = attr == IDL_PARAM_IN ? "*"+id : "**"+id;
	}
	string getCPPSkelParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
		return attr == IDL_PARAM_IN ? id : "*"+id;
	}

	// skel return stuff
	void getCSkelReturnDeclarator(string const &id,string &typespec,string &dcl,
								  IDLTypedef const *activeTypedef ) const {
		typespec = "char";
		dcl = "*"+id;
	}
	void writeCPPSkelReturnPrepCode(ostream &ostr,Indent &indent,bool passthru,
									IDLTypedef const *activeTypedef ) const {
		ostr << indent << "char *_retval = NULL;" << endl;
	}
	string getCPPSkelReturnAssignment(bool passthru,
									  IDLTypedef const *activeTypedef ) const {
		return "_retval = ";
	}
	void writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
									   IDLTypedef const *activeTypedef ) const {
		ostr << indent << "return _retval;" << endl;
	}
	string getInvalidReturn() const {

		return true;
	}
	void getCPPStructCtorDeclarator(string const &id,string &typespec,string &dcl,
									IDLTypedef const *activeTypedef ) const {
		typespec = "const " + getTypeName() + "&";
		dcl = "_par_" + id;
	}
	void writeCPPStructCtor(ostream &ostr,Indent &indent,string const &id,
							IDLTypedef const *activeTypedef ) const {
		ostr << indent << id << " = _par_" << id << ';' << endl;
	}
	void getCPPStubDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,

		}
	}
	string getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
		string retval;
		switch (attr) {
		case IDL_PARAM_IN:


	// stub return stuff
	void getCPPStubReturnDeclarator(string const &id,string &typespec,string &dcl,
									IDLTypedef const *activeTypedef ) const {
		typespec = IDL_CORBA_NS "::Any";
		dcl = "*" + id;
	}
	void writeCPPStubReturnPrepCode(ostream &ostr,Indent &indent,
									IDLTypedef const *activeTypedef ) const {
		ostr << indent << "CORBA_any *_retval = NULL;" << endl;
	}
	string getCPPStubReturnAssignment() const {
		return "_retval = ";
	}
	void writeCPPStubReturnDemarshalCode(ostream &ostr,Indent &indent,
										 IDLTypedef const *activeTypedef ) const {
		ostr << indent << "return " 
			<< idlGetCast("_retval", IDL_CORBA_NS "::Any*" ) << ";" << endl;
	}

	// skel stuff
	void getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
							IDLTypedef const *activeTypedef ) const {
		switch( attr ) {
		case IDL_PARAM_IN:
			typespec = "const CORBA_any";

		}
	}
	string getCPPSkelParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
		switch(attr) {
		case IDL_PARAM_IN:
			return idlGetCast("*"+id, "const " IDL_CORBA_NS "::Any&");


	// skel return stuff
	void getCSkelReturnDeclarator(string const &id,string &typespec,string &dcl,
								  IDLTypedef const *activeTypedef ) const {
		typespec = "CORBA_any";
		dcl = "*"+id;
	}
	void writeCPPSkelReturnPrepCode(ostream &ostr,Indent &indent,bool passthru,
									IDLTypedef const *activeTypedef ) const {
		ostr << indent << IDL_CORBA_NS "::Any *_retval = NULL;" << endl;
	}
	string getCPPSkelReturnAssignment(bool passthru,
									  IDLTypedef const *activeTypedef ) const {
		return "_retval = ";
	}
	void writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
									   IDLTypedef const *activeTypedef ) const {
		ostr << indent << "return " 
			<< idlGetCast( "_retval", "CORBA_any*") << ";" << endl;
	}


void
IDLArray::getCPPMemberDeclarator(string const &id,string &typespec,string &dcl,
							IDLTypedef const *activeTypedef ) const {
	if( activeTypedef ) {
		typespec = activeTypedef->getQualifiedCPPIdentifier(activeTypedef->getRootScope());
		dcl = id;

void
IDLArray::writeTypedef(ostream &ostr,Indent &indent,IDLCompilerState &state,
					   IDLElement &dest,IDLScope const &scope,
					   IDLTypedef const *activeTypedef ) const {

	string typespec,dcl,str_static="";
	m_elementType.getCPPMemberDeclarator("",typespec,dcl);


void
IDLArray::getCPPStructCtorDeclarator(string const &id,string &typespec,string &dcl,
										IDLTypedef const *activeTypedef ) const {
	getCPPMemberDeclarator(id, typespec, dcl, activeTypedef);
	typespec = "const " + typespec;
	dcl = "_par_" + dcl;


void
IDLArray::writeCPPStructCtor(ostream &ostr,Indent &indent,string const &id,
								IDLTypedef const *activeTypedef ) const {
	if(activeTypedef) {
		ostr 
		<< indent << activeTypedef->getQualifiedCPPIdentifier() << "_copy("


void
IDLArray::writeCPPStructPacker(ostream &ostr,Indent &indent,string const &id,
								  IDLTypedef const *activeTypedef ) const {
	if( activeTypedef ) {
		ostr 
		<< indent << activeTypedef->getQualifiedCPPIdentifier() << "_copy("


void
IDLArray::writeCPPStructUnpacker(ostream &ostr,Indent &indent,string const &id,
									IDLTypedef const *activeTypedef ) const {
	if( activeTypedef ) {
		ostr 
		<< indent << activeTypedef->getQualifiedCPPIdentifier() << "_copy("


void
IDLArray::writeUnionModifiers(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
									IDLTypedef const *activeTypedef ) const{
	string typespec,dcl;
	getCPPStubDeclarator(IDL_PARAM_IN,"param",typespec,dcl,activeTypedef);
	ostr


void
IDLArray::writeUnionAccessors(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
									IDLTypedef const *activeTypedef ) const{
	string typespec,dcl;
	g_assert(activeTypedef);
	getCPPStubDeclarator(IDL_PARAM_IN,"",typespec,dcl,activeTypedef);


void
IDLArray::writeUnionReferents(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
							IDLTypedef const *activeTypedef ) const{
	string typespec,dcl;
	g_assert(activeTypedef);
	getCPPStubDeclarator(IDL_PARAM_IN,"",typespec,dcl,activeTypedef);

// stub stuff
void
IDLArray::getCPPStubDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
							  IDLTypedef const *activeTypedef) const {
	typespec = attr == IDL_PARAM_IN ? "const " : "";
	typespec += activeTypedef ?
		activeTypedef->getQualifiedCPPIdentifier() : getTypeName();


void
IDLArray::getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
							IDLTypedef const *activeTypedef ) const {
	g_assert(activeTypedef);
	typespec = attr == IDL_PARAM_IN ? "const " : "";
	typespec += activeTypedef->getNSScopedCTypeName();


void
IDLArray::getCPPStubReturnDeclarator(string const &id,string &typespec,string &dcl,
									 IDLTypedef const *activeTypedef ) const {
	g_assert(activeTypedef);
	typespec = activeTypedef->getQualifiedCPPIdentifier() + "_slice";
	dcl = "*" + id;


void
IDLArray::getCSkelReturnDeclarator(string const &id,string &typespec,string &dcl,
								  IDLTypedef const *activeTypedef ) const {
	g_assert(activeTypedef);
	typespec = activeTypedef->getNSScopedCTypeName() + "_slice";
	dcl = "*" + id;


string
IDLArray::getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
	string typespec,dcl;
	getCSkelDeclarator(attr,"",typespec,dcl,activeTypedef);
	


string
IDLArray::getCPPSkelParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
	string typespec,dcl;
	getCPPStubDeclarator(attr,"",typespec,dcl,activeTypedef);
	string term;

void 
IDLInterface::writeTypedef(ostream &ostr,Indent &indent,IDLCompilerState &state,
						   IDLElement &dest,IDLScope const &scope,
						   IDLTypedef const *activeTypedef ) const {
	string id = dest.getCPPIdentifier();
	ostr
	<< indent << "typedef " << getCPPIdentifier() << ' ' << id << ';' << endl


void 
IDLInterface::writeCPPStructPacker(ostream &ostr,Indent &indent,string const &id,
								      IDLTypedef const *activeTypedef ) const {
	ostr
	<< indent << IDL_IMPL_NS "::release_guarded(_cstruct." << id << ");" << endl
	<< indent << "_cstruct." << id << " = "


void 
IDLInterface::writeCPPStructUnpacker(ostream &ostr,Indent &indent,string const &id,
									    IDLTypedef const *activeTypedef ) const {
	ostr
	<< id << " = " 
	<< getQualifiedCPPCast(IDL_IMPL_NS "::duplicate_guarded(_cstruct."+id+")")


void 
IDLInterface::getCPPStubDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
								   IDLTypedef const *activeTypedef) const {
	dcl = id;

	switch (attr) {


string 
IDLInterface::getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
									  IDLTypedef const *activeTypedef ) const {
	string ctype = getNSScopedCTypeName();

	switch (attr) {


void
IDLInterface::writeCPPStubReturnDemarshalCode(ostream &ostr,Indent &indent,
											  IDLTypedef const *activeTypedef ) const {
	// must return stub ptr and not ptr in order to work when smart pointers are used
	ostr
		<< indent << "return reinterpret_cast< " << getQualifiedCPPStub() << " *>(_retval);" << endl;


void 
IDLInterface::getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
								 IDLTypedef const *activeTypedef ) const {
	typespec = getNSScopedCTypeName();

	switch (attr) {


void 
IDLInterface::writeCPPSkelDemarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
										IDLTypedef const *activeTypedef ) const {
	switch (attr) {
	case IDL_PARAM_IN:
		ostr


void 
IDLInterface::writeCPPSkelMarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
									  IDLTypedef const *activeTypedef ) const {
	string ptrname = " _" + id + "_ptr";
	switch (attr) {
	case IDL_PARAM_INOUT:


void
IDLInterface::writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
									   IDLTypedef const *activeTypedef ) const {
	if (passthru)
		ostr << indent << "return _retval;" << endl;
	else {

		return "CORBA::Object";
	}
	
	virtual string getQualifiedCPPStub(IDLScope const *up_to ) const {
		// fixme - doesn't do the scope thing
		return "CORBA::Object";
	}

		return "CORBA::Object_out";
	}

	virtual string getQualifiedCPP_ptr(IDLScope const *up_to ) const {
		return "CORBA::Object_ptr";
	}
	virtual string getQualifiedCPP_var(IDLScope const *up_to ) const {
		return "CORBA::Object_var";
	}
	virtual string getQualifiedCPP_mgr(IDLScope const *up_to ) const {
		return "CORBA::Object_mgr";
	}
	virtual string getQualifiedCPP_out(IDLScope const *up_to ) const {
		return "CORBA::Object_out";
	}


		return "CORBA::TypeCode";
	}
	
	virtual string getQualifiedCPPStub(IDLScope const *up_to ) const {
		// fixme - doesn't do the scope thing
		return "CORBA::TypeCode";
	}

		return "CORBA::TypeCode_out";
	}

	virtual string getQualifiedCPP_ptr(IDLScope const *up_to ) const {
		return "CORBA::TypeCode_ptr";
	}
	virtual string getQualifiedCPP_var(IDLScope const *up_to ) const {
		return "CORBA::TypeCode_var";
	}
	virtual string getQualifiedCPP_mgr(IDLScope const *up_to ) const {
		return "CORBA::TypeCode_mgr";
	}
	virtual string getQualifiedCPP_out(IDLScope const *up_to ) const {
		return "CORBA::TypeCode_out";
	}

	void
	writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
								  IDLTypedef const *activeTypedef ) const {
		ostr << indent << "return reinterpret_cast< " << getNSScopedCTypeName() << ">(_retval);" << endl;		
	}



void
IDLStruct::getCPPMemberDeclarator(string const &id,string &typespec,string &dcl,
								  IDLTypedef const *activeTypedef ) const {
	typespec = getQualifiedCPPIdentifier(getRootScope());
	dcl = id;
};

void
IDLStruct::writeTypedef(ostream &ostr,Indent &indent,IDLCompilerState &state,
						IDLElement &dest,IDLScope const &scope,
						IDLTypedef const *activeTypedef ) const {
	ostr
	<< indent << "typedef " << getQualifiedCPPIdentifier()
	<< " " << dest.getCPPIdentifier() << ";" << endl;


void
IDLStruct::getCPPStructCtorDeclarator(string const &id,string &typespec,string &dcl,
									  IDLTypedef const *activeTypedef ) const {
	ORBITCPP_NYI("struct getCPPStructCtorDeclarator");
}

void
IDLStruct::writeCPPStructCtor(ostream &ostr,Indent &indent,string const &id,
							  IDLTypedef const *activeTypedef ) const {
	ORBITCPP_NYI("struct writeCPPStructCtor");
}

void
IDLStruct::writeCPPStructPacker(ostream &ostr,Indent &indent,string const &id,
								IDLTypedef const *activeTypedef ) const {
	ORBITCPP_NYI("struct writeCPPStructPacker");
}

void
IDLStruct::writeCPPStructUnpacker(ostream &ostr,Indent &indent,string const &id,
								  IDLTypedef const *activeTypedef ) const {
	ORBITCPP_NYI("struct writeCPPStructUnpacker");
}


void
IDLStruct::writeUnionReferents(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
							IDLTypedef const *activeTypedef ) const{
	ostr
	<< indent << getQualifiedCPPIdentifier() << " &" << id << "() {" << endl;
	ostr	



void IDLStruct::getCPPStubDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
									 IDLTypedef const *activeTypedef) const {
	dcl = id;

	string name = activeTypedef ?


string 
IDLStruct::getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {

	string typespec,dcl;
	getCSkelDeclarator(attr,"",typespec,dcl,activeTypedef);


void
IDLStruct::getCPPStubReturnDeclarator(string const &id,string &typespec,string &dcl,
									  IDLTypedef const *activeTypedef ) const {
	typespec = getQualifiedCPPIdentifier();
	if(isVariableLength())
		dcl = "*" + id;


void
IDLStruct::writeCPPStubReturnPrepCode(ostream &ostr,Indent &indent,
									  IDLTypedef const *activeTypedef ) const {

	ostr
	<< indent << getNSScopedCTypeName();


void
IDLStruct::writeCPPStubReturnDemarshalCode(ostream &ostr,Indent &indent,
										   IDLTypedef const *activeTypedef ) const {
	ostr << indent << "return reinterpret_cast< " << getQualifiedCPPIdentifier();
	if(isVariableLength())
		ostr << "*";


void 
IDLStruct::getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
							  IDLTypedef const *activeTypedef ) const {
	typespec = getNSScopedCTypeName();
	
	switch (attr) {


void 
IDLStruct::writeCPPSkelDemarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
									 IDLTypedef const *activeTypedef ) const {
	// no demarshalling code required
}



string
IDLStruct::getCPPSkelParameterTerm(IDL_param_attr attr,string const &id,
								   IDLTypedef const *activeTypedef ) const {
	string typespec,dcl;
	getCPPStubDeclarator(attr,"",typespec,dcl);



void 
IDLStruct::writeCPPSkelMarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
								   IDLTypedef const *activeTypedef ) const {
	// no marshalling code required
}


void
IDLStruct::getCSkelReturnDeclarator(string const &id,string &typespec,string &dcl,
									IDLTypedef const *activeTypedef ) const {
	typespec = getNSScopedCTypeName();
	if (isVariableLength())
		dcl = "*" + id;


void
IDLStruct::writeCPPSkelReturnPrepCode(ostream &ostr,Indent &indent,bool passthru,
									  IDLTypedef const *activeTypedef ) const {
	ostr << indent << getQualifiedCPPIdentifier();
	if (isVariableLength())
		ostr << " *_retval = NULL;" << endl;


string
IDLStruct::getCPPSkelReturnAssignment(bool passthru,
									  IDLTypedef const *activeTypedef ) const {
	return "_retval = ";		
}

void
IDLStruct::writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
										 IDLTypedef const *activeTypedef ) const {
	ostr << indent << "return reinterpret_cast< "
	<< getNSScopedCTypeName();



void
IDLSequence::getCPPMemberDeclarator(string const &id,string &typespec,string &dcl,
									IDLTypedef const *activeTypedef ) const {
	if(activeTypedef)
		typespec = activeTypedef->getQualifiedCPPIdentifier(activeTypedef->getRootScope());
	else

void
IDLSequence::writeTypedef(ostream &ostr,Indent &indent,IDLCompilerState &state,
						  IDLElement &dest,IDLScope const &scope,
						  IDLTypedef const *activeTypedef ) const {
	if (activeTypedef == NULL) { // if this isn't a typedef of a typedef...
		string id = getCPPType();
		ostr


void
IDLSequence::getCPPStructCtorDeclarator(string const &id,string &typespec,string &dcl,
										IDLTypedef const *activeTypedef ) const {
	getCPPMemberDeclarator(id, typespec, dcl, activeTypedef);
	typespec = "const " + typespec;
	dcl = "&_par_" + dcl;


void
IDLSequence::writeCPPStructCtor(ostream &ostr,Indent &indent,string const &id,
								IDLTypedef const *activeTypedef ) const {
	ostr << indent << id << " = _par_" << id << ';' << endl;
}

void
IDLSequence::writeCPPStructPacker(ostream &ostr,Indent &indent,string const &id,
								  IDLTypedef const *activeTypedef ) const {
	string type;
	if( activeTypedef )
		type = activeTypedef->getQualifiedCPPIdentifier();


void
IDLSequence::writeCPPStructUnpacker(ostream &ostr,Indent &indent,string const &id,
									IDLTypedef const *activeTypedef ) const {
	string type;
	if( activeTypedef )
		type = activeTypedef->getQualifiedCPPIdentifier();


void
IDLSequence::writeUnionReferents(ostream &ostr,Indent &indent, string const &id, string const &discriminatorVal,
							IDLTypedef const *activeTypedef ) const{

	g_assert(activeTypedef);      //activeTypedef cannot be null for sequences
	ostr



void IDLSequence::getCPPStubDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
									   IDLTypedef const* activeTypedef) const {
	dcl = id;

	g_assert(activeTypedef);      //activeTypedef cannot be null for sequences


string 
IDLSequence::getCPPStubParameterTerm(IDL_param_attr attr,string const &id,
									 IDLTypedef const *activeTypedef ) const {

	string typespec,dcl, retval;
	getCSkelDeclarator(attr,"",typespec,dcl,activeTypedef);


void
IDLSequence::getCPPStubReturnDeclarator(string const &id,string &typespec,string &dcl,
IDLTypedef const *activeTypedef ) const {
	typespec = activeTypedef->getQualifiedCPPIdentifier();
	if (isVariableLength())
		dcl = "*" + id;


void
IDLSequence::writeCPPStubReturnPrepCode(ostream &ostr,Indent &indent,
IDLTypedef const *activeTypedef ) const {

	ostr
	<< indent << activeTypedef->getNSScopedCTypeName();


void
IDLSequence::writeCPPStubReturnDemarshalCode(ostream &ostr,Indent &indent,
											 IDLTypedef const *activeTypedef ) const {
	ostr << indent << "return reinterpret_cast< " << activeTypedef->getQualifiedCPPIdentifier();
	if(isVariableLength())
		ostr << "*";


void 
IDLSequence::getCSkelDeclarator(IDL_param_attr attr,string const &id,string &typespec,string &dcl,
								IDLTypedef const *activeTypedef ) const {
	typespec = activeTypedef->getNSScopedCTypeName();

	switch (attr) {


void 
IDLSequence::writeCPPSkelDemarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
									   IDLTypedef const *activeTypedef ) const {
	// no demarshalling code required
}

string
IDLSequence::getCPPSkelParameterTerm(IDL_param_attr attr,string const &id,
									 IDLTypedef const *activeTypedef ) const {
	string typespec,dcl;
	getCPPStubDeclarator(attr,"",typespec,dcl,activeTypedef);



void 
IDLSequence::writeCPPSkelMarshalCode(IDL_param_attr attr,string const &id,ostream &ostr,Indent &indent,
									 IDLTypedef const *activeTypedef ) const {
	// no marshalling code required
}


void
IDLSequence::getCSkelReturnDeclarator(string const &id,string &typespec,string &dcl,
									  IDLTypedef const *activeTypedef ) const {
	typespec = activeTypedef->getNSScopedCTypeName();
	dcl = "*" + id;
}

void
IDLSequence::writeCPPSkelReturnPrepCode(ostream &ostr,Indent &indent,bool passthru,
										IDLTypedef const *activeTypedef ) const {
	ostr << indent << activeTypedef->getQualifiedCPPIdentifier();
	if(isVariableLength())
		ostr << " *_retval = NULL;" << endl;


string
IDLSequence::getCPPSkelReturnAssignment(bool passthru,
										IDLTypedef const *activeTypedef ) const {
	return "_retval = ";		
}

void
IDLSequence::writeCPPSkelReturnMarshalCode(ostream &ostr,Indent &indent,bool passthru,
										   IDLTypedef const *activeTypedef ) const {
	ostr << indent << "return reinterpret_cast< "
	<< activeTypedef->getNSScopedCTypeName()
	<< "*>(_retval);" << endl;


// IDLUnion -------------------------------------------------------------
IDLUnion::IDLUnion(string const &id,IDL_tree node,
				   IDLType const &discriminatorType, IDLScope *parentscope)
	: IDLStruct(id,node,parentscope),m_discriminatorType(discriminatorType) {
}






string 
IDLElement::getQualifiedIDLIdentifier(IDLScope const *up_to,
        IDLScope const *assumed_base) const {
	if (up_to == this) return "";
	IDLScope const *run = assumed_base ? assumed_base : getParentScope();



string 
IDLElement::getQualifiedCIdentifier(IDLScope const *up_to,
        IDLScope const *assumed_base) const {
	if (up_to == this) return "";
	IDLScope const *run = assumed_base ? assumed_base : getParentScope();



string 
IDLElement::getQualifiedCPPIdentifier(IDLScope const *up_to,
        IDLScope const *assumed_base) const {
	if (up_to == this) return "";
	IDLScope const *run = assumed_base ? assumed_base : getParentScope();



// IDLCaseStmt ---------------------------------------------------------------
IDLCaseStmt::IDLCaseStmt(IDLMember *member, string const &id,
						 IDL_tree node,IDLScope *parentscope)
	: IDLElement(id,node,parentscope), m_member(member),m_isDefault(false) {

	// labels

Return to bug 46081

Lines 154-160 Link Here

(-)compiler/language.cc (-4 / +4 lines)
154		154
155	string	155	string
156	IDLElement::getQualifiedIDLIdentifier(IDLScope const *up_to,	156	IDLElement::getQualifiedIDLIdentifier(IDLScope const *up_to,
157	IDLScope const *assumed_base = NULL) const {	157	IDLScope const *assumed_base) const {
158	if (up_to == this) return "";	158	if (up_to == this) return "";
159	IDLScope const *run = assumed_base ? assumed_base : getParentScope();	159	IDLScope const *run = assumed_base ? assumed_base : getParentScope();
160		160
Lines 172-178 Link Here
172		172
173	string	173	string
174	IDLElement::getQualifiedCIdentifier(IDLScope const *up_to,	174	IDLElement::getQualifiedCIdentifier(IDLScope const *up_to,
175	IDLScope const *assumed_base = NULL) const {	175	IDLScope const *assumed_base) const {
176	if (up_to == this) return "";	176	if (up_to == this) return "";
177	IDLScope const *run = assumed_base ? assumed_base : getParentScope();	177	IDLScope const *run = assumed_base ? assumed_base : getParentScope();
178		178
Lines 192-198 Link Here
192		192
193	string	193	string
194	IDLElement::getQualifiedCPPIdentifier(IDLScope const *up_to,	194	IDLElement::getQualifiedCPPIdentifier(IDLScope const *up_to,
195	IDLScope const *assumed_base = NULL) const {	195	IDLScope const *assumed_base) const {
196	if (up_to == this) return "";	196	if (up_to == this) return "";
197	IDLScope const *run = assumed_base ? assumed_base : getParentScope();	197	IDLScope const *run = assumed_base ? assumed_base : getParentScope();
198		198
Lines 390-396 Link Here
390		390
391	// IDLCaseStmt ---------------------------------------------------------------	391	// IDLCaseStmt ---------------------------------------------------------------
392	IDLCaseStmt::IDLCaseStmt(IDLMember *member, string const &id,	392	IDLCaseStmt::IDLCaseStmt(IDLMember *member, string const &id,
393	IDL_tree node,IDLScope *parentscope = NULL)	393	IDL_tree node,IDLScope *parentscope)
394	: IDLElement(id,node,parentscope), m_member(member),m_isDefault(false) {	394	: IDLElement(id,node,parentscope), m_member(member),m_isDefault(false) {
395		395
396	// labels	396	// labels