diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-23 15:25:57 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-23 15:25:57 +0100 |
| commit | 732cfc2ed384df69e87186644698667aabb7ce6e (patch) | |
| tree | 490eaab6df5c75bc5fd779596fb4934a6eb44364 /cpp/src/Slice/PHPUtil.cpp | |
| parent | Fixed (ICE-7469) - Fix libnames in Windows resource files (diff) | |
| download | ice-732cfc2ed384df69e87186644698667aabb7ce6e.tar.bz2 ice-732cfc2ed384df69e87186644698667aabb7ce6e.tar.xz ice-732cfc2ed384df69e87186644698667aabb7ce6e.zip | |
Removed IcePHP dependency on Parser.h
Diffstat (limited to 'cpp/src/Slice/PHPUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/PHPUtil.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp index 92234fb75c0..4ab485d11f6 100644 --- a/cpp/src/Slice/PHPUtil.cpp +++ b/cpp/src/Slice/PHPUtil.cpp @@ -9,6 +9,7 @@ #include <Slice/PHPUtil.h> #include <functional> +#include <vector> using namespace std; using namespace Slice; @@ -29,8 +30,8 @@ lookupKwd(const string& name) // // Keyword list. *Must* be kept in alphabetical order. // - static const string keywordList[] = - { + static const string keywordList[] = + { "abstract", "and", "array", "as", "break", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "if", @@ -135,12 +136,6 @@ Slice::PHP::fixIdent(const string& ident) } string -Slice::PHP::getAbsolute(const ContainedPtr& cont, bool ns, const string& prefix, const string& suffix) -{ - return scopedToName(cont->scope() + prefix + cont->name() + suffix, ns); -} - -string Slice::PHP::escapeName(const string& name) { string result = name; |