variable name changes to remove php keywords

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10575 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-06-24 20:11:46 +00:00
commit f8ae12fe4d
12 changed files with 19 additions and 19 deletions

View file

@ -5,7 +5,7 @@ using char_stringsNamespace;
public class char_strings_runme { public class char_strings_runme {
private static string CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; private static string CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
private static string OTHERLAND_MSG = "Little message from the the safe world."; private static string OTHERLAND_MSG = "Little message from the safe world.";
public static void Main() { public static void Main() {

View file

@ -10,11 +10,11 @@
virtual ~Node() {} virtual ~Node() {}
}; };
class Switch : public Node { class NodeSwitch : public Node {
public : public :
virtual int addChild( Node *child ) { return 2; } // This was hidden with -fvirtual virtual int addChild( Node *child ) { return 2; } // This was hidden with -fvirtual
virtual int addChild( Node *child, bool value ) { return 3; } virtual int addChild( Node *child, bool value ) { return 3; }
virtual ~Switch() {} virtual ~NodeSwitch() {}
}; };
%} %}

View file

@ -12,7 +12,7 @@ public class char_strings_runme {
} }
private static String CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; private static String CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
private static String OTHERLAND_MSG = "Little message from the the safe world."; private static String OTHERLAND_MSG = "Little message from the safe world.";
public static void main(String argv[]) { public static void main(String argv[]) {

View file

@ -129,7 +129,7 @@ public:
%} %}
%inline %{ %inline %{
std::string empty() { std::string stdstring_empty() {
return std::string(); return std::string();
} }

View file

@ -1,6 +1,6 @@
fvirtual fvirtual
sw = Switch(); sw = NodeSwitch();
n = Node(); n = Node();
i = sw.addChild(n); i = sw.addChild(n);

View file

@ -148,7 +148,7 @@ if (s != "hellohello")
endif endif
if (li_std_string.empty() != "") if (li_std_string.stdstring_empty() != "")
error error
endif endif

View file

@ -98,7 +98,7 @@ SKIP: {
is($gen1->testl("9234567890121111113"), "9234567890121111114", "ulonglong big number"); is($gen1->testl("9234567890121111113"), "9234567890121111114", "ulonglong big number");
is(li_std_string::empty(), "", "empty"); is(li_std_string::stdstring_empty(), "", "stdstring_empty");
is(li_std_string::c_empty(), "", "c_empty"); is(li_std_string::c_empty(), "", "c_empty");
@ -110,4 +110,4 @@ is(li_std_string::get_null(li_std_string::c_null()), undef, "c_empty");
is(li_std_string::get_null(li_std_string::c_empty()), "non-null", "c_empty"); is(li_std_string::get_null(li_std_string::c_empty()), "non-null", "c_empty");
is(li_std_string::get_null(li_std_string::empty()), "non-null", "c_empty"); is(li_std_string::get_null(li_std_string::stdstring_empty()), "non-null", "stdstring_empty");

View file

@ -1,6 +1,6 @@
from fvirtual import * from fvirtual import *
sw = Switch() sw = NodeSwitch()
n = Node() n = Node()
i = sw.addChild(n); i = sw.addChild(n);

View file

@ -121,7 +121,7 @@ if s != "hellohello":
raise RuntimeError raise RuntimeError
if li_std_string.empty() != "": if li_std_string.stdstring_empty() != "":
raise RuntimeError raise RuntimeError

View file

@ -124,7 +124,7 @@ if (s != "hellohello")
end end
if (empty() != "") if (stdstring_empty() != "")
raise RuntimeError raise RuntimeError
end end

View file

@ -10,7 +10,7 @@
static const Polarization polarization = UnaryPolarization; static const Polarization polarization = UnaryPolarization;
}; };
template <Polarization P> template <Polarization P>
struct Interface struct Interface_
{ {
}; };
@ -26,16 +26,16 @@
}; };
%} %}
%template(Interface_UP) Interface<UnaryPolarization>; %template(Interface_UP) Interface_<UnaryPolarization>;
%template(Module_1) Module<1>; %template(Module_1) Module<1>;
%inline %{ %inline %{
struct ExtInterface1 : struct ExtInterface1 :
Interface<UnaryPolarization> // works Interface_<UnaryPolarization> // works
{ {
}; };
struct ExtInterface2 : struct ExtInterface2 :
Interface<interface_traits::polarization> // doesn't work Interface_<interface_traits::polarization> // doesn't work
{ {
}; };
struct ExtModule1 : struct ExtModule1 :

View file

@ -16,7 +16,7 @@ public:
template <typename T> template <typename T>
class ArrayIterator class ArrayIterator_
{ {
public: public:
typedef test_Array::intT intT; typedef test_Array::intT intT;
@ -38,8 +38,8 @@ class ArrayPrimitiveT
public: public:
typedef T ValueT; typedef T ValueT;
typedef T valueT; typedef T valueT;
typedef ArrayIterator<T> Iterator; typedef ArrayIterator_<T> Iterator;
typedef ArrayIterator<const T> ConstIterator; typedef ArrayIterator_<const T> ConstIterator;
typedef ArrayReverseIterator<T> ReverseIterator; typedef ArrayReverseIterator<T> ReverseIterator;
typedef ArrayReverseIterator<const T> ConstReverseIterator; typedef ArrayReverseIterator<const T> ConstReverseIterator;
}; };