! improve uq: use IGNORECASE built-in var

Author: oldratlee

bin/helper/uq.awk

@@ -2,73 +2,55 @@
 
 function printResult(for_lines) {
     for (idx = 0; idx < length(for_lines); idx++) {
-        line=for_lines[idx]
-        count=line_count_array[storeLine(line)]
-
-        #printf "DEBUG 1: %7s %s, index: %s\n", count, line, idx
+        line = for_lines[idx]
+        count = line_count_array[caseAwareLine(line)]
+        #printf "DEBUG: %s %s, index: %s, uq_opt_only_repeated: %s\n", count, line, idx, uq_opt_only_repeated
 
         if (uq_opt_only_unique) {
             if (count == 1) printLine(count, line)
         } else {
-            #printf "DEBUG 2: %7s %s uq_opt_only_repeated: %s\n", count, line, uq_opt_only_repeated
-
-            if (uq_opt_only_repeated && count <= 1) {
-                continue
-            }
+            if (uq_opt_only_repeated && count <= 1) continue
 
-            if (uq_opt_repeated_method == "prepend" || uq_opt_repeated_method == "separate" && outputted) {
-                if (!compareLine(line, outputted)) print ""
+            if (uq_opt_repeated_method == "prepend" || uq_opt_repeated_method == "separate" && previous_output) {
+                if (line != previous_output) print ""
             }
 
             printLine(count, line)
-            outputted=line
+            previous_output = line
         }
     }
 }
 
 function printLine(count, line) {
-    if (uq_opt_count) {
-        printf "%7s %s%s", count, line, ORS
-    } else {
-        print line
-    }
-}
-
-function storeLine(line) {
-    if (uq_opt_ignore_case) {
-        return tolower(line)
-    } else {
-        return line
-    }
+    if (uq_opt_count) printf "%7s %s%s", count, line, ORS
+    else print line
 }
 
-function compareLine(line1, line2) {
-    return storeLine(line1) == storeLine(line2)
+function caseAwareLine(line) {
+    if (IGNORECASE) return tolower(line)
+    else return line
 }
 
-
 BEGIN {
     if (uq_opt_zero_terminated) {
         RS = "\0"
         ORS = "\0"
     }
 }
 
-
 {
     # use index to keep lines order
-    lines[line_index++] = $0
+    original_lines[line_index++] = $0
 
-    store_line=storeLine($0)
+    case_aware_line = caseAwareLine($0)
     # line_count_array: line content -> count
-    if (++line_count_array[store_line] == 1) {
+    if (++line_count_array[case_aware_line] == 1) {
         # use index to keep lines order
-        deduplicated_lines[deduplicated_line_index++] = store_line
+        deduplicated_lines[deduplicated_line_index++] = case_aware_line
     }
 }
 
-
 END {
-    if (uq_opt_all_repeated) printResult(lines)
+    if (uq_opt_all_repeated) printResult(original_lines)
     else printResult(deduplicated_lines)
 }

bin/uq

@@ -193,7 +193,7 @@ awk \
     -v "uq_opt_all_repeated=$uq_opt_all_repeated" \
     -v "uq_opt_repeated_method=$uq_opt_repeated_method" \
     -v "uq_opt_only_unique=$uq_opt_only_unique" \
-    -v "uq_opt_ignore_case=$uq_opt_ignore_case" \
+    -v "IGNORECASE=$uq_opt_ignore_case" \
     -v "uq_opt_zero_terminated=$uq_opt_zero_terminated" \
     -f "$PROG_DIR/helper/uq.awk" \
     -- ${input_files[@]:+"${input_files[@]}"} \

test-cases/uq_test.sh

@@ -107,4 +107,5 @@ test_ignore_case__count() {
 #################################################
 # Load and run shUnit2.
 #################################################
+
 source "$BASE/shunit2-lib/shunit2"