Repository: thrift Updated Branches: refs/heads/master 27be411ee -> a1ae93f4b
THRIFT-3290: Using from in variable names causes the generated Python code to have errors Client: py Patch: Prathik Rajendran Adds 'from' to the reserved words list for py This closes #579 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a1ae93f4 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a1ae93f4 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a1ae93f4 Branch: refs/heads/master Commit: a1ae93f4beee0d25a96b51b3022e0bde79ecb445 Parents: 27be411 Author: jfarrell <[email protected]> Authored: Thu Sep 24 22:57:33 2015 -0400 Committer: jfarrell <[email protected]> Committed: Thu Sep 24 22:58:45 2015 -0400 ---------------------------------------------------------------------- compiler/cpp/src/thriftl.ll | 1 + test/py/explicit_module/runtest.sh | 1 + test/py/explicit_module/test3.thrift | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/a1ae93f4/compiler/cpp/src/thriftl.ll ---------------------------------------------------------------------- diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll index 08b5c59..a771269 100644 --- a/compiler/cpp/src/thriftl.ll +++ b/compiler/cpp/src/thriftl.ll @@ -239,6 +239,7 @@ literal_begin (['\"]) "float" { thrift_reserved_keyword(yytext); } "for" { thrift_reserved_keyword(yytext); } "foreach" { thrift_reserved_keyword(yytext); } +"from" { thrift_reserved_keyword(yytext); } "function" { thrift_reserved_keyword(yytext); } "global" { thrift_reserved_keyword(yytext); } "goto" { thrift_reserved_keyword(yytext); } http://git-wip-us.apache.org/repos/asf/thrift/blob/a1ae93f4/test/py/explicit_module/runtest.sh ---------------------------------------------------------------------- diff --git a/test/py/explicit_module/runtest.sh b/test/py/explicit_module/runtest.sh index 2e5a4f1..6d73462 100755 --- a/test/py/explicit_module/runtest.sh +++ b/test/py/explicit_module/runtest.sh @@ -22,6 +22,7 @@ rm -rf gen-py ../../../compiler/cpp/thrift --gen py test1.thrift || exit 1 ../../../compiler/cpp/thrift --gen py test2.thrift || exit 1 +../../../compiler/cpp/thrift --gen py test3.thrift && exit 1 # Fail since test3.thrift has python keywords PYTHONPATH=./gen-py python -c 'import foo.bar.baz' || exit 1 PYTHONPATH=./gen-py python -c 'import test2' || exit 1 PYTHONPATH=./gen-py python -c 'import test1' &>/dev/null && exit 1 # Should fail. http://git-wip-us.apache.org/repos/asf/thrift/blob/a1ae93f4/test/py/explicit_module/test3.thrift ---------------------------------------------------------------------- diff --git a/test/py/explicit_module/test3.thrift b/test/py/explicit_module/test3.thrift new file mode 100644 index 0000000..154786b --- /dev/null +++ b/test/py/explicit_module/test3.thrift @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +namespace py validations + +struct from { + 1: i32 def; +} +
