about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-08-17 15:07:43 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-08-17 15:10:57 -0700
commitb2f0954ef99f18ab2bec7b5a5b79cfb29cdc0c1f (patch)
tree23f7fb754ad40d650ef85b728e9d4e29ee2cf1e1
parentccc5eb730e628801e1d021b387c8e6b8428f1ba3 (diff)
downloadmu-b2f0954ef99f18ab2bec7b5a5b79cfb29cdc0c1f.tar.gz
3217
Fix a new warning from Perl.
-rw-r--r--makefile4
-rw-r--r--tangle/makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/makefile b/makefile
index 7c2c7542..66b92ba9 100644
--- a/makefile
+++ b/makefile
@@ -33,7 +33,7 @@ autogenerated_lists: mu.cc function_list test_list
 function_list: mu.cc
 	@# functions start out unindented, have all args on the same line, and end in ') {'
 	@#                                      ignore methods
-	@grep -h "^[^[:space:]#].*) {$$" mu.cc |grep -v ":.*(" |perl -pwe 's/ {.*/;/' > function_list
+	@grep -h "^[^[:space:]#].*) {$$" mu.cc |grep -v ":.*(" |perl -pwe 's/ \{.*/;/' > function_list
 	@# occasionally we need to modify a declaration in a later layer without messing with ugly unbalanced brackets
 	@# assume such functions move the '{' to column 0 of the very next line
 	@grep -v "^#line" mu.cc |grep -B1 "^{" |grep -v "^{" |perl -pwe 's/$$/;/' >> function_list
@@ -42,7 +42,7 @@ function_list: mu.cc
 
 # autogenerated list of tests to run
 test_list: mu.cc
-	@grep -h "^\s*void test_" mu.cc |perl -pwe 's/^\s*void (.*)\(\) {.*/$$1,/' > test_list
+	@grep -h "^\s*void test_" mu.cc |perl -pwe 's/^\s*void (.*)\(\) \{.*/$$1,/' > test_list
 	@grep -h "^\s*TEST(" mu.cc |perl -pwe 's/^\s*TEST\((.*)\)$$/test_$$1,/' >> test_list
 
 #
diff --git a/tangle/makefile b/tangle/makefile
index e1322345..f7c2ee6c 100644
--- a/tangle/makefile
+++ b/tangle/makefile
@@ -13,7 +13,7 @@ type_list: boot.cc [0-9]*.cc
 
 function_list: boot.cc [0-9]*.cc
 	@# assumes function decl has space before '{'
-	@grep -h "^[^ #].*) {" [0-9]*.cc |perl -pwe 's/ {.*/;/' > function_list
+	@grep -h "^[^ #].*) {" [0-9]*.cc |perl -pwe 's/ \{.*/;/' > function_list
 
 file_list: boot.cc [0-9]*.cc
 	@ls [0-9]*.cc |grep -v "\.test\.cc$$" |perl -pwe 's/.*/#include "$$&"/' > file_list
@@ -22,7 +22,7 @@ test_file_list: [0-9]*.test.cc
 	@ls [0-9]*.test.cc |perl -pwe 's/.*/#include "$$&"/' > test_file_list
 
 test_list: [0-9]*.cc
-	@grep -h "^[[:space:]]*void test_" [0-9]*.cc |perl -pwe 's/^\s*void (.*)\(\) {$$/$$1,/' > test_list
+	@grep -h "^[[:space:]]*void test_" [0-9]*.cc |perl -pwe 's/^\s*void (.*)\(\) \{$$/$$1,/' > test_list
 
 clean:
 	-rm tangle *_list