aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-07-06 16:24:10 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-07-06 16:24:10 +0900
commitc6ac0b9e01515cadd948ea94b3811dc6c20d676e (patch)
tree4dbf4d024fc61bf7dd40041681e318c09357bb51
parent93cbb33a44cae2341043388c29e21f54108cb99a (diff)
downloadandroid_build_kati-c6ac0b9e01515cadd948ea94b3811dc6c20d676e.tar.gz
android_build_kati-c6ac0b9e01515cadd948ea94b3811dc6c20d676e.tar.bz2
android_build_kati-c6ac0b9e01515cadd948ea94b3811dc6c20d676e.zip
[C++] Add and fix define_newline.mk
-rw-r--r--parser.cc6
-rw-r--r--testcase/define_newline.mk9
2 files changed, 12 insertions, 3 deletions
diff --git a/parser.cc b/parser.cc
index 3555758..5ce1e8e 100644
--- a/parser.cc
+++ b/parser.cc
@@ -145,14 +145,14 @@ class Parser {
}
void ParseLine(StringPiece line) {
- if (line.empty() || (line.size() == 1 && line[0] == '\r'))
- return;
-
if (!define_name_.empty()) {
ParseInsideDefine(line);
return;
}
+ if (line.empty() || (line.size() == 1 && line[0] == '\r'))
+ return;
+
current_directive_ = AssignDirective::NONE;
if (line[0] == '\t' && state_ != ParserState::NOT_AFTER_RULE) {
diff --git a/testcase/define_newline.mk b/testcase/define_newline.mk
new file mode 100644
index 0000000..b2bbc1e
--- /dev/null
+++ b/testcase/define_newline.mk
@@ -0,0 +1,9 @@
+define newline
+
+
+endef
+
+$(info This should have$(newline)two lines)
+
+test:
+ echo OK