Remove duplicate code in tool-interface

sources/app/tool-invoke/tool-invoke.dylan

@@ -1,5 +1,5 @@
 Module:    tool-invoke
-Synopsis:  A standalone program to invoke Functional Developer tools on 
+Synopsis:  A standalone program to invoke Functional Developer tools on
 	   specification files.
 Author:    7/98 Seth LaForge
 Copyright:    Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
@@ -15,7 +15,7 @@ define method main () => ()
         exit-application(2);
       end if;
     end method;
-  local method yn-handler (c :: <tool-yes-no-question>, next :: <function>) 
+  local method yn-handler (c :: <tool-yes-no-question>, next :: <function>)
 		       => (answer :: <boolean>)
     format-out("%s (y/n) ", c);
     force-output(*standard-output*);
@@ -30,7 +30,7 @@ define method main () => ()
 
   let args = application-arguments();
   if (size(args) < 1 | size(args) > 2)
-    format-out("Usage: %s <specification-file-name> [<project-file-name>]\n", 
+    format-out("Usage: %s <specification-file-name> [<project-file-name>]\n",
       	       application-name());
     exit-application(1);
   end if;
@@ -39,7 +39,7 @@ define method main () => ()
   if (project-file)
     project-file := as(<file-locator>, project-file);
   end if;
-  
+
   let tool-name = tool-name-from-specification(spec-file);
   let tool = tool-find(tool-name);
   if (tool)

sources/corba/scepter/tool/tool-scepter-library.dylan

@@ -9,6 +9,7 @@ define library tool-scepter
   use dylan;
   use common-dylan;
   use collections;
+  use file-source-records;
   use system;
   use io;
   use tools-interface;

sources/corba/scepter/tool/tool-scepter-module.dylan

@@ -7,6 +7,7 @@ Warranty:     Distributed WITHOUT WARRANTY OF ANY KIND
 
 define module tool-scepter
   use common-dylan;
+  use file-source-records;
   use format;
   use streams;
   use table-extensions;

sources/corba/scepter/tool/tool-scepter.dylan

@@ -138,7 +138,7 @@ end method;
 
 define inline-only function read-spec-file (file :: <file-locator>)
  => (specification)
-  read-keyword-pair-file(file);
+  read-file-header(file);
 end function;
 
 define function date-as-string (date :: false-or(<date>)) => (r :: <string>)

sources/lib/motley/tool-iface.dylan

@@ -16,7 +16,7 @@ define function motley-invoke
   debug-message("Motley invoked.  Spec: %=, project: %=, last: %=, clean: %=\n",
   		spec-file, project-file, last-run & date-as-string(last-run),
 		clean-build?);
-  let spec-keys = read-keyword-pair-file(spec-file);
+  let spec-keys = read-file-header(spec-file);
   motley-process-spec(spec-keys, spec-file, project-file, last-run, 
 		      clean-build?: clean-build?);
 end function motley-invoke;

sources/lib/parser-generator/tool/library.dylan

@@ -8,6 +8,7 @@ Warranty:     Distributed WITHOUT WARRANTY OF ANY KIND
 define library tool-parser-generator
   use dylan;
   use common-dylan;
+  use file-source-records;
   use io;
   use system;
   use tools-interface;

sources/lib/parser-generator/tool/module.dylan

@@ -9,6 +9,7 @@ define module tool-parser-generator
   use common-dylan;
   use simple-debugging, import: { debug-out };
   use date;
+  use file-source-records;
   use file-system;
   use format;
   use streams;

sources/lib/parser-generator/tool/tool-parser-generator.dylan

@@ -19,7 +19,7 @@ define method parser-generator-invoke
 
   let keyval = keyword-file-element-value;
   let keyline = keyword-file-element-line;
-  let spec = read-keyword-pair-file(spec-file);
+  let spec = read-file-header(spec-file);
   local method key (sym :: <symbol>) element(spec, sym, default: #()) end;
   local method single (sym :: <symbol>, #key default = $unsupplied)
     if (sym.key.size = 1)

sources/lib/source-records/header-reader.dylan

@@ -13,7 +13,7 @@ define class <bad-header> (<simple-error>)
 end;
 
 define method read-file-header (file :: <locator>)
- => (keys :: <table>, lines :: <integer>, chars :: <integer>)
+ => (keys :: <table>, nlines :: <integer>, nchars :: <integer>)
   block ()
     with-open-file (stream = file)
       read-header-from-stream(stream)
@@ -27,6 +27,12 @@ end method;
 
 define constant $unique-header-keywords =  #(#"module", #"language");
 
+// Read 'key: val' pairs up through the empty line that separates the header
+// from the main source code. Returns
+//   * a table mapping key (interned as a symbol) to values which are either a
+//     single string or, if there were continuation lines, a sequence of strings.
+//   * the number of lines read
+//   * the number of characters read
 define method read-header-from-stream (stream :: <stream>)
  => (keys :: <table>, lines :: <integer>, chars :: <integer>)
   let keys = make(<table>);
@@ -49,6 +55,7 @@ define method read-header-from-stream (stream :: <stream>)
   end
 end method;
 
+// Read one 'key: val' pair, with val possibly having continuation lines.
 define method read-file-header-component (stream :: <stream>)
  => (key, strings, nlines, end-of-header?)
   let (key-line, nl?) = read-line(stream, on-end-of-stream: "");
@@ -65,8 +72,9 @@ define method read-file-header-component (stream :: <stream>)
         if (header-end-marker-line?(continuation-line))
           values(key, reverse!(text-strings), nlines, #t)
         else
-          let text = parse-header-continuation-line(continuation-line);
-          loop(pair(text, text-strings), nlines)
+          loop(pair(strip(continuation-line, test: header-whitespace?),
+                    text-strings),
+               nlines)
         end
       else
         char & unread-element(stream, char);
@@ -77,11 +85,9 @@ define method read-file-header-component (stream :: <stream>)
 end method;
 
 define method parse-header-keyword-line (line :: <string>)
-  let colon = position(line, ':');
-  if (~colon)
-    signal(make(<bad-header>,
-                message: format-to-string("Syntax error on line: %=", line)))
-  end;
+  let colon = position(line, ':')
+    | signal(make(<bad-header>,
+                  message: format-to-string("Syntax error on line: %=", line)));
   values(as(<symbol>, copy-sequence(line, end: colon)),
          strip(line, start: colon + 1, test: header-whitespace?))
 end method;
@@ -91,10 +97,6 @@ define inline function header-whitespace? (c :: <character>) => (white? :: <bool
   c == ' ' | c == '\t'
 end;
 
-define method parse-header-continuation-line (line :: <string>)
-  strip(line, test: header-whitespace?)
-end method;
-
 define function header-end-marker-line? (line :: <string>)
   every?(header-whitespace?, line)
 end function;

sources/project-manager/tools-interface/library.dylan

@@ -10,8 +10,9 @@ Warranty:     Distributed WITHOUT WARRANTY OF ANY KIND
 define library tools-interface
   use dylan;
   use common-dylan;
-  use system;
+  use file-source-records;
   use io;
+  use system;
 
   export tools-interface;
 end library tools-interface;
@@ -21,6 +22,7 @@ define module tools-interface
   use dylan;
   use common-extensions;
   use machine-words;
+  use file-source-records;
   use format;
   use format-out;
   use locators;
@@ -59,7 +61,6 @@ define module tools-interface
          project-information-base-address-setter,
          project-information-remaining-keys-setter;
 
-  export read-keyword-pair-file, read-keyword-pair-stream;
   export write-keyword-pair-file, write-keyword-pair-stream;
   export <keyword-file-element>,
            keyword-file-element-value, keyword-file-element-value-setter,