Changeset ce1e39 for src/bin/mpqc/mpqc.cc

Timestamp:

Jul 10, 2012, 1:15:51 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

ab755a

Parents:

52aacc

git-author:

Frederik Heber <heber@…> (07/08/12 19:56:08)

git-committer:

Frederik Heber <heber@…> (07/10/12 13:15:51)

Message:

Extracted actual work out of try_main() into own function.

• now only command-lime arguments parsing remains in try_main().

File:

• src/bin/mpqc/mpqc.cc (modified) (4 diffs)

src/bin/mpqc/mpqc.cc

@@ -1128 +1128 @@
 }
 
+void Work(ostream *&outstream, struct OptionValues &values, const char *&input, const char *&generic_input, int argc, char **argv);
+
 int
 try_main(int argc, char *argv[])
@@ -1177 +1179 @@
   parseRemainderOptions(options, values, argc, argv);
 
-  // get the message group.  first try the commandline and environment
-  Ref<MessageGrp> grp;
-  getMessageGroup(grp, argc, argv);
-
   // get input file names, either object-oriented or generic
   const char *object_input = 0;
@@ -1189 +1187 @@
   if (generic_input) input = generic_input;
 
+  // get the basename for output files
+  setOutputBaseName(input, output);
+
+  // now comes the actual work
+  Work(outstream, values, input, generic_input, argc, argv);
+
+  if (output != 0) {
+    ExEnv::set_out(&cout);
+    delete outstream;
+  }
+
+  return 0;
+}
+
+void Work(ostream *&outstream, struct OptionValues &values, const char *&input, const char *&generic_input, int argc, char **argv)
+{
+  // get the message group.  first try the commandline and environment
+  Ref<MessageGrp> grp;
+  getMessageGroup(grp, argc, argv);
+
   // parse input into keyvalue container
   Ref<ParsedKeyVal> parsedkv;
   parseInputfile(grp, parsedkv, values, input, generic_input);
+
+  // prefix parsed values wit "mpqc"
   if (values.keyvalue) parsedkv->verbose(1);
   Ref<KeyVal> keyval = new PrefixKeyVal(parsedkv.pointer(),"mpqc");
-
-  // get the basename for output files
-  setOutputBaseName(input, output);
 
   // set up output classes
@@ -1487 +1504 @@
   ExEnv::out0() << endl
                << indent << scprintf("End Time: %s", tstr) << endl;
-
-  if (output != 0) {
-    ExEnv::set_out(&cout);
-    delete outstream;
-  }
-
-  return 0;
 }