lib_xxx to li_xxx name change fixes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6633 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-11-02 22:31:12 +00:00
commit d174b1b231
6 changed files with 73 additions and 73 deletions

View file

@ -1,34 +1,34 @@
using System; using System;
using lib_std_stringNamespace; using li_std_stringNamespace;
public class runme public class runme
{ {
static void Main() static void Main()
{ {
// Checking expected use of %typemap(in) std::string {} // Checking expected use of %typemap(in) std::string {}
lib_std_string.test_value("Fee"); li_std_string.test_value("Fee");
// Checking expected result of %typemap(out) std::string {} // Checking expected result of %typemap(out) std::string {}
if (lib_std_string.test_value("Fi") != "Fi") if (li_std_string.test_value("Fi") != "Fi")
throw new Exception("Test 1 failed"); throw new Exception("Test 1 failed");
// Verify type-checking for %typemap(in) std::string {} // Verify type-checking for %typemap(in) std::string {}
try { try {
lib_std_string.test_value(null); li_std_string.test_value(null);
throw new Exception("Test 2 failed"); throw new Exception("Test 2 failed");
} catch (NullReferenceException) { } catch (NullReferenceException) {
} }
// Checking expected use of %typemap(in) const std::string & {} // Checking expected use of %typemap(in) const std::string & {}
lib_std_string.test_const_reference("Fo"); li_std_string.test_const_reference("Fo");
// Checking expected result of %typemap(out) const std::string& {} // Checking expected result of %typemap(out) const std::string& {}
if (lib_std_string.test_const_reference("Fum") != "Fum") if (li_std_string.test_const_reference("Fum") != "Fum")
throw new Exception("Test 3 failed"); throw new Exception("Test 3 failed");
// Verify type-checking for %typemap(in) const std::string & {} // Verify type-checking for %typemap(in) const std::string & {}
try { try {
lib_std_string.test_const_reference(null); li_std_string.test_const_reference(null);
throw new Exception("Test 4 failed"); throw new Exception("Test 4 failed");
} catch (NullReferenceException) { } catch (NullReferenceException) {
} }
@ -41,17 +41,17 @@ public class runme
SWIGTYPE_p_std__string stringPtr = null; SWIGTYPE_p_std__string stringPtr = null;
stringPtr = lib_std_string.test_pointer_out(); stringPtr = li_std_string.test_pointer_out();
lib_std_string.test_pointer(stringPtr); li_std_string.test_pointer(stringPtr);
stringPtr = lib_std_string.test_const_pointer_out(); stringPtr = li_std_string.test_const_pointer_out();
lib_std_string.test_const_pointer(stringPtr); li_std_string.test_const_pointer(stringPtr);
stringPtr = lib_std_string.test_reference_out(); stringPtr = li_std_string.test_reference_out();
lib_std_string.test_reference(stringPtr); li_std_string.test_reference(stringPtr);
} }
} }

View file

@ -2,93 +2,93 @@
// Check a few of the INPUT, OUTPUT and INOUT typemaps. // Check a few of the INPUT, OUTPUT and INOUT typemaps.
using System; using System;
using lib_typemapsNamespace; using li_typemapsNamespace;
public class runme public class runme
{ {
static void Main() static void Main()
{ {
// Check double INPUT typemaps // Check double INPUT typemaps
if (lib_typemaps.in_double(22.22) != 22.22) exit_test("in_double"); if (li_typemaps.in_double(22.22) != 22.22) exit_test("in_double");
if (lib_typemaps.inr_double(22.22) != 22.22) exit_test("inr_double"); if (li_typemaps.inr_double(22.22) != 22.22) exit_test("inr_double");
// Check double OUTPUT typemaps // Check double OUTPUT typemaps
{ {
double var = 44.44; double var = 44.44;
lib_typemaps.out_double(22.22, out var); li_typemaps.out_double(22.22, out var);
if (var != 22.22) exit_test("out_double"); if (var != 22.22) exit_test("out_double");
} }
{ {
double var = 44.44; double var = 44.44;
lib_typemaps.outr_double(22.22, out var); li_typemaps.outr_double(22.22, out var);
if (var != 22.22) exit_test("outr_double"); if (var != 22.22) exit_test("outr_double");
} }
// Check double INOUT typemaps // Check double INOUT typemaps
{ {
double var = 44.44; double var = 44.44;
lib_typemaps.inout_double(ref var); li_typemaps.inout_double(ref var);
if (var != 44.44) exit_test("inout_double"); if (var != 44.44) exit_test("inout_double");
} }
{ {
double var = 44.44; double var = 44.44;
lib_typemaps.inoutr_double(ref var); li_typemaps.inoutr_double(ref var);
if (var != 44.44) exit_test("inoutr_double"); if (var != 44.44) exit_test("inoutr_double");
} }
// Check unsigned long long INPUT typemaps // Check unsigned long long INPUT typemaps
if (lib_typemaps.in_ulonglong(20) != 20) exit_test("in_ulonglong"); if (li_typemaps.in_ulonglong(20) != 20) exit_test("in_ulonglong");
if (lib_typemaps.inr_ulonglong(20) != 20) exit_test("inr_ulonglong"); if (li_typemaps.inr_ulonglong(20) != 20) exit_test("inr_ulonglong");
// Check unsigned long long OUTPUT typemaps // Check unsigned long long OUTPUT typemaps
{ {
ulong var = 40; ulong var = 40;
lib_typemaps.out_ulonglong(20, out var); li_typemaps.out_ulonglong(20, out var);
if (var != 20) exit_test("out_ulonglong"); if (var != 20) exit_test("out_ulonglong");
} }
{ {
ulong var = 40; ulong var = 40;
lib_typemaps.outr_ulonglong(20, out var); li_typemaps.outr_ulonglong(20, out var);
if (var != 20) exit_test("outr_ulonglong"); if (var != 20) exit_test("outr_ulonglong");
} }
// Check unsigned long long INOUT typemaps // Check unsigned long long INOUT typemaps
{ {
ulong var = 40; ulong var = 40;
lib_typemaps.inout_ulonglong(ref var); li_typemaps.inout_ulonglong(ref var);
if (var != 40) exit_test("inout_ulonglong"); if (var != 40) exit_test("inout_ulonglong");
} }
{ {
ulong var = 40; ulong var = 40;
lib_typemaps.inoutr_ulonglong(ref var); li_typemaps.inoutr_ulonglong(ref var);
if (var != 40) exit_test("inoutr_ulonglong"); if (var != 40) exit_test("inoutr_ulonglong");
} }
// Check unsigned bool INPUT typemaps // Check unsigned bool INPUT typemaps
if (lib_typemaps.in_bool(false) != false) exit_test("in_bool"); if (li_typemaps.in_bool(false) != false) exit_test("in_bool");
if (lib_typemaps.inr_bool(false) != false) exit_test("inr_bool"); if (li_typemaps.inr_bool(false) != false) exit_test("inr_bool");
// Check unsigned bool OUTPUT typemaps // Check unsigned bool OUTPUT typemaps
{ {
bool var = false; bool var = false;
lib_typemaps.out_bool(true, out var); li_typemaps.out_bool(true, out var);
if (var != true) exit_test("out_bool"); if (var != true) exit_test("out_bool");
} }
{ {
bool var = false; bool var = false;
lib_typemaps.outr_bool(true, out var); li_typemaps.outr_bool(true, out var);
if (var != true) exit_test("outr_bool"); if (var != true) exit_test("outr_bool");
} }
// Check unsigned bool INOUT typemaps // Check unsigned bool INOUT typemaps
{ {
bool var = false; bool var = false;
lib_typemaps.inout_bool(ref var); li_typemaps.inout_bool(ref var);
if (var != false) exit_test("inout_bool"); if (var != false) exit_test("inout_bool");
} }
{ {
bool var = false; bool var = false;
lib_typemaps.inoutr_bool(ref var); li_typemaps.inoutr_bool(ref var);
if (var != false) exit_test("inoutr_bool"); if (var != false) exit_test("inoutr_bool");
} }
} }

View file

@ -1,10 +1,10 @@
import lib_std_string.*; import li_std_string.*;
public class lib_std_string_runme { public class li_std_string_runme {
static { static {
try { try {
System.loadLibrary("lib_std_string"); System.loadLibrary("li_std_string");
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
System.exit(1); System.exit(1);
@ -14,29 +14,29 @@ public class lib_std_string_runme {
public static void main(String argv[]) throws Throwable public static void main(String argv[]) throws Throwable
{ {
// Checking expected use of %typemap(in) std::string {} // Checking expected use of %typemap(in) std::string {}
lib_std_string.test_value("Fee"); li_std_string.test_value("Fee");
// Checking expected result of %typemap(out) std::string {} // Checking expected result of %typemap(out) std::string {}
if (!lib_std_string.test_value("Fi").equals("Fi")) if (!li_std_string.test_value("Fi").equals("Fi"))
throw new RuntimeException("Test 1 failed"); throw new RuntimeException("Test 1 failed");
// Verify type-checking for %typemap(in) std::string {} // Verify type-checking for %typemap(in) std::string {}
try { try {
lib_std_string.test_value(null); li_std_string.test_value(null);
throw new RuntimeException("Test 2 failed"); throw new RuntimeException("Test 2 failed");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
// Checking expected use of %typemap(in) const std::string & {} // Checking expected use of %typemap(in) const std::string & {}
lib_std_string.test_const_reference("Fo"); li_std_string.test_const_reference("Fo");
// Checking expected result of %typemap(out) const std::string& {} // Checking expected result of %typemap(out) const std::string& {}
if (!lib_std_string.test_const_reference("Fum").equals("Fum")) if (!li_std_string.test_const_reference("Fum").equals("Fum"))
throw new RuntimeException("Test 3 failed"); throw new RuntimeException("Test 3 failed");
// Verify type-checking for %typemap(in) const std::string & {} // Verify type-checking for %typemap(in) const std::string & {}
try { try {
lib_std_string.test_const_reference(null); li_std_string.test_const_reference(null);
throw new RuntimeException("Test 4 failed"); throw new RuntimeException("Test 4 failed");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
@ -49,26 +49,26 @@ public class lib_std_string_runme {
SWIGTYPE_p_std__string stringPtr = null; SWIGTYPE_p_std__string stringPtr = null;
stringPtr = lib_std_string.test_pointer_out(); stringPtr = li_std_string.test_pointer_out();
lib_std_string.test_pointer(stringPtr); li_std_string.test_pointer(stringPtr);
stringPtr = lib_std_string.test_const_pointer_out(); stringPtr = li_std_string.test_const_pointer_out();
lib_std_string.test_const_pointer(stringPtr); li_std_string.test_const_pointer(stringPtr);
stringPtr = lib_std_string.test_reference_out(); stringPtr = li_std_string.test_reference_out();
lib_std_string.test_reference(stringPtr); li_std_string.test_reference(stringPtr);
// Check throw exception specification // Check throw exception specification
try { try {
lib_std_string.test_throw(); li_std_string.test_throw();
throw new Throwable("Test 5 failed"); throw new Throwable("Test 5 failed");
} catch (RuntimeException e) { } catch (RuntimeException e) {
} }
try { try {
lib_std_string.test_const_reference_throw(); li_std_string.test_const_reference_throw();
throw new Throwable("Test 6 failed"); throw new Throwable("Test 6 failed");
} catch (RuntimeException e) { } catch (RuntimeException e) {
} }

View file

@ -1,14 +1,14 @@
// Check a few of the INPUT, OUTPUT and INOUT typemaps. // Check a few of the INPUT, OUTPUT and INOUT typemaps.
import lib_typemaps.*; import li_typemaps.*;
import java.math.*; import java.math.*;
public class lib_typemaps_runme { public class li_typemaps_runme {
static { static {
try { try {
System.loadLibrary("lib_typemaps"); System.loadLibrary("li_typemaps");
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e); System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
System.exit(1); System.exit(1);
@ -18,23 +18,23 @@ public class lib_typemaps_runme {
public static void main(String argv[]) { public static void main(String argv[]) {
// Check double INPUT typemaps // Check double INPUT typemaps
if (lib_typemaps.in_double(22.22) != 22.22) exit_test("in_double"); if (li_typemaps.in_double(22.22) != 22.22) exit_test("in_double");
if (lib_typemaps.inr_double(22.22) != 22.22) exit_test("inr_double"); if (li_typemaps.inr_double(22.22) != 22.22) exit_test("inr_double");
// Check double OUTPUT typemaps // Check double OUTPUT typemaps
{ {
double[] var = {44.44}; double[] var = {44.44};
lib_typemaps.out_double(22.22, var); li_typemaps.out_double(22.22, var);
if (var[0] != 22.22) exit_test("out_double"); if (var[0] != 22.22) exit_test("out_double");
} }
{ {
double[] var = {44.44}; double[] var = {44.44};
lib_typemaps.outr_double(22.22, var); li_typemaps.outr_double(22.22, var);
if (var[0] != 22.22) exit_test("outr_double"); if (var[0] != 22.22) exit_test("outr_double");
} }
try { try {
double[] var = null; double[] var = null;
lib_typemaps.out_double(22.22, var); li_typemaps.out_double(22.22, var);
exit_test("null out_double"); exit_test("null out_double");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
@ -42,17 +42,17 @@ public class lib_typemaps_runme {
// Check double INOUT typemaps // Check double INOUT typemaps
{ {
double[] var = {44.44}; double[] var = {44.44};
lib_typemaps.inout_double(var); li_typemaps.inout_double(var);
if (var[0] != 44.44) exit_test("inout_double"); if (var[0] != 44.44) exit_test("inout_double");
} }
{ {
double[] var = {44.44}; double[] var = {44.44};
lib_typemaps.inoutr_double(var); li_typemaps.inoutr_double(var);
if (var[0] != 44.44) exit_test("inoutr_double"); if (var[0] != 44.44) exit_test("inoutr_double");
} }
try { try {
double[] var = null; double[] var = null;
lib_typemaps.inout_double(var); li_typemaps.inout_double(var);
exit_test("null inout_double"); exit_test("null inout_double");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
@ -60,11 +60,11 @@ public class lib_typemaps_runme {
// Check unsigned long long INPUT typemaps // Check unsigned long long INPUT typemaps
BigInteger forty = new BigInteger("40"); BigInteger forty = new BigInteger("40");
BigInteger twenty = new BigInteger("20"); BigInteger twenty = new BigInteger("20");
if (!lib_typemaps.in_ulonglong(twenty).equals(twenty)) exit_test("in_ulonglong"); if (!li_typemaps.in_ulonglong(twenty).equals(twenty)) exit_test("in_ulonglong");
if (!lib_typemaps.inr_ulonglong(twenty).equals(twenty)) exit_test("inr_ulonglong"); if (!li_typemaps.inr_ulonglong(twenty).equals(twenty)) exit_test("inr_ulonglong");
try { try {
lib_typemaps.in_ulonglong(null); li_typemaps.in_ulonglong(null);
exit_test("null in_ulonglong"); exit_test("null in_ulonglong");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
@ -72,46 +72,46 @@ public class lib_typemaps_runme {
// Check unsigned long long OUTPUT typemaps // Check unsigned long long OUTPUT typemaps
{ {
BigInteger[] var = {new BigInteger("40")}; BigInteger[] var = {new BigInteger("40")};
lib_typemaps.out_ulonglong(twenty, var); li_typemaps.out_ulonglong(twenty, var);
if (!var[0].equals(twenty)) exit_test("out_ulonglong"); if (!var[0].equals(twenty)) exit_test("out_ulonglong");
} }
{ {
BigInteger[] var = {new BigInteger("40")}; BigInteger[] var = {new BigInteger("40")};
lib_typemaps.outr_ulonglong(twenty, var); li_typemaps.outr_ulonglong(twenty, var);
if (!var[0].equals(twenty)) exit_test("outr_ulonglong"); if (!var[0].equals(twenty)) exit_test("outr_ulonglong");
} }
try { try {
BigInteger[] var = null; BigInteger[] var = null;
lib_typemaps.out_ulonglong(twenty, var); li_typemaps.out_ulonglong(twenty, var);
exit_test("null out_ulonglong"); exit_test("null out_ulonglong");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
{ {
BigInteger[] var = { null }; BigInteger[] var = { null };
lib_typemaps.out_ulonglong(twenty, var); li_typemaps.out_ulonglong(twenty, var);
if (!var[0].equals(twenty)) exit_test("null element out_ulonglong"); if (!var[0].equals(twenty)) exit_test("null element out_ulonglong");
} }
// Check unsigned long long INOUT typemaps // Check unsigned long long INOUT typemaps
{ {
BigInteger[] var = {new BigInteger("40")}; BigInteger[] var = {new BigInteger("40")};
lib_typemaps.inout_ulonglong(var); li_typemaps.inout_ulonglong(var);
if (!var[0].equals(forty)) exit_test("inout_ulonglong"); if (!var[0].equals(forty)) exit_test("inout_ulonglong");
} }
{ {
BigInteger[] var = {new BigInteger("40")}; BigInteger[] var = {new BigInteger("40")};
lib_typemaps.inoutr_ulonglong(var); li_typemaps.inoutr_ulonglong(var);
if (!var[0].equals(forty)) exit_test("inoutr_ulonglong"); if (!var[0].equals(forty)) exit_test("inoutr_ulonglong");
} }
try { try {
BigInteger[] var = null; BigInteger[] var = null;
lib_typemaps.inout_ulonglong(var); li_typemaps.inout_ulonglong(var);
exit_test("null inout_ulonglong"); exit_test("null inout_ulonglong");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }
try { try {
BigInteger[] var = { null }; BigInteger[] var = { null };
lib_typemaps.inout_ulonglong(var); li_typemaps.inout_ulonglong(var);
exit_test("null element inout_ulonglong"); exit_test("null element inout_ulonglong");
} catch (NullPointerException e) { } catch (NullPointerException e) {
} }

View file

@ -2,7 +2,7 @@
// Sample test file // Sample test file
require "tests.php4"; require "tests.php4";
require "lib_carrays.php"; require "li_carrays.php";
// No new functions // No new functions
check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_setitem)); check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_setitem));

View file

@ -30,7 +30,7 @@ raise RuntimeError unless (intPairConstRef.first == 7 && intPairConstRef.second
# #
# Now test various input typemaps. Each of the wrapped C++ functions # Now test various input typemaps. Each of the wrapped C++ functions
# (product1, product2 and product3) is expecting an argument of a # (product1, product2 and product3) is expecting an argument of a
# different type (see lib_std_pair.i). Typemaps should be in place to # different type (see li_std_pair.i). Typemaps should be in place to
# convert this Array into the expected argument type. # convert this Array into the expected argument type.
# #
raise RuntimeError unless product1(intPair) == 42 raise RuntimeError unless product1(intPair) == 42