new_node refactor
Reduce code duplication for doxygen to match code in master prior to merge to master
This commit is contained in:
parent
abfc304740
commit
9deaa6ff24
4 changed files with 17 additions and 20 deletions
|
|
@ -62,6 +62,7 @@ extern "C" {
|
||||||
extern void cparse_normalize_void(Node *);
|
extern void cparse_normalize_void(Node *);
|
||||||
extern Parm *Swig_cparse_parm(String *s);
|
extern Parm *Swig_cparse_parm(String *s);
|
||||||
extern ParmList *Swig_cparse_parms(String *s, Node *file_line_node);
|
extern ParmList *Swig_cparse_parms(String *s, Node *file_line_node);
|
||||||
|
extern Node *Swig_cparse_new_node(const_String_or_char_ptr tag);
|
||||||
|
|
||||||
/* templ.c */
|
/* templ.c */
|
||||||
extern int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *tscope);
|
extern int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *tscope);
|
||||||
|
|
|
||||||
|
|
@ -83,10 +83,7 @@ static void yyerror (const char *e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static Node *new_node(const_String_or_char_ptr tag) {
|
static Node *new_node(const_String_or_char_ptr tag) {
|
||||||
Node *n = NewHash();
|
Node *n = Swig_cparse_new_node(tag);
|
||||||
set_nodeType(n,tag);
|
|
||||||
Setfile(n,cparse_file);
|
|
||||||
Setline(n,cparse_line);
|
|
||||||
/* Remember the previous node in case it will need a post-comment */
|
/* Remember the previous node in case it will need a post-comment */
|
||||||
previousNode = currentNode;
|
previousNode = currentNode;
|
||||||
currentNode = n;
|
currentNode = n;
|
||||||
|
|
|
||||||
|
|
@ -111,3 +111,16 @@ void cparse_normalize_void(Node *n) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* -----------------------------------------------------------------------------
|
||||||
|
* Swig_cparse_new_node()
|
||||||
|
*
|
||||||
|
* Create an empty parse node, setting file and line number information
|
||||||
|
* ----------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
Node *Swig_cparse_new_node(const_String_or_char_ptr tag) {
|
||||||
|
Node *n = NewHash();
|
||||||
|
set_nodeType(n,tag);
|
||||||
|
Setfile(n,cparse_file);
|
||||||
|
Setline(n,cparse_line);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,20 +16,6 @@
|
||||||
|
|
||||||
static Hash *extendhash = 0; /* Hash table of added methods */
|
static Hash *extendhash = 0; /* Hash table of added methods */
|
||||||
|
|
||||||
/* -----------------------------------------------------------------------------
|
|
||||||
* new_node()
|
|
||||||
*
|
|
||||||
* Create an empty parse node, setting file and line number information
|
|
||||||
* ----------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
static Node *new_node(const_String_or_char_ptr tag) {
|
|
||||||
Node *n = NewHash();
|
|
||||||
set_nodeType(n,tag);
|
|
||||||
Setfile(n,cparse_file);
|
|
||||||
Setline(n,cparse_line);
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -----------------------------------------------------------------------------
|
/* -----------------------------------------------------------------------------
|
||||||
* Swig_extend_hash()
|
* Swig_extend_hash()
|
||||||
*
|
*
|
||||||
|
|
@ -120,10 +106,10 @@ void Swig_extend_append_previous(Node *cls, Node *am) {
|
||||||
set_nextSibling(n,0);
|
set_nextSibling(n,0);
|
||||||
/* typemaps and fragments need to be prepended */
|
/* typemaps and fragments need to be prepended */
|
||||||
if (((Cmp(nodeType(n),"typemap") == 0) || (Cmp(nodeType(n),"fragment") == 0))) {
|
if (((Cmp(nodeType(n),"typemap") == 0) || (Cmp(nodeType(n),"fragment") == 0))) {
|
||||||
if (!pe) pe = new_node("extend");
|
if (!pe) pe = Swig_cparse_new_node("extend");
|
||||||
appendChild(pe, n);
|
appendChild(pe, n);
|
||||||
} else {
|
} else {
|
||||||
if (!ae) ae = new_node("extend");
|
if (!ae) ae = Swig_cparse_new_node("extend");
|
||||||
appendChild(ae, n);
|
appendChild(ae, n);
|
||||||
}
|
}
|
||||||
n = ne;
|
n = ne;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue