cur_input.name_field -> name.

diff --git a/src/texsourc/itex.c b/src/texsourc/itex.c
index 61e2eee..b564aba 100644 (file)
--- a/src/texsourc/itex.c
+++ b/src/texsourc/itex.c
@@ -2247,7 +2247,7 @@ lab1:
       start = 1;
       index = 0;
       line = 0;
-      cur_input.name_field = 0;
+      name = 0;
       force_eof = false;
       align_state = 1000000L;
 

diff --git a/src/texsourc/local.c b/src/texsourc/local.c
index b63f575..7c3adb9 100644 (file)
--- a/src/texsourc/local.c
+++ b/src/texsourc/local.c
@@ -2091,7 +2091,7 @@ void reorderargs (int ac, char **av)
   }
 }
 
-int test_align (int address, int size, char *name)
+int test_align (int address, int size, char *str)
 {
   int n;
 
@@ -2102,7 +2102,7 @@ int test_align (int address, int size, char *name)
 
   if (n != 0)
   {
-    sprintf(log_line, "OFFSET %d (ELEMENT %d) in %s\n", n, size, name);
+    sprintf(log_line, "OFFSET %d (ELEMENT %d) in %s\n", n, size, str);
     show_line(log_line, 0);
   }
 
@@ -2943,14 +2943,14 @@ void perrormod (char *s)
 /* this is then undone in tex3.c both for fopen input and output */
 /* not ideal, since pseudo name appears in log and in error messages ... */
 
-void hidetwiddle (char *name)
+void hidetwiddle (char *tname)
 {
-  char *s = name;
+  char *s = tname;
 
 #ifdef DEBUGTWIDDLE
   if (trace_flag)
   {
-    sprintf(log_line, "Hidetwiddle %s", name);
+    sprintf(log_line, "Hidetwiddle %s", tname);
     show_line(log_line, 0);
   }
 #endif
@@ -2967,7 +2967,7 @@ void hidetwiddle (char *name)
 #ifdef DEBUGTWIDDLE
   if (trace_flag)
   {
-    sprintf(log_line, "=> %s\n", name);
+    sprintf(log_line, "=> %s\n", tname);
     show_line(log_line, 0);
   }
 #endif

diff --git a/src/texsourc/openinou.c b/src/texsourc/openinou.c
index b796ebb..3e63ff6 100644 (file)
--- a/src/texsourc/openinou.c
+++ b/src/texsourc/openinou.c
@@ -22,6 +22,7 @@
 #define EXTERN extern
 
 #include "texd.h"
+#undef name
 
 extern char * dvi_directory;
 extern char * log_directory;

diff --git a/src/texsourc/tex2.c b/src/texsourc/tex2.c
index b89eb10..69444c7 100644 (file)
--- a/src/texsourc/tex2.c
+++ b/src/texsourc/tex2.c
@@ -207,7 +207,7 @@ void show_context (void)
     cur_input = input_stack[base_ptr];
 
     if ((state != token_list))
-      if ((cur_input.name_field > 17) || (base_ptr == 0))
+      if ((name > 17) || (base_ptr == 0))
         bottom_line = true;
 
     if ((base_ptr == input_ptr) || bottom_line || (nn < error_context_lines))
@@ -220,8 +220,8 @@ void show_context (void)
 
         if (state != token_list)
         {
-          if (cur_input.name_field <= 17)
-            if ((cur_input.name_field == 0))
+          if (name <= 17)
+            if ((name == 0))
               if (base_ptr == 0)
                 print_nl("<*>");
               else
@@ -230,10 +230,10 @@ void show_context (void)
             {
               print_nl("<read ");
 
-              if (cur_input.name_field == 17)
+              if (name == 17)
                 print_char('*');
               else
-                print_int(cur_input.name_field - 1);
+                print_int(name - 1);
 
               print_char('>');
             }
@@ -243,8 +243,8 @@ void show_context (void)
             {
               print_ln();
 
-              if (cur_input.name_field > 17)
-                print(cur_input.name_field);
+              if (name > 17)
+                print(name);
 
               print_char('(');
               print_int(line);
@@ -300,7 +300,7 @@ void show_context (void)
 
             case macro:
               print_ln();
-              print_cs(cur_input.name_field);
+              print_cs(name);
               break;
 
             case output_text:
@@ -571,7 +571,7 @@ void begin_file_reading (void)
   line_stack[index] = line;
   start = first;
   state = 1;
-  cur_input.name_field = 0;
+  name = 0;
 }
 /* sec 0329 */
 void end_file_reading (void)
@@ -579,7 +579,7 @@ void end_file_reading (void)
   first = start;
   line = line_stack[index];
 
-  if (cur_input.name_field > 17)
+  if (name > 17)
     a_close(cur_file);
 
   pop_input();
@@ -589,7 +589,7 @@ void end_file_reading (void)
 /* sec 0330 */
 void clear_for_error_prompt (void) 
 {
-  while ((state != 0) && (cur_input.name_field == 0) &&
+  while ((state != 0) && (name == 0) &&
     (input_ptr > 0) && (loc > limit))
     end_file_reading();
 
@@ -607,7 +607,7 @@ void check_outer_validity (void)
 
     if (cur_cs != 0)
     {
-      if ((state == 0) || (cur_input.name_field < 1) || (cur_input.name_field > 17))
+      if ((state == 0) || (name < 1) || (name > 17))
       {
         p = get_avail();
         info(p) = cs_token_flag + cur_cs;
@@ -1000,7 +1000,7 @@ found:
     end_token_list();
 
   begin_token_list(ref_count, macro);
-  cur_input.name_field = warning_index;
+  name = warning_index;
   loc = link(r);
 
   if (n > 0)
@@ -2161,7 +2161,7 @@ found:
     {
       state = new_line;
 
-      if (cur_input.name_field > 17)
+      if (name > 17)
       {
         incr(line);
         first = start;
@@ -2195,7 +2195,7 @@ found:
       }
       else
       {
-        if (!(cur_input.name_field == 0))
+        if (!(name == 0))
         {
           cur_cmd = 0;
           cur_chr = 0;

diff --git a/src/texsourc/tex3.c b/src/texsourc/tex3.c
index 1604054..41faf13 100644 (file)
--- a/src/texsourc/tex3.c
+++ b/src/texsourc/tex3.c
@@ -961,7 +961,7 @@ void read_toks_(integer n, halfword r)
   do
     {
       begin_file_reading();
-      cur_input.name_field = m + 1;
+      name = m + 1;
 
       if (read_open[m] == closed)
         if (interaction > nonstop_mode)
@@ -1976,7 +1976,7 @@ void start_input(void)
   }
 
 done: 
-  cur_input.name_field = a_make_name_string(cur_file);
+  name = a_make_name_string(cur_file);
 
   if (job_name == 0)
   {
@@ -1984,7 +1984,7 @@ done:
     open_log_file();
   }
 
-  if (term_offset + length(cur_input.name_field) > max_print_line - 2)
+  if (term_offset + length(name) > max_print_line - 2)
     print_ln();
   else if ((term_offset > 0) || (file_offset > 0))
     print_char(' ');
@@ -1995,7 +1995,7 @@ done:
   if (open_parens > max_open_parens)
     max_open_parens = open_parens;
 
-  slow_print(cur_input.name_field);
+  slow_print(name);
   update_terminal();
   state = new_line;
 

diff --git a/src/texsourc/yandy_macros.h b/src/texsourc/yandy_macros.h
index 914abe4..1d2b53b 100644 (file)
--- a/src/texsourc/yandy_macros.h
+++ b/src/texsourc/yandy_macros.h
@@ -747,7 +747,7 @@ while (0)
 #define index cur_input.index_field
 #define start cur_input.start_field
 #define limit cur_input.limit_field
-//#define name 
+#define name  cur_input.name_field
 /* sec 0303 */
 #define mid_line    1
 #define skip_blanks 2 + max_char_code // 17