Build system: make C string converters read files

Instead of converting stdin, the converters now open and read the files
they are to convert to C strings. This avoids invoking `cat` in build
steps, which helps portability to non-Unix systems.

Author: tautschnig

src/ansi-c/CMakeLists.txt

@@ -6,14 +6,14 @@ add_executable(converter library/converter.cpp)
 file(GLOB ansi_c_library_sources "library/*.c")
 
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cprover_library.inc"
-    COMMAND cat ${ansi_c_library_sources} | $<TARGET_FILE:converter> > "${CMAKE_CURRENT_BINARY_DIR}/cprover_library.inc"
+    COMMAND $<TARGET_FILE:converter> ${ansi_c_library_sources} > "${CMAKE_CURRENT_BINARY_DIR}/cprover_library.inc"
     DEPENDS converter ${ansi_c_library_sources})
 
 add_executable(file_converter file_converter.cpp)
 
 function(make_inc name)
     add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.inc"
-        COMMAND file_converter < "${CMAKE_CURRENT_SOURCE_DIR}/${name}.h" > "${CMAKE_CURRENT_BINARY_DIR}/${name}.inc"
+        COMMAND file_converter "${CMAKE_CURRENT_SOURCE_DIR}/${name}.h" > "${CMAKE_CURRENT_BINARY_DIR}/${name}.inc"
         DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.h" file_converter
     )
 endfunction(make_inc)

src/ansi-c/Makefile

@@ -110,10 +110,10 @@ library_check: library/*.c
 	touch $@
 
 cprover_library.inc: library/converter$(EXEEXT) library/*.c
-	cat library/*.c | library/converter$(EXEEXT) > $@
+	library/converter$(EXEEXT) library/*.c > $@
 
 %.inc: %.h file_converter$(EXEEXT)
-	./file_converter$(EXEEXT) < $< > $@
+	./file_converter$(EXEEXT) $< > $@
 
 ansi_c_internal_additions$(OBJEXT): $(BUILTIN_FILES)
 

src/ansi-c/file_converter.cpp

@@ -9,6 +9,7 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Convert file contents to C strings
 
+#include <fstream>
 #include <iostream>
 #include <string>
 
@@ -37,10 +38,23 @@ static void convert_line(const std::string &line)
   std::cout << "\\n\"\n";
 }
 
-int main()
+int main(int argc, char *argv[])
 {
   std::string line;
 
-  while(getline(std::cin, line))
-    convert_line(line);
+  for(int i = 1; i < argc; ++i)
+  {
+    std::ifstream input_file(argv[i]);
+
+    if(!input_file)
+    {
+      std::cerr << "Failed to open " << argv[i] << '\n';
+      return 1;
+    }
+
+    while(getline(input_file, line))
+      convert_line(line);
+  }
+
+  return 0;
 }

src/ansi-c/library/converter.cpp

@@ -6,7 +6,7 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-
+#include <fstream>
 #include <iostream>
 #include <string>
 
@@ -53,19 +53,28 @@ static void convert_line(const std::string &line, bool first)
   }
 }
 
-int main()
+int main(int argc, char *argv[])
 {
   std::string line;
   bool first = true;
 
   std::cout << "{\n";
 
-  if(getline(std::cin, line))
+  for(int i = 1; i < argc; ++i)
   {
-    convert_line(line, true);
-    first = false;
-    while(getline(std::cin, line))
-      convert_line(line, false);
+    std::ifstream input_file(argv[i]);
+
+    if(!input_file)
+    {
+      std::cerr << "Failed to open " << argv[i] << '\n';
+      return 1;
+    }
+
+    while(getline(input_file, line))
+    {
+      convert_line(line, first);
+      first = false;
+    }
   }
 
   if(!first)
@@ -74,4 +83,6 @@ int main()
   std::cout <<
     "{ 0, 0 }\n"
     "}";
+
+  return 0;
 }

src/cpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 file(GLOB cpp_library_sources "library/*.c")
 
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cprover_library.inc"
-        COMMAND cat ${cpp_library_sources} | $<TARGET_FILE:converter> > "${CMAKE_CURRENT_BINARY_DIR}/cprover_library.inc"
+        COMMAND $<TARGET_FILE:converter> ${cpp_library_sources} > "${CMAKE_CURRENT_BINARY_DIR}/cprover_library.inc"
         DEPENDS converter ${cpp_library_sources})
 
 ################################################################################

src/cpp/Makefile

@@ -73,7 +73,7 @@ library_check: library/*.c
 	touch $@
 
 cprover_library.inc: ../ansi-c/library/converter$(EXEEXT) library/*.c
-	cat library/*.c | ../ansi-c/library/converter$(EXEEXT) > $@
+	../ansi-c/library/converter$(EXEEXT) library/*.c > $@
 
 generated_files: cprover_library.inc