openfpga shell now support continued line charactor '\'

libopenfpga/libopenfpgashell/src/shell.tpp

@@ -289,6 +289,11 @@ void Shell<T>::run_script_mode(const char* script_file_name, T& context) {
     return; 
   }
 
+  /* Consider that each line may not end due to the continued line charactor 
+   * Use cmd_line to conjunct multiple lines 
+   */
+  std::string cmd_line;
+
   /* Read line by line */
   while (getline(fp, line)) {
     /* If the line that starts with '#', it is commented, we can skip */ 
@@ -302,17 +307,43 @@ void Shell<T>::run_script_mode(const char* script_file_name, T& context) {
     if (cmd_end_pos != std::string::npos) {
       cmd_part = line.substr(0, cmd_end_pos);
     }
-    /* Remove the space at the beginning of the line */
+
-    cmd_part.erase(cmd_part.begin(), std::find_if(cmd_part.begin(), cmd_part.end(), [](int ch) {
+    /* Remove the space at the end of the line
-      return !std::isspace(ch);
+     * So that we can check easily if there is a continued line in the end  
-    }));
+     */
-    /* Remove the space at the end of the line */
     cmd_part.erase(std::find_if(cmd_part.rbegin(), cmd_part.rend(), [](int ch) {
       return !std::isspace(ch);
     }).base(), cmd_part.end());
-    /* Process the command only when the line is not empty */
+
+    /* If the line ends with '\', this is a continued line, parse the next until it ends */
+    if ('\\' == cmd_part.back()) {
+      /* Pop up the last charactor and conjunct to cmd_line */
+      cmd_part.pop_back();
+ 
       if (!cmd_part.empty()) {
-      execute_command(cmd_part.c_str(), context);
+        cmd_line += cmd_part; 
+      }
+      /* Not finished yet. Parse the next line */
+      continue;
+    } else {
+      /* End of this line, if cmd_line is empty, 
+       * there is no previous lines, cache the part we have
+       * and then execute the command 
+       */
+      cmd_line += cmd_part;
+    }
+
+    /* Remove the space at the beginning of the line */
+    cmd_line.erase(cmd_line.begin(), std::find_if(cmd_line.begin(), cmd_line.end(), [](int ch) {
+      return !std::isspace(ch);
+    }));
+
+    /* Process the command only when the full command line in ended */
+    if (!cmd_line.empty()) {
+      VTR_LOG("\nCommand line to execute: %s\n", cmd_line.c_str());
+      execute_command(cmd_line.c_str(), context);
+      /* Empty the line ready to start a new line */
+      cmd_line.clear();
     }
   }
   fp.close();

openfpga/test_script/and_k6_frac_tileable_adder_register_scan_chain.openfpga

@@ -28,8 +28,8 @@ lut_truth_table_fixup #--verbose
 build_fabric --compress_routing --duplicate_grid_pin --verbose
 
 # Repack the netlist to physical pbs
-  # This must be done before bitstream generator and testbench generation
+# This must be done before bitstream generator and testbench generation
-  # Strongly recommend it is done after all the fix-up have been applied
+# Strongly recommend it is done after all the fix-up have been applied
 repack #--verbose
 
 # Build the bitstream 
@@ -56,7 +56,8 @@ write_verilog_testbench --file /var/tmp/xtang/openfpga_test_src/SRC --reference_
 write_pnr_sdc --file /var/tmp/xtang/openfpga_test_src/SDC 
 
 # Write the SDC to run timing analysis for a mapped FPGA fabric
-write_analysis_sdc --file /var/tmp/xtang/openfpga_test_src/SDC_analysis
+write_analysis_sdc \
+ --file /var/tmp/xtang/openfpga_test_src/SDC_analysis
 
 # Finish and exit OpenFPGA
 exit