Refactoring only: move conversion to separate function

In preparation of an upcoming change, move the large loop bodies to a
function of their own.

Author: tautschnig

src/ansi-c/file_converter.cpp

@@ -12,34 +12,35 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #include <string>
 
-int main()
+static void convert_line(const std::string &line)
 {
-  std::string line;
+  std::cout << "\"";
 
-  while(getline(std::cin, line))
+  for(std::size_t i = 0; i < line.size(); i++)
   {
-    std::cout << "\"";
-
-    for(std::size_t i=0; i<line.size(); i++)
+    const char ch = line[i];
+    if(ch == '\\')
+      std::cout << "\\\\";
+    else if(ch == '"')
+      std::cout << "\\\"";
+    else if(ch == '\r' || ch == '\n')
     {
-      const char ch=line[i];
-      if(ch=='\\')
-        std::cout << "\\\\";
-      else if(ch=='"')
-        std::cout << "\\\"";
-      else if(ch=='\r' || ch=='\n')
-      {
-      }
-      else if((ch&0x80)!=0)
-      {
-        std::cout << "\\x"
-                  << std::hex << (unsigned(ch)&0xff)
-                  << std::dec;
-      }
-      else
-        std::cout << ch;
     }
-
-    std::cout << "\\n\"\n";
+    else if((ch & 0x80) != 0)
+    {
+      std::cout << "\\x" << std::hex << (unsigned(ch) & 0xff) << std::dec;
+    }
+    else
+      std::cout << ch;
   }
+
+  std::cout << "\\n\"\n";
+}
+
+int main()
+{
+  std::string line;
+
+  while(getline(std::cin, line))
+    convert_line(line);
 }

src/ansi-c/library/converter.cpp

@@ -15,51 +15,57 @@ bool has_prefix(const std::string &s, const std::string &prefix)
   return std::string(s, 0, prefix.size())==prefix;
 }
 
-int main()
+static void convert_line(const std::string &line, bool first)
 {
-  std::string line;
-  bool first=true;
+  if(has_prefix(line, "/* FUNCTION: "))
+  {
+    if(!first)
+      std::cout << "},\n";
 
-  std::cout << "{\n";
+    std::string function = std::string(line, 13, std::string::npos);
+    std::size_t pos = function.find(' ');
+    if(pos != std::string::npos)
+      function = std::string(function, 0, pos);
 
-  while(getline(std::cin, line))
+    std::cout << "{ \"" << function << "\",\n";
+    std::cout << "  \"#line 1 \\\"<builtin-library-" << function
+              << ">\\\"\\n\"\n";
+  }
+  else if(!first)
   {
-    if(has_prefix(line, "/* FUNCTION: "))
+    std::cout << "  \"";
+
+    for(unsigned i = 0; i < line.size(); i++)
     {
-      if(first)
-        first=false;
+      const char ch = line[i];
+      if(ch == '\\')
+        std::cout << "\\\\";
+      else if(ch == '"')
+        std::cout << "\\\"";
+      else if(ch == '\r' || ch == '\n')
+      {
+      }
       else
-        std::cout << "},\n";
+        std::cout << ch;
+    }
 
-      std::string function=std::string(line, 13, std::string::npos);
-      std::size_t pos=function.find(' ');
-      if(pos!=std::string::npos)
-        function=std::string(function, 0, pos);
+    std::cout << "\\n\"\n";
+  }
+}
 
-      std::cout << "{ \"" << function << "\",\n";
-      std::cout << "  \"#line 1 \\\"<builtin-library-"
-                << function << ">\\\"\\n\"\n";
-    }
-    else if(!first)
-    {
-      std::cout << "  \"";
+int main()
+{
+  std::string line;
+  bool first = true;
 
-      for(unsigned i=0; i<line.size(); i++)
-      {
-        const char ch=line[i];
-        if(ch=='\\')
-          std::cout << "\\\\";
-        else if(ch=='"')
-          std::cout << "\\\"";
-        else if(ch=='\r' || ch=='\n')
-        {
-        }
-        else
-          std::cout << ch;
-      }
+  std::cout << "{\n";
 
-      std::cout << "\\n\"\n";
-    }
+  if(getline(std::cin, line))
+  {
+    convert_line(line, true);
+    first = false;
+    while(getline(std::cin, line))
+      convert_line(line, false);
   }
 
   if(!first)