jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Working directors again. I need to focus on director_abstract testcase.

Browse source 
TODO: my ranting on typing.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5160 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Art Yerkes 2003-09-25 06:46:17 +00:00
commit c779469a61
3 changed files with 46 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/ocaml/director.swg
View file

@ -62,7 +62,7 @@ namespace Swig {
public:
/* wrap a ocaml object, optionally taking ownership */
Director(CAML_VALUE self, bool disown) : swig_self(self), swig_disown_flag(disown) {
Director(CAML_VALUE self) : swig_self(self), swig_disown_flag(false) {
register_global_root(&swig_self);
}

56
Source/Modules/ocaml.cxx
View file

@ -1398,27 +1398,27 @@ public:
String *mangleNameForCaml( String *s ) {
String *out = Copy(s);
Replaceall(out," ","_");
Replaceall(out,"::","_");
Replaceall(out,",","_x_");
Replaceall(out,"+","__plus__");
Replaceall(out,"-","__minus__");
Replaceall(out,"<","__ldbrace__");
Replaceall(out,">","__rdbrace__");
Replaceall(out,"!","__not__");
Replaceall(out,"%","__mod__");
Replaceall(out,"^","__xor__");
Replaceall(out,"*","__star__");
Replaceall(out,"&","__amp__");
Replaceall(out,"|","__or__");
Replaceall(out,"(","__lparen__");
Replaceall(out,")","__rparen__");
Replaceall(out,"[","__lbrace__");
Replaceall(out,"]","__rbrace__");
Replaceall(out,"~","__bnot__");
Replaceall(out,"=","__equals__");
Replaceall(out,"/","__slash__");
Replaceall(out,".","__dot__");
Replaceall(out," ","_xx");
Replaceall(out,"::","_xx");
Replaceall(out,",","_x");
Replaceall(out,"+","_xx_plus");
Replaceall(out,"-","_xx_minus");
Replaceall(out,"<","_xx_ldbrace");
Replaceall(out,">","_xx_rdbrace");
Replaceall(out,"!","_xx_not");
Replaceall(out,"%","_xx_mod");
Replaceall(out,"^","_xx_xor");
Replaceall(out,"*","_xx_star");
Replaceall(out,"&","_xx_amp");
Replaceall(out,"|","_xx_or");
Replaceall(out,"(","_xx_lparen");
Replaceall(out,")","_xx_rparen");
Replaceall(out,"[","_xx_lbrace");
Replaceall(out,"]","_xx_rbrace");
Replaceall(out,"~","_xx_bnot");
Replaceall(out,"=","_xx_equals");
Replaceall(out,"/","_xx_slash");
Replaceall(out,".","_xx_dot");
return out;
}
@ -1817,15 +1817,17 @@ public:
set_nextSibling(p, parms_in_declaration);
parms_in_declaration = p;
for (ip = parms_in_declaration; nextSibling(ip); )
for (ip = parms_in_definition; nextSibling(ip); )
ip = nextSibling(ip);
#if 0
p = NewParm(NewString("bool"), NewString("disown"));
Setattr(p, "CAML_VALUE", "1");
Setattr(n, "director:postfix_args", p);
Setattr(p, "args:byname", "1");
Setattr(p, "value", "0");
set_nextSibling(ip, p);
Setattr(n, "director:postfix_args", p);
#endif
/* set_nextSibling(ip, p); */
/* constructor */
{
@ -1838,7 +1840,7 @@ public:
0, 0);
call = Swig_csuperclass_call(0, basetype, superparms);
Printf( w->def,
"%s::%s: %s, Swig::Director(self, disown) { }",
"%s::%s: %s, Swig::Director(self) { }",
classname, target, call );
Delete(target);
Wrapper_print(w, f_directors);
@ -1858,7 +1860,7 @@ public:
Delete(classname);
Delete(supername);
Delete(parms_in_definition);
Setattr(n, "parms", parms_in_definition );
/* Setattr(n, "parms", parms_in_definition ); */
return Language::classDirectorConstructor(n);
}

16
TODO
View file

@ -471,6 +471,22 @@ Common Lisp
typemaps would be written as Lisp programs that generate Lisp
code.
Ocaml
-----
** I've been working with my camlp4 module and type information
from the compiler. When I'm done, the user will have access
to type inference when writing code, when the inference is
unambiguous. This allows the user to write x = _foo 1.0
instead of x = get_float (_foo (C_float 1.0)). It's not as
easy as it sounds, because O'caml doesn't keep type information
at run time, and doesn't really have a mechanism for doing what
I need. However, it's possible to write a preprocessor that
inserts correct type info at compile time.
That having been said, the program must compile for type info
to be available, so I need to attend to a lot of details; The
program must compile both with and without type augmentation.
Documentation
-------------