Changeset d2d7fc

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

c96b1d

Parents:

ab755a

git-author:

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

git-committer:

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

Message:

Extracted reading of input char array into keyvalue into own function.

File:

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

src/bin/mpqc/mpqc.cc

@@ -615 +615 @@
 }
 
+/** Parse the input configuration from char array into keyvalue container.
+ *
+ * \param parsedkv key value container to foll
+ * \param values temporary options value structure
+ * \param in_char_array char array with input file
+ * \param use_simple_input whether the format in \a in_char_array is simple (1)
+ *        or object-oriented (0)
+ */
+void parseIntoKeyValue(
+    Ref<ParsedKeyVal> &parsedkv,
+    struct OptionValues &values,
+    char *in_char_array,
+    int use_simple_input)
+{
+  if (use_simple_input) {
+    MPQCIn mpqcin;
+    char *simple_input_text = mpqcin.parse_string(in_char_array);
+    if (values.simple_input) {
+      ExEnv::out0() << "Generated object-oriented input file:" << endl
+                   << simple_input_text
+                   << endl;
+      exit(0);
+    }
+    parsedkv = new ParsedKeyVal();
+    parsedkv->parse_string(simple_input_text);
+    delete[] simple_input_text;
+  } else {
+    parsedkv = new ParsedKeyVal();
+    parsedkv->parse_string(in_char_array);
+  }
+}
+
 /** Parse the input file into the key value container.
  *
@@ -622 +654 @@
  * \param input input file name
  * \param generic_input filename of generic input
+ * \param in_char_array char array with input file's contents on return
+ * \param use_simple_input whether the file contents is in simple format (1)
+ *        or object-oriented (0)
  */
 void parseInputfile(
@@ -628 +663 @@
     struct OptionValues &values,
     const char *&input,
-    const char *&generic_input
+    const char *&generic_input,
+    char *&in_char_array,
+    int &use_simple_input
     )
 {
   // read the input file on only node 0
-  char *in_char_array;
   if (grp->me() == 0) {
     ifstream is(input);
@@ -657 +693 @@
     }
 
-  int use_simple_input;
   if (generic_input && grp->me() == 0) {
     MPQCIn mpqcin;
@@ -666 +701 @@
   }
   grp->bcast(use_simple_input);
-
-  if (use_simple_input) {
-    MPQCIn mpqcin;
-    char *simple_input_text = mpqcin.parse_string(in_char_array);
-    if (values.simple_input) {
-      ExEnv::out0() << "Generated object-oriented input file:" << endl
-                   << simple_input_text
-                   << endl;
-      exit(0);
-    }
-    parsedkv = new ParsedKeyVal();
-    parsedkv->parse_string(simple_input_text);
-    delete[] simple_input_text;
-    }
-  else {
-    parsedkv = new ParsedKeyVal();
-    parsedkv->parse_string(in_char_array);
-    }
-  delete[] in_char_array;
 }
 
@@ -1174 +1190 @@
   // parse input into keyvalue container
   Ref<ParsedKeyVal> parsedkv;
-  parseInputfile(grp, parsedkv, values, input, generic_input);
+  char *in_char_array = 0;
+  int use_simple_input;
+  parseInputfile(grp, parsedkv, values, input, generic_input, in_char_array, use_simple_input);
+  parseIntoKeyValue(parsedkv, values, in_char_array, use_simple_input);
+  delete[] in_char_array;
 
   // prefix parsed values wit "mpqc"