Menu
▾
▴
[Swig-cvs] SWIG/Source/Swig cwrap.c,1.75,1.76 fragment.c,1.11,1.12 include.c,1.25,1.26 swigkeys.c,1.3,1.4 swigkeys.h,1.3,1.4 tree.c,1.19,1.20 typeobj.c,1.14,1.15
|
From: Marcelo M. <mar...@us...> - 2006-01-03 09:26:54
|
Update of /cvsroot/swig/SWIG/Source/Swig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20748/Swig Modified Files: cwrap.c fragment.c include.c swigkeys.c swigkeys.h tree.c typeobj.c Log Message: more swigkey unification Index: swigkeys.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/swigkeys.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** swigkeys.c 2 Jan 2006 17:44:31 -0000 1.3 --- swigkeys.c 3 Jan 2006 09:26:42 -0000 1.4 *************** *** 4,8 **** --- 4,10 ---- String *k_1 = 0; String *k_SWIGTYPE = 0; + String *k_abstract = 0; String *k_access = 0; + String *k_alias = 0; String *k_allowstypedef = 0; String *k_alttype = 0; *************** *** 15,18 **** --- 17,21 ---- String *k_classforward = 0; String *k_classname = 0; + String *k_cplusstaticbase = 0; String *k_code = 0; String *k_coloncolon = 0; *************** *** 25,34 **** --- 28,44 ---- String *k_csymtab = 0; String *k_decl = 0; + String *k_default = 0; + String *k_defaultargs = 0; String *k_destroy = 0; String *k_destructor = 0; + String *k_director = 0; + String *k_directorbase = 0; + String *k_directorprefixargs = 0; String *k_disown = 0; + String *k_emitonly = 0; String *k_enumitem = 0; String *k_error = 0; String *k_extern = 0; + String *k_fragment = 0; String *k_friend = 0; String *k_fullname = 0; *************** *** 40,43 **** --- 50,54 ---- String *k_lname = 0; String *k_locals = 0; + String *k_kind = 0; String *k_matchlist = 0; String *k_member = 0; *************** *** 50,53 **** --- 61,65 ---- String *k_parm = 0; String *k_parms = 0; + String *k_partialarg = 0; String *k_partialargs = 0; String *k_partials = 0; *************** *** 61,64 **** --- 73,77 ---- String *k_result = 0; String *k_scope = 0; + String *k_section = 0; String *k_self = 0; String *k_set = 0; *************** *** 77,80 **** --- 90,94 ---- String *k_symtypename = 0; String *k_symweak = 0; + String *k_sysdir = 0; String *k_targetfmt = 0; String *k_targetname = 0; *************** *** 83,86 **** --- 97,101 ---- String *k_templateparms = 0; String *k_templatetype = 0; + String *k_throw = 0; String *k_throws = 0; String *k_tmapmatch = 0; *************** *** 89,96 **** --- 104,115 ---- String *k_typetab = 0; String *k_uname = 0; + String *k_unnamed = 0; String *k_using = 0; String *k_value = 0; + String *k_view = 0; String *k_virtual = 0; + String *k_vtable = 0; String *k_wrapaction = 0; + String *k_wrapdirectormap = 0; String *k_wrapdisown = 0; String *k_wrapper = 0; *************** *** 100,104 **** --- 119,125 ---- k_1 = NewString("1"); k_SWIGTYPE = NewString("SWIGTYPE"); + k_abstract = NewString("abstract"); k_access = NewString("access"); + k_alias = NewString("alias"); k_allowstypedef = NewString("allows_typedef"); k_alttype = NewString("alttype"); *************** *** 111,114 **** --- 132,136 ---- k_classforward = NewString("classforward"); k_classname = NewString("classname"); + k_cplusstaticbase = NewString("cplus:staticbase");; k_code = NewString("code"); k_coloncolon = NewString("::"); *************** *** 121,129 **** --- 143,158 ---- k_csymtab = NewString("csymtab"); k_decl = NewString("decl"); + k_default = NewString("default"); + k_defaultargs = NewString("defaultargs"); k_destroy = NewString("destroy"); k_destructor = NewString("destructor"); + k_director = NewString("director"); + k_directorbase = NewString("directorBase"); + k_directorprefixargs = NewString("director:prefix_args"); k_disown = NewString("disown"); + k_emitonly = NewString("emitonly"); k_enumitem = NewString("enumitem"); k_error = NewString("error"); + k_fragment = NewString("fragment"); k_friend = NewString("friend"); k_fullname = NewString("fullname"); *************** *** 135,138 **** --- 164,168 ---- k_lname = NewString("lname"); k_locals = NewString("locals"); + k_kind = NewString("kind"); k_matchlist = NewString("matchlist"); k_member = NewString("member"); *************** *** 145,148 **** --- 175,179 ---- k_parm = NewString("parm"); k_parms = NewString("parms"); + k_partialarg = NewString("partialarg"); k_partialargs = NewString("partialargs"); k_partials = NewString("partials"); *************** *** 156,159 **** --- 187,191 ---- k_result = NewString("result"); k_scope = NewString("scope"); + k_section = NewString("section"); k_self = NewString("self"); k_set = NewString("set"); *************** *** 172,175 **** --- 204,208 ---- k_symtypename = NewString("sym:typename"); k_symweak = NewString("sym:weak"); + k_sysdir = NewString("sysdir"); k_targetfmt = NewString("targetfmt"); k_targetname = NewString("targetname"); *************** *** 178,181 **** --- 211,215 ---- k_templateparms = NewString("templateparms"); k_templatetype = NewString("templatetype"); + k_throw = NewString("throw"); k_throws = NewString("throws"); k_tmapmatch = NewString("tmap:match"); *************** *** 184,191 **** --- 218,229 ---- k_typetab = NewString("typetab"); k_uname = NewString("uname"); + k_unnamed = NewString("unnamed"); k_using = NewString("using"); k_value = NewString("value"); + k_view = NewString("view"); k_virtual = NewString("virtual"); + k_vtable = NewString("vtable"); k_wrapaction = NewString("wrap:action"); + k_wrapdirectormap = NewString("wrap:directormap"); k_wrapdisown = NewString("wrap:disown"); k_wrapper = NewString("wrapper"); Index: typeobj.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/typeobj.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** typeobj.c 29 Nov 2005 01:47:10 -0000 1.14 --- typeobj.c 3 Jan 2006 09:26:42 -0000 1.15 *************** *** 16,19 **** --- 16,20 ---- #include "swig.h" + #include "swigkeys.h" #include <ctype.h> *************** *** 664,668 **** for (p = parms; p; p = nextSibling(p)) { if (p != parms) Putc(',',pstr); ! Append(pstr, Getattr(p,"type")); } Insert(t,0,pstr); --- 665,669 ---- for (p = parms; p; p = nextSibling(p)) { if (p != parms) Putc(',',pstr); ! Append(pstr, Getattr(p,k_type)); } Insert(t,0,pstr); *************** *** 758,768 **** for (p = parms; p; p = nextSibling(p)) { String *v; ! if (Getattr(p,"default")) continue; if (p != parms) Append(t,","); ! v = Getattr(p,"value"); if (v) { Append(t,v); } else { ! Append(t,Getattr(p,"type")); } } --- 759,769 ---- for (p = parms; p; p = nextSibling(p)) { String *v; ! if (Getattr(p,k_default)) continue; if (p != parms) Append(t,","); ! v = Getattr(p,k_value); if (v) { Append(t,v); } else { ! Append(t,Getattr(p,k_type)); } } Index: include.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/include.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** include.c 2 Jan 2006 17:43:58 -0000 1.25 --- include.c 3 Jan 2006 09:26:42 -0000 1.26 *************** *** 15,18 **** --- 15,19 ---- #include "swig.h" + #include "swigkeys.h" /* Delimeter used in accessing files and directories */ *************** *** 167,171 **** assert(filename); Printf(filename, "%s%s", dirname, SWIG_FILE_DELIMETER); ! if (syspath && !Getattr(dirname,"sysdir")) { Append(llist,filename); } else { --- 168,172 ---- assert(filename); Printf(filename, "%s%s", dirname, SWIG_FILE_DELIMETER); ! if (syspath && !Getattr(dirname,k_sysdir)) { Append(llist,filename); } else { Index: tree.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/tree.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** tree.c 2 Jan 2006 04:33:19 -0000 1.19 --- tree.c 3 Jan 2006 09:26:42 -0000 1.20 *************** *** 12,15 **** --- 12,16 ---- #include "swig.h" + #include "swigkeys.h" #include <stdarg.h> #include <assert.h> *************** *** 305,309 **** /* Save the view */ { ! String *view = Getattr(n,"view"); if (view) { if (Strcmp(view,ns) != 0) { --- 306,310 ---- /* Save the view */ { ! String *view = Getattr(n,k_view); if (view) { if (Strcmp(view,ns) != 0) { *************** *** 311,318 **** strcat(temp,":view"); Setattr(n,temp,view); ! Setattr(n,"view",ns); } } else { ! Setattr(n,"view",ns); } } --- 312,319 ---- strcat(temp,":view"); Setattr(n,temp,view); ! Setattr(n,k_view,ns); } } else { ! Setattr(n,k_view,ns); } } *************** *** 359,363 **** /* Save the view */ { ! String *view = Getattr(n,"view"); if (view) { if (Strcmp(view,ns) != 0) { --- 360,364 ---- /* Save the view */ { ! String *view = Getattr(n,k_view); if (view) { if (Strcmp(view,ns) != 0) { *************** *** 365,372 **** strcat(temp,":view"); Setattr(n,temp,view); ! Setattr(n,"view",ns); } } else { ! Setattr(n,"view",ns); } } --- 366,373 ---- strcat(temp,":view"); Setattr(n,temp,view); ! Setattr(n,k_view,ns); } } else { ! Setattr(n,k_view,ns); } } *************** *** 388,392 **** Iterator ki; ! ns = Getattr(n,"view"); assert(ns); --- 389,393 ---- Iterator ki; ! ns = Getattr(n,k_view); assert(ns); Index: swigkeys.h =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/swigkeys.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** swigkeys.h 2 Jan 2006 17:44:31 -0000 1.3 --- swigkeys.h 3 Jan 2006 09:26:42 -0000 1.4 *************** *** 9,13 **** --- 9,15 ---- extern String *k_1; extern String *k_SWIGTYPE; + extern String *k_abstract; extern String *k_access; + extern String *k_alias; extern String *k_allowstypedef; extern String *k_alttype; *************** *** 20,23 **** --- 22,26 ---- extern String *k_classforward; extern String *k_classname; + extern String *k_cplusstaticbase; extern String *k_code; extern String *k_coloncolon; *************** *** 30,39 **** --- 33,49 ---- extern String *k_csymtab; extern String *k_decl; + extern String *k_default; + extern String *k_defaultargs; extern String *k_destroy; extern String *k_destructor; + extern String *k_director; + extern String *k_directorbase; + extern String *k_directorprefixargs; extern String *k_disown; + extern String *k_emitonly; extern String *k_enumitem; extern String *k_error; extern String *k_extern; + extern String *k_fragment; extern String *k_friend; extern String *k_fullname; *************** *** 45,48 **** --- 55,59 ---- extern String *k_lname; extern String *k_locals; + extern String *k_kind; extern String *k_matchlist; extern String *k_member; *************** *** 55,58 **** --- 66,70 ---- extern String *k_parm; extern String *k_parms; + extern String *k_partialarg; extern String *k_partialargs; extern String *k_partials; *************** *** 66,69 **** --- 78,82 ---- extern String *k_result; extern String *k_scope; + extern String *k_section; extern String *k_self; extern String *k_set; *************** *** 82,85 **** --- 95,99 ---- extern String *k_symtypename; extern String *k_symweak; + extern String *k_sysdir; extern String *k_targetfmt; extern String *k_targetname; *************** *** 88,91 **** --- 102,106 ---- extern String *k_templateparms; extern String *k_templatetype; + extern String *k_throw; extern String *k_throws; extern String *k_tmapmatch; *************** *** 94,101 **** --- 109,120 ---- extern String *k_typetab; extern String *k_uname; + extern String *k_unnamed; extern String *k_using; extern String *k_value; extern String *k_virtual; + extern String *k_view; + extern String *k_vtable; extern String *k_wrapaction; + extern String *k_wrapdirectormap; extern String *k_wrapdisown; extern String *k_wrapper; Index: fragment.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/fragment.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** fragment.c 23 Dec 2005 00:04:47 -0000 1.11 --- fragment.c 3 Jan 2006 09:26:42 -0000 1.12 *************** *** 18,21 **** --- 18,22 ---- #include "swig.h" + #include "swigkeys.h" static Hash *fragments = 0; *************** *** 33,42 **** void Swig_fragment_register(Node* fragment) { ! if (Getattr(fragment,"emitonly")) { Swig_fragment_emit(fragment); return; } else { ! String *name = Copy(Getattr(fragment,"value")); ! String *type = Getattr(fragment,"type"); if (type) { SwigType *rtype = SwigType_typedef_resolve_all(type); --- 34,43 ---- void Swig_fragment_register(Node* fragment) { ! if (Getattr(fragment,k_emitonly)) { Swig_fragment_emit(fragment); return; } else { ! String *name = Copy(Getattr(fragment,k_value)); ! String *type = Getattr(fragment,k_type); if (type) { SwigType *rtype = SwigType_typedef_resolve_all(type); *************** *** 51,60 **** } if (!Getattr(fragments,name)) { ! String *section = Copy(Getattr(fragment,"section")); ! String *ccode = Copy(Getattr(fragment,"code")); ! Hash *kwargs = Getattr(fragment,"kwargs"); ! Setmeta(ccode,"section",section); if (kwargs) { ! Setmeta(ccode,"kwargs",kwargs); } Setattr(fragments,name,ccode); --- 52,61 ---- } if (!Getattr(fragments,name)) { ! String *section = Copy(Getattr(fragment,k_section)); ! String *ccode = Copy(Getattr(fragment,k_code)); ! Hash *kwargs = Getattr(fragment,k_kwargs); ! Setmeta(ccode,k_section,section); if (kwargs) { ! Setmeta(ccode,k_kwargs,kwargs); } Setattr(fragments,name,ccode); *************** *** 91,99 **** if (!fragments) return; ! name = Getattr(n,"value"); if (!name) { name = n; } ! type = Getattr(n,"type"); if (type) { mangle = Swig_string_mangle(type); --- 92,100 ---- if (!fragments) return; ! name = Getattr(n,k_value); if (!name) { name = n; } ! type = Getattr(n,k_type); if (type) { mangle = Swig_string_mangle(type); *************** *** 113,123 **** code = Getattr(fragments,name); if (debug) Printf(stdout,"looking subfragment %s\n", name); ! if (code && (Strcmp(code,"ignore") != 0)) { ! String *section = Getmeta(code,"section"); ! Hash *n = Getmeta(code,"kwargs"); if (!looking_fragments) looking_fragments = NewHash(); Setattr(looking_fragments,name,"1"); while (n) { ! if (Cmp(Getattr(n,"name"),"fragment") == 0) { if (debug) Printf(stdout,"emitting fragment %s %s\n",n, type); Swig_fragment_emit(n); --- 114,124 ---- code = Getattr(fragments,name); if (debug) Printf(stdout,"looking subfragment %s\n", name); ! if (code && (Strcmp(code,k_ignore) != 0)) { ! String *section = Getmeta(code,k_section); ! Hash *n = Getmeta(code,k_kwargs); if (!looking_fragments) looking_fragments = NewHash(); Setattr(looking_fragments,name,"1"); while (n) { ! if (Equal(Getattr(n,k_name),k_fragment)) { if (debug) Printf(stdout,"emitting fragment %s %s\n",n, type); Swig_fragment_emit(n); *************** *** 135,139 **** Printf(f,"%s\n",code); if (debug) Printf(f,"/* end fragment %s */\n\n",name); ! Setattr(fragments,name,"ignore"); Delattr(looking_fragments,name); } --- 136,140 ---- Printf(f,"%s\n",code); if (debug) Printf(f,"/* end fragment %s */\n\n",name); ! Setattr(fragments,name,k_ignore); Delattr(looking_fragments,name); } *************** *** 143,147 **** SwigType *rtype = SwigType_typedef_resolve_all(type); if (!Equal(type,rtype)) { ! String *name = Copy(Getattr(n,"value")); Append(name,rtype); Swig_fragment_emit(name); --- 144,148 ---- SwigType *rtype = SwigType_typedef_resolve_all(type); if (!Equal(type,rtype)) { ! String *name = Copy(Getattr(n,k_value)); Append(name,rtype); Swig_fragment_emit(name); Index: cwrap.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/cwrap.c,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** cwrap.c 2 Jan 2006 09:49:35 -0000 1.75 --- cwrap.c 3 Jan 2006 09:26:42 -0000 1.76 *************** *** 850,854 **** * however, only one extra %extend method is generated. */ ! String *defaultargs = Getattr(n,"defaultargs"); String *code = Getattr(n,k_code); String *cname = Getattr(n,k_classname) ? Getattr(n,k_classname) : classname; --- 850,854 ---- * however, only one extra %extend method is generated. */ ! String *defaultargs = Getattr(n,k_defaultargs); String *code = Getattr(n,k_code); String *cname = Getattr(n,k_classname) ? Getattr(n,k_classname) : classname; *************** *** 939,943 **** Swig_directorbase(Node *n) { Node *classNode = Swig_methodclass(n); ! return (classNode && (Getattr(classNode, "directorBase") != 0)); } --- 939,943 ---- Swig_directorbase(Node *n) { Node *classNode = Swig_methodclass(n); ! return (classNode && (Getattr(classNode, k_directorbase) != 0)); } *************** *** 946,950 **** Node *classNode = Swig_methodclass(n); assert(classNode != 0); ! return (Getattr(classNode, "vtable") != 0); } --- 946,950 ---- Node *classNode = Swig_methodclass(n); assert(classNode != 0); ! return (Getattr(classNode, k_vtable) != 0); } *************** *** 953,957 **** Node *classNode = Swig_methodclass(n); if (classNode) { ! Node *vtable = Getattr(classNode, "vtable"); if (vtable) { String *name = Getattr(n, k_name); --- 953,957 ---- Node *classNode = Swig_methodclass(n); if (classNode) { ! Node *vtable = Getattr(classNode, k_vtable); if (vtable) { String *name = Getattr(n, k_name); *************** *** 963,967 **** Delete(local_decl); if (item) { ! return (Getattr(item, "director") != 0); } } --- 963,967 ---- Delete(local_decl); if (item) { ! return (Getattr(item, k_director) != 0); } } *************** *** 978,982 **** String* base = SwigType_base(type); ! Node *directormap = Getattr(module, "wrap:directormap"); if (directormap) return Getattr(directormap, base); --- 978,982 ---- String* base = SwigType_base(type); ! Node *directormap = Getattr(module, k_wrapdirectormap); if (directormap) return Getattr(directormap, base); *************** *** 1010,1014 **** /* Prepend the list of prefix_args (if any) */ ! prefix_args = Getattr(n,"director:prefix_args"); if (prefix_args != NIL) { Parm *p2, *p3; --- 1010,1014 ---- /* Prepend the list of prefix_args (if any) */ ! prefix_args = Getattr(n,k_directorprefixargs); if (prefix_args != NIL) { Parm *p2, *p3; *************** *** 1033,1037 **** String *call; String *cres; ! String *defaultargs = Getattr(n,"defaultargs"); String *code = Getattr(n,k_code); String *membername = Swig_name_construct(classname); --- 1033,1037 ---- String *call; String *cres; ! String *defaultargs = Getattr(n,k_defaultargs); String *code = Getattr(n,k_code); String *membername = Swig_name_construct(classname); *************** *** 1062,1066 **** if (use_director) { Node *parent = Swig_methodclass(n); ! int abstract = Getattr(parent, "abstract") != 0; String *name = Getattr(parent, k_symname); String* directorname = NewStringf("SwigDirector_%s", name); --- 1062,1066 ---- if (use_director) { Node *parent = Swig_methodclass(n); ! int abstract = Getattr(parent, k_abstract) != 0; String *name = Getattr(parent, k_symname); String* directorname = NewStringf("SwigDirector_%s", name); *************** *** 1296,1300 **** if (flags & CWRAP_SMART_POINTER) { if (checkAttribute(n, k_storage, k_static)) { ! Node *sn = Getattr(n,"cplus:staticbase"); String *base = Getattr(sn,k_name); self = NewStringf("%s::", base); --- 1296,1300 ---- if (flags & CWRAP_SMART_POINTER) { if (checkAttribute(n, k_storage, k_static)) { ! Node *sn = Getattr(n,k_cplusstaticbase); String *base = Getattr(sn,k_name); self = NewStringf("%s::", base); |