Rename linemgr.c and linemgr.h to linemap.c and linemap.h. The "manager"

part of linemgr is long gone, and the current naming is a little confusing.

svn path=/trunk/yasm/; revision=1701

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 7b06044ec4e25a1b0d05671b3b12dcadcfe0bccb..3b233a651efac9e67ca1aeae571a990e0168efcd 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -33,7 +33,7 @@ LIBYASM_OBJS= \
  libyasm/hamt.o \
  libyasm/intnum.o \
  libyasm/inttree.o \
- libyasm/linemgr.o \
+ libyasm/linemap.o \
  libyasm/md5.o \
  libyasm/mergesort.o \
  libyasm/phash.o \

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 8c4047476a6d56df2c6996e139f1667047e3b0ed..155406e4a86b8109be7b9c12877f0d3c23395104 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -36,7 +36,7 @@ LIBYASM_OBJS= \
  libyasm/hamt.o \
  libyasm/intnum.o \
  libyasm/inttree.o \
- libyasm/linemgr.o \
+ libyasm/linemap.o \
  libyasm/md5.o \
  libyasm/mergesort.o \
  libyasm/phash.o \

diff --git a/Mkfiles/vc/libyasm/libyasm.vcproj b/Mkfiles/vc/libyasm/libyasm.vcproj
index 47d849a5467d6bcdfa0bf22eb0fc4f0485ed72fa..375f3397f9b5c45a2c8bc9cc0ed526d9ae7c8d55 100644 (file)
--- a/Mkfiles/vc/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc/libyasm/libyasm.vcproj
@@ -172,7 +172,7 @@
                                RelativePath="..\..\..\libyasm\inttree.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libyasm\linemgr.c">\r
+                               RelativePath="..\..\..\libyasm\linemap.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\md5.c">\r
@@ -266,7 +266,7 @@
                                RelativePath="..\..\..\libyasm\inttree.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libyasm\linemgr.h">\r
+                               RelativePath="..\..\..\libyasm\linemap.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\md5.h">\r

diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index 45d01489730c6907efe9b0868e12230044894bc7..287c988f771559ff4a5f4481caacf71c810fd88a 100644 (file)
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -396,7 +396,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libyasm\linemgr.c"\r
+                               RelativePath="..\..\..\libyasm\linemap.c"\r
                                >\r
                        </File>\r
                        <File\r
@@ -517,7 +517,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libyasm\linemgr.h"\r
+                               RelativePath="..\..\..\libyasm\linemap.h"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/libyasm.h b/libyasm.h
index 5ab8726590cb9fa93a3d4efcff7b4931c9af4be5..47af05c2603ad46eb420b8e26eb55cd36c5e3155 100644 (file)
--- a/libyasm.h
+++ b/libyasm.h
@@ -54,7 +54,7 @@
 #include <libyasm/coretype.h>
 #include <libyasm/valparam.h>
 
-#include <libyasm/linemgr.h>
+#include <libyasm/linemap.h>
 
 #include <libyasm/errwarn.h>
 #include <libyasm/intnum.h>

diff --git a/libyasm/Makefile.inc b/libyasm/Makefile.inc
index fb75715743af94aa61a324d9ee26a144a8429952..2fc87633114fc5a20a3d4d4aeab7b513afda0458 100644 (file)
--- a/libyasm/Makefile.inc
+++ b/libyasm/Makefile.inc
@@ -17,7 +17,7 @@ libyasm_a_SOURCES += libyasm/floatnum.c
 libyasm_a_SOURCES += libyasm/hamt.c
 libyasm_a_SOURCES += libyasm/intnum.c
 libyasm_a_SOURCES += libyasm/inttree.c
-libyasm_a_SOURCES += libyasm/linemgr.c
+libyasm_a_SOURCES += libyasm/linemap.c
 libyasm_a_SOURCES += libyasm/md5.c
 libyasm_a_SOURCES += libyasm/mergesort.c
 libyasm_a_SOURCES += libyasm/phash.c
@@ -67,7 +67,7 @@ modinclude_HEADERS += libyasm/floatnum.h
 modinclude_HEADERS += libyasm/hamt.h
 modinclude_HEADERS += libyasm/intnum.h
 modinclude_HEADERS += libyasm/inttree.h
