From 2872b6a7ca4e01e6c84a87f13fa6b2c110c1b6ed Mon Sep 17 00:00:00 2001
From: Marcelo Matus <mmatus@acms.arizona.edu>
Date: Thu, 15 Jan 2004 09:02:41 +0000
Subject: [PATCH] minor cosmetic fixes in the 'error' attribute

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5636 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Source/CParse/parser.y | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/SWIG/Source/CParse/parser.y b/SWIG/Source/CParse/parser.y
index 1e18146f6..75682201c 100644
--- a/SWIG/Source/CParse/parser.y
+++ b/SWIG/Source/CParse/parser.y
@@ -399,7 +399,8 @@ static void add_symbols(Node *n) {
 	      Swig_warning(WARN_PARSE_REDUNDANT,Getfile(n),Getline(n),"%s\n",en);
 	      Swig_warning(WARN_PARSE_REDUNDANT,Getfile(c),Getline(c),"%s\n",ec);
 	    }
-	    Printf(e,"%s\n%s:%d:%s\n",en,Getfile(c),Getline(c),ec);
+	    Printf(e,"%s:%d:%s\n%s:%d:%s\n",Getfile(n),Getline(n),en,
+		   Getfile(c),Getline(c),ec);
 	    Setattr(n,"error",e);
 	    Delete(en);
 	    Delete(ec);
@@ -544,11 +545,12 @@ static void merge_extensions(Node *cls, Node *am) {
 	String *e = NewString("");
 	String *en = NewString("");
 	String *ec = NewString("");
-	Printf(ec,"Identifier '%s' redefined by %extend (ignored),\n", symname);
-	Printf(en,"%%extend definition of '%s'.", symname);
-	Swig_warning(WARN_PARSE_REDEFINED,Getfile(csym), Getline(csym), "%s\n", ec);
-	Swig_warning(WARN_PARSE_REDEFINED,Getfile(n), Getline(n), "%s\n", en);
-	Printf(e,"%s\n%s:%d:%s\n", ec, Getfile(n), Getline(n), en);
+	Printf(ec,"Identifier '%s' redefined by %%extend (ignored),",symname);
+	Printf(en,"%%extend definition of '%s'.",symname);
+	Swig_warning(WARN_PARSE_REDEFINED,Getfile(csym),Getline(csym),"%s\n",ec);
+	Swig_warning(WARN_PARSE_REDEFINED,Getfile(n),Getline(n),"%s\n",en);
+	Printf(e,"%s:%d:%s\n%s:%d:%s\n",Getfile(csym),Getline(csym),ec, 
+	       Getfile(n),Getline(n),en);
 	Setattr(csym,"error",e);
 	Delete(en);
 	Delete(ec);