@@ -40,7 +40,7 @@ namespace {
4040// FieldPath = IDENT { "." IDENT } ;
4141// Verb = ":" LITERAL ;
4242class Parser {
43- public:
43+ public:
4444 Parser (const std::string &input)
4545 : input_(input), tb_(0 ), te_(0 ), in_variable_(false ) {}
4646
@@ -73,7 +73,7 @@ class Parser {
7373 return true ;
7474 }
7575
76- private:
76+ private:
7777 // Template = "/" Segments [ Verb ] ;
7878 bool ParseTemplate () {
7979 if (!Consume (' /' )) {
@@ -99,8 +99,7 @@ class Parser {
9999 }
100100
101101 for (;;) {
102- if (!Consume (' /' ))
103- break ;
102+ if (!Consume (' /' )) break ;
104103 if (!ParseSegment ()) {
105104 return false ;
106105 }
@@ -115,25 +114,25 @@ class Parser {
115114 return false ;
116115 }
117116 switch (current_char ()) {
118- case ' *' : {
119- Consume (' *' );
120- if (Consume (' *' )) {
121- // **
122- segments_.push_back (" **" );
123- if (in_variable_) {
124- return MarkVariableHasWildCardPath ();
117+ case ' *' : {
118+ Consume (' *' );
119+ if (Consume (' *' )) {
120+ // **
121+ segments_.push_back (" **" );
122+ if (in_variable_) {
123+ return MarkVariableHasWildCardPath ();
124+ }
125+ return true ;
126+ } else {
127+ segments_.push_back (" *" );
128+ return true ;
125129 }
126- return true ;
127- } else {
128- segments_.push_back (" *" );
129- return true ;
130130 }
131- }
132131
133- case ' {' :
134- return ParseVariable ();
135- default :
136- return ParseLiteralSegment ();
132+ case ' {' :
133+ return ParseVariable ();
134+ default :
135+ return ParseLiteralSegment ();
137136 }
138137 }
139138
@@ -189,10 +188,8 @@ class Parser {
189188
190189 // Verb = ":" LITERAL ;
191190 bool ParseVerb () {
192- if (!Consume (' :' ))
193- return false ;
194- if (!ParseLiteral (&verb_))
195- return false ;
191+ if (!Consume (' :' )) return false ;
192+ if (!ParseLiteral (&verb_)) return false ;
196193 return true ;
197194 }
198195
@@ -205,14 +202,14 @@ class Parser {
205202 while (NextChar ()) {
206203 char c;
207204 switch (c = current_char ()) {
208- case ' .' :
209- case ' }' :
210- case ' =' :
211- return result && AddFieldIdentifier (std::move (idf));
212- default :
213- Consume (c);
214- idf.push_back (c);
215- break ;
205+ case ' .' :
206+ case ' }' :
207+ case ' =' :
208+ return result && AddFieldIdentifier (std::move (idf));
209+ default :
210+ Consume (c);
211+ idf.push_back (c);
212+ break ;
216213 }
217214 result = true ;
218215 }
@@ -230,14 +227,14 @@ class Parser {
230227 for (;;) {
231228 char c;
232229 switch (c = current_char ()) {
233- case ' /' :
234- case ' :' :
235- case ' }' :
236- return result;
237- default :
238- Consume (c);
239- lit->push_back (c);
240- break ;
230+ case ' /' :
231+ case ' :' :
232+ case ' }' :
233+ return result;
234+ default :
235+ Consume (c);
236+ lit->push_back (c);
237+ break ;
241238 }
242239
243240 result = true ;
@@ -362,7 +359,7 @@ class Parser {
362359 std::vector<HttpTemplate::Variable> variables_;
363360};
364361
365- } // namespace
362+ } // namespace
366363
367364const char HttpTemplate::kSingleParameterKey [] = " /." ;
368365
@@ -384,6 +381,6 @@ std::unique_ptr<HttpTemplate> HttpTemplate::Parse(const std::string &ht) {
384381 std::move (p.segments ()), std::move (p.verb ()), std::move (p.variables ())));
385382}
386383
387- } // namespace transcoding
388- } // namespace grpc
389- } // namespace google
384+ } // namespace transcoding
385+ } // namespace grpc
386+ } // namespace google
0 commit comments