diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-25 02:53:47 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-25 02:53:47 +0000 |
| commit | d37d46dfbcedadeb439ad0367f8afcf8867dca43 (patch) | |
| tree | b896df229f7c671637924c156d5a759ba50a3190 /src/google/protobuf/compiler/parser.cc | |
| parent | 709ea28f3264aa5632e5577a4080671173fc6166 (diff) | |
Integrate recent changes from Google-internal code tree. See CHANGES.txt
for details.
Diffstat (limited to 'src/google/protobuf/compiler/parser.cc')
| -rw-r--r-- | src/google/protobuf/compiler/parser.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/parser.cc b/src/google/protobuf/compiler/parser.cc index e1c0d0d1..e9e01545 100644 --- a/src/google/protobuf/compiler/parser.cc +++ b/src/google/protobuf/compiler/parser.cc @@ -97,7 +97,8 @@ Parser::Parser() error_collector_(NULL), source_location_table_(NULL), had_errors_(false), - require_syntax_identifier_(false) { + require_syntax_identifier_(false), + stop_after_syntax_identifier_(false) { } Parser::~Parser() { @@ -309,10 +310,12 @@ bool Parser::Parse(io::Tokenizer* input, FileDescriptorProto* file) { // identifier. return false; } - } else { + } else if (!stop_after_syntax_identifier_) { syntax_identifier_ = "proto2"; } + if (stop_after_syntax_identifier_) return !had_errors_; + // Repeatedly parse statements until we reach the end of the file. while (!AtEnd()) { if (!ParseTopLevelStatement(file)) { @@ -341,7 +344,7 @@ bool Parser::ParseSyntaxIdentifier() { syntax_identifier_ = syntax; - if (syntax != "proto2") { + if (syntax != "proto2" && !stop_after_syntax_identifier_) { AddError(syntax_token.line, syntax_token.column, "Unrecognized syntax identifier \"" + syntax + "\". This parser " "only recognizes \"proto2\"."); |