-modinclude_HEADERS += libyasm/linemgr.h
+modinclude_HEADERS += libyasm/linemap.h
 modinclude_HEADERS += libyasm/listfmt.h
 modinclude_HEADERS += libyasm/md5.h
 modinclude_HEADERS += libyasm/module.h

diff --git a/libyasm/bc-incbin.c b/libyasm/bc-incbin.c
index 6137db7c264680b80ef075dbc42afdda7652f80b..9e6e7b3719cad36eb51ea9d824c2175ff4ed466f 100644 (file)
--- a/libyasm/bc-incbin.c
+++ b/libyasm/bc-incbin.c
@@ -30,7 +30,7 @@
 
 #include "coretype.h"
 
-#include "linemgr.h"
+#include "linemap.h"
 
 #include "errwarn.h"
 #include "intnum.h"

diff --git a/libyasm/coretype.h b/libyasm/coretype.h
index 3fed09afad6073457279a428eb0edafeb752aea1..2affee2894c46f2798cbbe97ad216ee61af82d15 100644 (file)
--- a/libyasm/coretype.h
+++ b/libyasm/coretype.h
@@ -160,7 +160,7 @@ typedef struct yasm_value {
 /** Maximum value of #yasm_value.rshift */
 #define YASM_VALUE_RSHIFT_MAX  127
 
-/** Line number mapping repository (opaque type).  \see linemgr.h for related
+/** Line number mapping repository (opaque type).  \see linemap.h for related
  * functions.
  */
 typedef struct yasm_linemap yasm_linemap;

diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c
index cb8557439a70c25491799d18f03d8f812e37a41e..17fef16b7ea7255478bef54c6a0bc20bf8bbba91 100644 (file)
--- a/libyasm/errwarn.c
+++ b/libyasm/errwarn.c
@@ -36,7 +36,7 @@
 
 #include "coretype.h"
 
-#include "linemgr.h"
+#include "linemap.h"
 #include "errwarn.h"
 
 

diff --git a/libyasm/linemgr.c b/libyasm/linemap.c
similarity index 98%
rename from libyasm/linemgr.c
rename to libyasm/linemap.c
index fba32738ab6e8c4fa7933754a307de0b5c56e00b..08ad385b547f4765bc5e6311af77463abe0a33e4 100644 (file)
--- a/libyasm/linemgr.c
+++ b/libyasm/linemap.c
@@ -1,5 +1,5 @@
 /*
- * YASM assembler line manager (for parse stage)
+ * YASM assembler virtual line mapping handling (for parse stage)
  *
  *  Copyright (C) 2002  Peter Johnson
  *
@@ -32,7 +32,7 @@
 #include "hamt.h"
 
 #include "errwarn.h"
-#include "linemgr.h"
+#include "linemap.h"
 
 
 /* Source lines tracking */

diff --git a/libyasm/linemgr.h b/libyasm/linemap.h
similarity index 97%
rename from libyasm/linemgr.h
rename to libyasm/linemap.h
index 09e9cb3be3cf28bf292ae1fe76518209d07bc2e1..411d995eaf02c29a1d867670d35dcc24465bf85e 100644 (file)
--- a/libyasm/linemgr.h
+++ b/libyasm/linemap.h
@@ -1,6 +1,6 @@
 /**
- * \file libyasm/linemgr.h
- * \brief YASM virtual line mapping management interface.
+ * \file libyasm/linemap.h
+ * \brief YASM virtual line mapping interface.
  *
  * \rcs
  * $Id$
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * \endlicense
  */
-#ifndef YASM_LINEMGR_H
-#define YASM_LINEMGR_H
+#ifndef YASM_LINEMAP_H
+#define YASM_LINEMAP_H
 
 /** Create a new line mapping repository.
  * \return New repository.

diff --git a/libyasm/section.c b/libyasm/section.c
index faa4396d69860f5469254dd4d7a7bda9635a5926..9945f29161eae64ff59329a702670b30460e3585 100644 (file)
--- a/libyasm/section.c
+++ b/libyasm/section.c
@@ -34,7 +34,7 @@
 #include "valparam.h"
 #include "assocdat.h"
 
-#include "linemgr.h"
+#include "linemap.h"
 #include "errwarn.h"
 #include "intnum.h"
 #include "expr.h"