Changeset 5483

Timestamp:

May 31, 2017, 10:44:04 AM (2 years ago)

Author:

cameron

Message:

Support for -label, -T, -Z flags, default (standard input) label for stdin

Location:

icGREP/icgrep-devel/icgrep

Files:

• grep_engine.cpp (modified) (4 diffs)
• grep_interface.cpp (modified) (4 diffs)

icGREP/icgrep-devel/icgrep/grep_engine.cpp

@@ -117 +117 @@
 static std::stringstream * resultStrs = nullptr;
 static std::vector<std::string> inputFiles;
+static std::vector<std::string> linePrefix;
 
 void initFileResult(std::vector<std::string> filenames){
     const int n = filenames.size();
+    linePrefix.resize(n);
     if ((n > 1) && !NoFilenameFlag) {
         WithFilenameFlag = true;
+    }
+    std::string fileSuffix;
+    if (WithFilenameFlag) {
+        if (NullFlag) {
+            fileSuffix = std::string("\0", 1);
+        }
+        else if ((Mode == NormalMode) && InitialTabFlag && !(LineNumberFlag || ByteOffsetFlag)) {
+            fileSuffix = "\t:";
+        }
+        else {
+            fileSuffix = ":";
+        }
     }
     inputFiles = filenames;
     resultStrs = new std::stringstream[n];
     total_count = new int[n];
-    for (unsigned i = 0; i < inputFiles.size(); ++i){
+    for (unsigned i = 0; i < inputFiles.size(); ++i) {
+        if (WithFilenameFlag) {
+            if (inputFiles[i] == "-") {
+                linePrefix[i] = LabelFlag + fileSuffix;
+            }
+            else {
+                linePrefix[i] = inputFiles[i] + fileSuffix;
+            }
+        }
         total_count[i] = 0;
     }
-
 }
 
@@ -142 +163 @@
 
     if (WithFilenameFlag) {
-        resultStrs[fileIdx] << inputFiles[fileIdx] << ':';
+        resultStrs[fileIdx] << linePrefix[fileIdx];
     }
     if (LineNumberFlag) {
         // Internally line numbers are counted from 0.  For display, adjust
         // the line number so that lines are numbered from 1.
-        resultStrs[fileIdx] << lineNum+1 << ":";
+        if (InitialTabFlag) {
+            resultStrs[fileIdx] << lineNum+1 << "\t:";
+        }
+        else {
+            resultStrs[fileIdx] << lineNum+1 << ":";
+        }
     }
 
@@ -206 +232 @@
         } else {
             for (unsigned i = 0; i < inputFiles.size(); ++i){
-                std::cout << inputFiles[i] << ':' << total_CountOnly[i] << std::endl;
+                std::cout << linePrefix[i] << total_CountOnly[i] << std::endl;
                 total += total_CountOnly[i];
             };
@@ -217 +243 @@
         for (unsigned i = 0; i < inputFiles.size(); ++i) {
             if (total_CountOnly[i] == requiredCount) {
-                std::cout << inputFiles[i] << std::endl;
+                std::cout << linePrefix[i];
+                if (!NullFlag) {
+                    std::cout << "\n";
+                }
             }
             total += total_CountOnly[i];

icGREP/icgrep-devel/icgrep/grep_interface.cpp

@@ -188 +188 @@
 
 std::string LabelFlag;
-static cl::opt<std::string, true> LabelOption("label", cl::location(LabelFlag), cl::desc("Set a label for input lines matched from stdin."), cl::cat(Output_Options));
+    static cl::opt<std::string, true> LabelOption("label", cl::location(LabelFlag), cl::init("(standard input)"),
+                                              cl::desc("Set a label for input lines matched from stdin."), cl::cat(Output_Options));
 
 bool LineBufferedFlag;
@@ -289 +290 @@
         llvm::report_fatal_error("Sorry, -s is not yet supported.\n");
     }
-    if (NullFlag) {
-        llvm::report_fatal_error("Sorry, -Z is not yet supported.\n");
-    }
     if (ByteOffsetFlag) {
         llvm::report_fatal_error("Sorry, -b is not yet supported.\n");
@@ -298 +296 @@
         llvm::report_fatal_error("Sorry, -u is not yet supported.\n");
     }
-    if (InitialTabFlag) {
-        llvm::report_fatal_error("Sorry, -T is not yet supported.\n");
-    }
     if (OnlyMatchingFlag) {
         llvm::report_fatal_error("Sorry, -o is not yet supported.\n");
@@ -316 +311 @@
         llvm::report_fatal_error("Sorry, -C is not yet supported.\n");
     }
-    if (LabelFlag!="") {
-        llvm::report_fatal_error("Sorry, -label is not yet supported.\n");
-    }
     if (ColorFlag!=neverColor) {
         llvm::report_fatal_error("Sorry, -color is not yet supported.\n");