Save filename as well as line number for each symbol.

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

diff --git a/libyasm/symrec.c b/libyasm/symrec.c
index 779e03a1c525188000503c7341b60416acf1e23e..2196638e4c5eb9e931a1508fdc56891688b8dfd4 100644 (file)
--- a/libyasm/symrec.c
+++ b/libyasm/symrec.c
@@ -67,6 +67,7 @@ symrec_get_or_new(char *name, SymType type)
        Fatal(FATAL_NOMEM);
     rec->type = type;
     rec->value = 0;
+    rec->filename = strdup(filename);
     rec->line = line_number;
     rec->status = SYM_NOSTATUS;
 

diff --git a/libyasm/symrec.h b/libyasm/symrec.h
index 936c67284435ddda931208d8315ba771ee2e903c..fd2e5c387ac70b178fd74e996bc3c849a258d71e 100644 (file)
--- a/libyasm/symrec.h
+++ b/libyasm/symrec.h
@@ -38,7 +38,8 @@ typedef struct symrec_s {
     char *name;
     SymType type;
     SymStatus status;
-    int line;                  /* line symbol was first declared or used on */
+    char *filename;            /* file and line */
+    int line;                  /*  symbol was first declared or used on */
     double value;
 } symrec;
 

diff --git a/src/symrec.c b/src/symrec.c
index 779e03a1c525188000503c7341b60416acf1e23e..2196638e4c5eb9e931a1508fdc56891688b8dfd4 100644 (file)
--- a/src/symrec.c
+++ b/src/symrec.c
@@ -67,6 +67,7 @@ symrec_get_or_new(char *name, SymType type)
        Fatal(FATAL_NOMEM);
     rec->type = type;
     rec->value = 0;
+    rec->filename = strdup(filename);
     rec->line = line_number;
     rec->status = SYM_NOSTATUS;
 

diff --git a/src/symrec.h b/src/symrec.h
index 936c67284435ddda931208d8315ba771ee2e903c..fd2e5c387ac70b178fd74e996bc3c849a258d71e 100644 (file)
--- a/src/symrec.h
+++ b/src/symrec.h
@@ -38,7 +38,8 @@ typedef struct symrec_s {
     char *name;
     SymType type;
     SymStatus status;
-    int line;                  /* line symbol was first declared or used on */
+    char *filename;            /* file and line */
+    int line;                  /*  symbol was first declared or used on */
     double value;
 } symrec;