Cosmetics/code beautification of nested class support

4 files changed, 43 insertions, 29 deletions

diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c
index d860a8b00..259676971 100644
--- a/Source/Swig/naming.c
+++ b/Source/Swig/naming.c
@@ -1648,14 +1648,18 @@ void Swig_name_inherit(String *base, String *derived) {
   Swig_name_object_inherit(Swig_cparse_features(), base, derived);
 }
 
-void Swig_inherit_base_symbols(List* bases) {
+/* -----------------------------------------------------------------------------
+ * Swig_inherit_base_symbols()
+ * ----------------------------------------------------------------------------- */
+
+void Swig_inherit_base_symbols(List *bases) {
   if (bases) {
     Iterator s;
     for (s = First(bases); s.item; s = Next(s)) {
-      Symtab *st = Getattr(s.item,"symtab");
+      Symtab *st = Getattr(s.item, "symtab");
       if (st) {
-	Setfile(st,Getfile(s.item));
-	Setline(st,Getline(s.item));
+	Setfile(st, Getfile(s.item));
+	Setline(st, Getline(s.item));
 	Swig_symbol_inherit(st);
       }
     }
@@ -1663,40 +1667,46 @@ void Swig_inherit_base_symbols(List* bases) {
   }
 }
 
-List *Swig_make_inherit_list(String *clsname, List *names, String* Namespaceprefix) {
+/* -----------------------------------------------------------------------------
+ * Swig_make_inherit_list()
+ * ----------------------------------------------------------------------------- */
+
+List *Swig_make_inherit_list(String *clsname, List *names, String *Namespaceprefix) {
   int i, ilen;
   String *derived;
   List *bases = NewList();
 
-  if (Namespaceprefix) derived = NewStringf("%s::%s", Namespaceprefix,clsname);
-  else derived = NewString(clsname);
+  if (Namespaceprefix)
+    derived = NewStringf("%s::%s", Namespaceprefix, clsname);
+  else
+    derived = NewString(clsname);
 
   ilen = Len(names);
   for (i = 0; i < ilen; i++) {
     Node *s;
     String *base;
-    String *n = Getitem(names,i);
+    String *n = Getitem(names, i);
     /* Try to figure out where this symbol is */
     s = Swig_symbol_clookup(n,0);
     if (s) {
-      while (s && (Strcmp(nodeType(s),"class") != 0)) {
+      while (s && (Strcmp(nodeType(s), "class") != 0)) {
 	/* Not a class.  Could be a typedef though. */
-	String *storage = Getattr(s,"storage");
-	if (storage && (Strcmp(storage,"typedef") == 0)) {
-	  String *nn = Getattr(s,"type");
-	  s = Swig_symbol_clookup(nn,Getattr(s,"sym:symtab"));
+	String *storage = Getattr(s, "storage");
+	if (storage && (Strcmp(storage, "typedef") == 0)) {
+	  String *nn = Getattr(s, "type");
+	  s = Swig_symbol_clookup(nn, Getattr(s, "sym:symtab"));
 	} else {
 	  break;
 	}
       }
-      if (s && ((Strcmp(nodeType(s),"class") == 0) || (Strcmp(nodeType(s),"template") == 0))) {
+      if (s && ((Strcmp(nodeType(s), "class") == 0) || (Strcmp(nodeType(s), "template") == 0))) {
 	String *q = Swig_symbol_qualified(s);
-	Append(bases,s);
+	Append(bases, s);
 	if (q) {
-	  base = NewStringf("%s::%s", q, Getattr(s,"name"));
+	  base = NewStringf("%s::%s", q, Getattr(s, "name"));
 	  Delete(q);
 	} else {
-	  base = NewString(Getattr(s,"name"));
+	  base = NewString(Getattr(s, "name"));
 	}
       } else {
 	base = NewString(n);
@@ -1705,7 +1715,7 @@ List *Swig_make_inherit_list(String *clsname, List *names, String* Namespacepref
       base = NewString(n);
     }
     if (base) {
-      Swig_name_inherit(base,derived);
+      Swig_name_inherit(base, derived);
       Delete(base);
     }
   }
diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c
index 39eaaf4d4..a32828b58 100644
--- a/Source/Swig/scanner.c
+++ b/Source/Swig/scanner.c
@@ -1545,13 +1545,18 @@ int Scanner_skip_balanced(Scanner * s, int startchar, int endchar) {
   Delete(locator);
   return 0;
 }
-/* returns raw text between 2 braces, does not change scanner state in any way*/
-String* Scanner_get_raw_text_balanced(Scanner* s, int startchar, int endchar)
-{
-  String* result = 0;
+
+/* -----------------------------------------------------------------------------
+ * Scanner_get_raw_text_balanced()
+ *
+ * Returns raw text between 2 braces, does not change scanner state in any way
+ * ----------------------------------------------------------------------------- */
+
+String *Scanner_get_raw_text_balanced(Scanner *s, int startchar, int endchar) {
+  String *result = 0;
   char c;
   int old_line = s->line;
-  String* old_text = Copy(s->text);
+  String *old_text = Copy(s->text);
   int position = Tell(s->str);
 
   int num_levels = 1;
diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h
index 9a4163c2c..95e3784d9 100644
--- a/Source/Swig/swig.h
+++ b/Source/Swig/swig.h
@@ -286,8 +286,8 @@ extern int        ParmList_is_compactdefargs(ParmList *p);
   extern Hash *Swig_name_namewarn_get(Node *n, String *prefix, String *name, SwigType *decl);
   extern void Swig_name_rename_add(String *prefix, String *name, SwigType *decl, Hash *namewrn, ParmList *declaratorparms);
   extern void Swig_name_inherit(String *base, String *derived);
-  extern List *Swig_make_inherit_list(String *clsname, List *names, String* Namespaceprefix);
-  extern void Swig_inherit_base_symbols(List* bases);
+  extern List *Swig_make_inherit_list(String *clsname, List *names, String *Namespaceprefix);
+  extern void Swig_inherit_base_symbols(List *bases);
   extern int Swig_need_protected(Node *n);
   extern int Swig_need_name_warning(Node *n);
   extern int Swig_need_redefined_warn(Node *a, Node *b, int InClass);
diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c
index 79f708d33..d817f1a85 100644
--- a/Source/Swig/tree.c
+++ b/Source/Swig/tree.c
@@ -171,11 +171,10 @@ void prependChild(Node *node, Node *chd) {
   }
 }
 
-void appendSibling(Node *node, Node *chd)
-{
+void appendSibling(Node *node, Node *chd) {
   Node *parent;
-  Node* lc = node;
-  while(nextSibling(lc))
+  Node *lc = node;
+  while (nextSibling(lc))
     lc = nextSibling(lc);
   set_nextSibling(lc, chd);
   set_previousSibling(chd, lc);