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

last fixes for namespaces

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6609 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-11-02 02:12:01 +00:00
commit 5206f539fd
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

48
SWIG/Source/CParse/parser.y
View file

@ -713,25 +713,9 @@ static void merge_extensions(Node *cls, Node *am) {
return bases; return bases;
} }
/* If the class name is qualified. We need to create or lookup namespace entries */ /* If the class name is qualified. We need to create or lookup namespace entries */
static Node *nspace = 0;
static Node *nspace_inner = 0;
static String *resolve_namespace_class(String *cname) {
nspace = 0;
nspace_inner = 0;
if (Swig_scopename_check(cname)) {
Node *ns;
String *prefix = Swig_scopename_prefix(cname);
String *base = Swig_scopename_last(cname);
if (prefix && (Strncmp(prefix,"::",2) == 0)) {
String *nprefix = NewString(Char(prefix)+2);
Delete(prefix);
prefix= nprefix;
Printf(stderr,"pb %s %s\n",prefix, base);
}
if (!prefix || (Len(prefix) == 0)) { static Symtab *get_global_scope() {
/* Use the global scope */
Symtab *symtab = Swig_symbol_current(); Symtab *symtab = Swig_symbol_current();
Node *pn = parentNode(symtab); Node *pn = parentNode(symtab);
while (pn) { while (pn) {
@ -739,10 +723,34 @@ static String *resolve_namespace_class(String *cname) {
pn = parentNode(symtab); pn = parentNode(symtab);
if (!pn) break; if (!pn) break;
} }
Swig_symbol_setscope(symtab);
Namespaceprefix = 0; Namespaceprefix = 0;
Swig_symbol_setscope(symtab);
return symtab;
}
static Node *nspace = 0;
static Node *nspace_inner = 0;
static String *resolve_namespace_class(String *cname) {
Symtab *gscope = 0;
nspace = 0;
nspace_inner = 0;
if (Swig_scopename_check(cname)) {
Node *ns;
String *prefix = Swig_scopename_prefix(cname);
String *base = Swig_scopename_last(cname);
if (prefix && (Strncmp(prefix,"::",2) == 0)) {
/* Use the global scope */
String *nprefix = NewString(Char(prefix)+2);
Delete(prefix);
prefix= nprefix;
gscope = get_global_scope();
}
if (!prefix || (Len(prefix) == 0)) {
/* Use the global scope */
if (!gscope) gscope = get_global_scope();
nspace = new_node("namespace"); nspace = new_node("namespace");
Setattr(nspace,"symtab", symtab); Setattr(nspace,"symtab", gscope);
nspace_inner = nspace; nspace_inner = nspace;
return base; return base;
} }