Skip to content

Commit

Permalink
fix format for cpplint
Browse files Browse the repository at this point in the history
  • Loading branch information
taohexxx committed Jun 8, 2018
1 parent 9c48193 commit 5d7b83c
Show file tree
Hide file tree
Showing 62 changed files with 2,454 additions and 2,171 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

version = 0.8.0

all:
Expand Down
2 changes: 1 addition & 1 deletion codegen/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ phxrpc_pb2tool: $(COMM_OBJS) tool_code_render.o tool_template.o phxrpc_pb2tool.o
phxrpc_pb2server: $(COMM_OBJS) server_code_render.o server_template.o phxrpc_pb2server.o
$(LINKER) $^ $(LDFLAGS) -o $@

test_proto_utils: test_proto_utils.o syntax_tree.o proto_utils.o
test_proto_utils: test_proto_utils.o syntax_tree.o proto_utils.o code_utils.o
$(LINKER) $^ $(LDFLAGS) -o $@


Expand Down
290 changes: 148 additions & 142 deletions codegen/client_code_render.cpp

Large diffs are not rendered by default.

52 changes: 27 additions & 25 deletions codegen/client_code_render.h
Original file line number Diff line number Diff line change
@@ -1,62 +1,64 @@
/*
Tencent is pleased to support the open source community by making
Tencent is pleased to support the open source community by making
PhxRPC available.
Copyright (C) 2016 THL A29 Limited, a Tencent company.
Copyright (C) 2016 THL A29 Limited, a Tencent company.
All rights reserved.
Licensed under the BSD 3-Clause License (the "License"); you may
not use this file except in compliance with the License. You may
Licensed under the BSD 3-Clause License (the "License"); you may
not use this file except in compliance with the License. You may
obtain a copy of the License at
https://opensource.org/licenses/BSD-3-Clause
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
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.
See the AUTHORS file for names of contributors.
*/

#pragma once

#include <stdio.h>
#include <cstdio>
#include <string>


namespace phxrpc {


class NameRender;
class SyntaxTree;
class SyntaxFunc;

class ClientCodeRender {
public:
ClientCodeRender(NameRender & name_render);
~ClientCodeRender();
public:
ClientCodeRender(NameRender &name_render);
virtual ~ClientCodeRender();

void GenerateStubHpp(SyntaxTree * stree, FILE * write);
void GenerateStubHpp(SyntaxTree *stree, FILE *write);

void GenerateStubCpp(SyntaxTree * stree, FILE * write);
void GenerateStubCpp(SyntaxTree *stree, FILE *write);

void GenerateClientHpp(SyntaxTree * stree, FILE * write, const bool is_uthread_mode);
void GenerateClientHpp(SyntaxTree *stree, FILE *write, const bool is_uthread_mode);

void GenerateClientCpp(SyntaxTree * stree, FILE * write, const bool is_uthread_mode);
void GenerateClientCpp(SyntaxTree *stree, FILE *write, const bool is_uthread_mode);

void GenerateClientEtc(SyntaxTree * stree, FILE * write);
void GenerateClientEtc(SyntaxTree *stree, FILE *write);

private:
private:
void GetStubFuncDeclaration(const SyntaxTree *const stree, const SyntaxFunc *const func,
int is_header, std::string *result);

void GetStubFuncDeclaration(SyntaxTree * stree, SyntaxFunc * func, int is_header, std::string * result);
void GenerateStubFunc(const SyntaxTree *const stree, const SyntaxFunc *const func, FILE *write);

void GenerateStubFunc(SyntaxTree * stree, SyntaxFunc * func, FILE * write);
void GetClienfuncDeclaration(const SyntaxTree *const stree, const SyntaxFunc *const func,
const int is_header, std::string *result, const bool is_uthread_mode);

void GetClienfuncDeclaration(SyntaxTree * stree, SyntaxFunc * func, int is_header, std::string * result,
const bool is_uthread_mode);

private:
NameRender & name_render_;
NameRender &name_render_;
};


}

34 changes: 19 additions & 15 deletions codegen/code_utils.cpp
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
/*
Tencent is pleased to support the open source community by making
Tencent is pleased to support the open source community by making
PhxRPC available.
Copyright (C) 2016 THL A29 Limited, a Tencent company.
Copyright (C) 2016 THL A29 Limited, a Tencent company.
All rights reserved.
Licensed under the BSD 3-Clause License (the "License"); you may
not use this file except in compliance with the License. You may
Licensed under the BSD 3-Clause License (the "License"); you may
not use this file except in compliance with the License. You may
obtain a copy of the License at
https://opensource.org/licenses/BSD-3-Clause
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
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.
See the AUTHORS file for names of contributors.
*/

#include <stdarg.h>
#include <stdio.h>
#include <cstdarg>
#include <cstdio>

#include "code_utils.h"


using namespace std;


namespace phxrpc {

void StrTrim(string * str, const char * to_trim) {

void StrTrim(string *str, const char *to_trim) {
string::size_type start_pos = 0;
string::size_type end_pos = 0;

Expand All @@ -43,7 +46,7 @@ void StrTrim(string * str, const char * to_trim) {
}
}

void StrReplaceAll(string * haystack, string needle, string s) {
void StrReplaceAll(string *haystack, string needle, string s) {
string::size_type pos = 0;
while ((pos = haystack->find(needle, pos)) != string::npos) {
haystack->erase(pos, needle.length());
Expand All @@ -52,8 +55,8 @@ void StrReplaceAll(string * haystack, string needle, string s) {
}
}

void StrAppendFormat(string * result, const char * fmt, ...) {
if (NULL == fmt)
void StrAppendFormat(string *result, const char *fmt, ...) {
if (nullptr == fmt)
return;

size_t len = 0;
Expand All @@ -75,5 +78,6 @@ void StrAppendFormat(string * result, const char * fmt, ...) {
}
}

}

} // namespace phxrpc

27 changes: 16 additions & 11 deletions codegen/code_utils.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
Tencent is pleased to support the open source community by making
Tencent is pleased to support the open source community by making
PhxRPC available.
Copyright (C) 2016 THL A29 Limited, a Tencent company.
Copyright (C) 2016 THL A29 Limited, a Tencent company.
All rights reserved.
Licensed under the BSD 3-Clause License (the "License"); you may
not use this file except in compliance with the License. You may
Licensed under the BSD 3-Clause License (the "License"); you may
not use this file except in compliance with the License. You may
obtain a copy of the License at
https://opensource.org/licenses/BSD-3-Clause
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
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.
See the AUTHORS file for names of contributors.
Expand All @@ -23,11 +23,16 @@ See the AUTHORS file for names of contributors.

#include <string>


namespace phxrpc {
void StrTrim(std::string * str, const char * to_trim = "\t\r\n");

void StrReplaceAll(std::string * haystack, std::string needle, std::string s);

void StrAppendFormat(std::string * result, const char* fmt, ...) __attribute__((format(printf, 2, 3)));
void StrTrim(std::string *str, const char *to_trim = "\t\r\n");

void StrReplaceAll(std::string *haystack, std::string needle, std::string s);

void StrAppendFormat(std::string *result, const char *fmt, ...) __attribute__((format(printf, 2, 3)));


}

Loading

0 comments on commit 5d7b83c

Please sign in to comment.