add support for template_extmode, ie, the emitonlychildren feature
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6804 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
207768de8b
commit
8c2bc267b8
3 changed files with 30 additions and 22 deletions
|
|
@ -1071,10 +1071,13 @@ public:
|
||||||
* ------------------------------------------------------------ */
|
* ------------------------------------------------------------ */
|
||||||
virtual int classDeclaration(Node *n) {
|
virtual int classDeclaration(Node *n) {
|
||||||
/* Do some work on the class name */
|
/* Do some work on the class name */
|
||||||
if (blessed) {
|
if (!Getattr(n,"feature:onlychildren")) {
|
||||||
setclassname(n);
|
if (blessed) {
|
||||||
Append(classlist,n);
|
setclassname(n);
|
||||||
|
Append(classlist,n);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Language::classDeclaration(n);
|
return Language::classDeclaration(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1405,8 +1405,11 @@ public:
|
||||||
* ------------------------------------------------------------ */
|
* ------------------------------------------------------------ */
|
||||||
|
|
||||||
virtual int classDeclaration(Node *n) {
|
virtual int classDeclaration(Node *n) {
|
||||||
String *symname = Getattr(n,"sym:name");
|
if (!Getattr(n,"feature:onlychildren")) {
|
||||||
Setattr(n,"php:proxy",symname);
|
String *symname = Getattr(n,"sym:name");
|
||||||
|
Setattr(n,"php:proxy",symname);
|
||||||
|
}
|
||||||
|
|
||||||
return Language::classDeclaration(n);
|
return Language::classDeclaration(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1439,7 +1439,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
Swig_warning(WARN_RUBY_WRONG_NAME, input_file, line_number,
|
Swig_warning(WARN_RUBY_WRONG_NAME, input_file, line_number,
|
||||||
"Wrong %s name\n", reason);
|
"Wrong %s name %s\n", reason, name);
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
@ -1505,22 +1505,24 @@ public:
|
||||||
* ----------------------------------------------------------------------------- */
|
* ----------------------------------------------------------------------------- */
|
||||||
|
|
||||||
virtual int classDeclaration(Node *n) {
|
virtual int classDeclaration(Node *n) {
|
||||||
String *name = Getattr(n,"name");
|
if (!Getattr(n,"feature:onlychildren")) {
|
||||||
String *symname = Getattr(n,"sym:name");
|
String *name = Getattr(n,"name");
|
||||||
String *tdname = Getattr(n,"tdname");
|
String *symname = Getattr(n,"sym:name");
|
||||||
|
String *tdname = Getattr(n,"tdname");
|
||||||
|
|
||||||
name = tdname ? tdname : name;
|
name = tdname ? tdname : name;
|
||||||
String *namestr = SwigType_namestr(name);
|
String *namestr = SwigType_namestr(name);
|
||||||
klass = RCLASS(classes, Char(namestr));
|
klass = RCLASS(classes, Char(namestr));
|
||||||
if (!klass) {
|
if (!klass) {
|
||||||
klass = new RClass();
|
klass = new RClass();
|
||||||
String *valid_name = NewString(symname ? symname : namestr);
|
String *valid_name = NewString(symname ? symname : namestr);
|
||||||
validate_const_name(Char(valid_name), "class");
|
validate_const_name(Char(valid_name), "class");
|
||||||
klass->set_name(namestr, symname, valid_name);
|
klass->set_name(namestr, symname, valid_name);
|
||||||
SET_RCLASS(classes, Char(namestr), klass);
|
SET_RCLASS(classes, Char(namestr), klass);
|
||||||
Delete(valid_name);
|
Delete(valid_name);
|
||||||
|
}
|
||||||
|
Delete(namestr);
|
||||||
}
|
}
|
||||||
Delete(namestr);
|
|
||||||
return Language::classDeclaration(n);
|
return Language::classDeclaration(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue