# HG changeset patch
# User jwe
# Date 847468733 0
# Node ID 8c6e9535cbdae3d6c83a1b30deb55246e9722528
# Parent  830038ee04aa6355bd9bb0e1bc1fe50b210600e3
[project @ 1996-11-08 15:58:52 by jwe]

diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  8 09:55:40 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install): Use $(INSTALL_PROGRAM) for installing
+	shared library.
+
 Thu Nov  7 12:43:17 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in: Add -lm when building shared library.
diff --git a/libcruft/Makefile.in b/libcruft/Makefile.in
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -87,7 +87,7 @@
 	$(RANLIB) $(libdir)/libcruft.a
 	if $(SHARED_LIBS); then \
 	  rm -f $(libdir)/libcruft.$(SHLEXT); \
-	  $(INSTALL_DATA) libcruft.$(SHLEXT) $(libdir)/libcruft.$(SHLEXT); \
+	  $(INSTALL_PROGRAM) libcruft.$(SHLEXT) $(libdir)/libcruft.$(SHLEXT); \
 	fi
 
 uninstall::
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
+Fri Nov  8 09:54:59 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install-oct): Use $(INSTALL_PROGRAM) for .oct files.
+
 Thu Nov  7 07:59:07 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* variables.cc (gobble_leading_white_space): New arg, update_pos.
+	* (is_function_file): Don't update file position information here.
+
 	* Version 1.91.
 
 	* pt-fvc.cc (tree_indirect_ref::reference): If the lhs object is
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -274,7 +274,7 @@
 	  $(top_srcdir)/mkinstalldirs $(octfiledir) ; \
 	  chmod a+rx mk-oct-links ; \
 	  for f in $(OCT_FILES); do \
-	    $(INSTALL_DATA) $$f $(octfiledir)/$$f; \
+	    $(INSTALL_PROGRAM) $$f $(octfiledir)/$$f; \
 	  done ; \
 	  ./mk-oct-links $(octfiledir) $(addprefix $(srcdir)/, $(DLD_SRC)) ; \
 	fi
diff --git a/src/variables.cc b/src/variables.cc
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -452,13 +452,14 @@
 // Eat whitespace and comments from FFILE, returning the text of the
 // comments read if it doesn't look like a copyright notice.  If
 // IN_PARTS, consider each block of comments separately; otherwise,
-// grab them all at once.
+// grab them all at once.  If UPDATE_POS is TRUE, line and column
+// number information is updated.
 
 // XXX FIXME XXX -- grab_help_text() in lex.l duplicates some of this
 // code!
 
 static string
-gobble_leading_white_space (FILE *ffile, bool in_parts)
+gobble_leading_white_space (FILE *ffile, bool in_parts, bool update_pos)
 {
   string help_txt;
 
@@ -470,7 +471,8 @@
 
   while ((c = getc (ffile)) != EOF)
     {
-      current_input_column++;
+      if (update_pos)
+	current_input_column++;
 
       if (begin_comment)
 	{
@@ -490,15 +492,19 @@
 
 	  if (c == '\n')
 	    {
-	      input_line_number++;
-	      current_input_column = 0;
+	      if (update_pos)
+		{
+		  input_line_number++;
+		  current_input_column = 0;
+		}
 	      in_comment = false;
 
 	      if (in_parts)
 		{
 		  if ((c = getc (ffile)) != EOF)
 		    {
-		      current_input_column--;
+		      if (update_pos)
+			current_input_column--;
 		      ungetc (c, ffile);
 		      if (c == '\n')
 			break;
@@ -521,8 +527,11 @@
 	    case '\n':
 	      if (first_comments_seen)
 		have_help_text = true;
-	      input_line_number++;
-	      current_input_column = 0;
+	      if (update_pos)
+		{
+		  input_line_number++;
+		  current_input_column = 0;
+		}
 	      continue;
 
 	    case '%':
@@ -532,7 +541,8 @@
 	      break;
 
 	    default:
-	      current_input_column--;
+	      if (update_pos)
+		current_input_column--;
 	      ungetc (c, ffile);
 	      goto done;
 	    }
@@ -547,7 +557,7 @@
 	help_txt.resize (0);
 
       if (in_parts && help_txt.empty ())
-	help_txt = gobble_leading_white_space (ffile, in_parts);
+	help_txt = gobble_leading_white_space (ffile, in_parts, update_pos);
     }
 
   return help_txt;
@@ -560,7 +570,7 @@
 
   long pos = ftell (ffile);
 
-  gobble_leading_white_space (ffile, false);
+  gobble_leading_white_space (ffile, false, false);
 
   char buf [10];
   fgets (buf, 10, ffile);
@@ -642,10 +652,10 @@
 
 	  reset_parser ();
 
-	  help_buf = gobble_leading_white_space (ffile, true);
+	  help_buf = gobble_leading_white_space (ffile, true, true);
 
 	  // XXX FIXME XXX -- this should not be necessary.
-	  gobble_leading_white_space (ffile, false);
+	  gobble_leading_white_space (ffile, false, true);
 
 	  int status = yyparse ();
 
@@ -777,7 +787,7 @@
 
       if (fptr)
 	{
-	  retval = gobble_leading_white_space (fptr, true);
+	  retval = gobble_leading_white_space (fptr, true, true);
 	  fclose (fptr);
 	}
     }