If there is a variable or argument with the name t' then convert it to either t_arg%d' or `t_var'.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8914 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
427353eaf8
commit
80cdfb3594
1 changed files with 14 additions and 0 deletions
|
|
@ -380,6 +380,11 @@ void CFFI::emit_defun(Node *n,String *name)
|
||||||
argname=NewStringf("arg%d", argnum);
|
argname=NewStringf("arg%d", argnum);
|
||||||
tempargname=1;
|
tempargname=1;
|
||||||
}
|
}
|
||||||
|
else if(Strcmp(argname,"t")==0 || Strcmp(argname,"T")==0) {
|
||||||
|
argname=NewStringf("t_arg%d", argnum);
|
||||||
|
tempargname=1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Printf(f_cl, "\n (%s %s)", argname, ffitype);
|
Printf(f_cl, "\n (%s %s)", argname, ffitype);
|
||||||
first=0;
|
first=0;
|
||||||
|
|
@ -398,6 +403,9 @@ int CFFI :: constantWrapper(Node *n) {
|
||||||
String *converted_value=convert_literal(Getattr(n, "value"), type);
|
String *converted_value=convert_literal(Getattr(n, "value"), type);
|
||||||
String *name=Getattr(n, "sym:name");
|
String *name=Getattr(n, "sym:name");
|
||||||
|
|
||||||
|
if(Strcmp(name,"t")==0 || Strcmp(name,"T")==0)
|
||||||
|
name=NewStringf("t_var");
|
||||||
|
|
||||||
Printf(f_cl, "\n(defconstant %s %s)\n", name, converted_value);
|
Printf(f_cl, "\n(defconstant %s %s)\n", name, converted_value);
|
||||||
Delete(converted_value);
|
Delete(converted_value);
|
||||||
|
|
||||||
|
|
@ -412,6 +420,9 @@ int CFFI :: variableWrapper(Node *n) {
|
||||||
|
|
||||||
String *var_name=Getattr(n, "sym:name");
|
String *var_name=Getattr(n, "sym:name");
|
||||||
String *lisp_type = Swig_typemap_lookup_new("cin",n, "",0);
|
String *lisp_type = Swig_typemap_lookup_new("cin",n, "",0);
|
||||||
|
if(Strcmp(var_name,"t")==0 || Strcmp(var_name,"T")==0)
|
||||||
|
var_name=NewStringf("t_var");
|
||||||
|
|
||||||
Printf(f_cl,"\n(defcvar (\"%s\" %s)\n %s)\n",var_name,var_name,lisp_type);
|
Printf(f_cl,"\n(defcvar (\"%s\" %s)\n %s)\n",var_name,var_name,lisp_type);
|
||||||
|
|
||||||
Delete(lisp_type);
|
Delete(lisp_type);
|
||||||
|
|
@ -509,6 +520,9 @@ void CFFI :: emit_struct_union(Node *n, bool un=false) {
|
||||||
}
|
}
|
||||||
|
|
||||||
String *slot_name = Getattr(c, "sym:name");
|
String *slot_name = Getattr(c, "sym:name");
|
||||||
|
if(Strcmp(slot_name,"t")==0 || Strcmp(slot_name,"T")==0)
|
||||||
|
slot_name=NewStringf("t_var");
|
||||||
|
|
||||||
Printf(f_cl, "\n\t(%s %s)", slot_name, typespec);
|
Printf(f_cl, "\n\t(%s %s)", slot_name, typespec);
|
||||||
|
|
||||||
Delete(typespec);
|
Delete(typespec);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue