diff options
| author | Steven Moreland <smoreland@google.com> | 2018-06-04 09:43:07 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2018-06-04 18:26:00 +0000 |
| commit | 321c5fc0e22706a109aa505735cbb3397ce2c7a6 (patch) | |
| tree | 89568b4dc919270bf4e9d776718abbc6a08b43bd | |
| parent | 49bad8df77e1fe1ca3c06fe49790a6e3304e7249 (diff) | |
| download | hidl-pie-dev.tar.gz | |
Better error for doc_comment at the end of block.android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-dev
Previous error:
ERROR: syntax error, unexpected '}' at ...
New error:
ERROR: Doc comments must preceed what they describe at ...
Bug: 78135149
Test: hidl_error_test
Merged-In: Id56e34a4beb33b0323eb86a85190be63ec3b135d
Change-Id: Id56e34a4beb33b0323eb86a85190be63ec3b135d
| -rw-r--r-- | hidl-gen_y.yy | 5 | ||||
| -rw-r--r-- | test/error_test/doc_comment_ends_block/1.0/IFoo.hal | 23 | ||||
| -rw-r--r-- | test/error_test/doc_comment_ends_block/1.0/required_error | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/hidl-gen_y.yy b/hidl-gen_y.yy index da458231..f445199c 100644 --- a/hidl-gen_y.yy +++ b/hidl-gen_y.yy @@ -338,6 +338,11 @@ doc_comments $1->merge($2); $$ = $1; } + | doc_comments '}' + { + std::cerr << "ERROR: Doc comments must preceed what they describe at " << @1 << "\n"; + YYERROR; + } ; valid_identifier diff --git a/test/error_test/doc_comment_ends_block/1.0/IFoo.hal b/test/error_test/doc_comment_ends_block/1.0/IFoo.hal new file mode 100644 index 00000000..26c768e2 --- /dev/null +++ b/test/error_test/doc_comment_ends_block/1.0/IFoo.hal @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package test.empty_generates@1.0; + +interface IFoo { + doFoo(); + /** + * Does foo! + */ +}; diff --git a/test/error_test/doc_comment_ends_block/1.0/required_error b/test/error_test/doc_comment_ends_block/1.0/required_error new file mode 100644 index 00000000..94c947a9 --- /dev/null +++ b/test/error_test/doc_comment_ends_block/1.0/required_error @@ -0,0 +1 @@ +Doc comments must preceed what they describe at
\ No newline at end of file |