diff options
-rw-r--r-- | sca-cpp/trunk/configure.ac | 6 | ||||
-rw-r--r-- | sca-cpp/trunk/etc/git-exclude | 1 | ||||
-rw-r--r-- | sca-cpp/trunk/kernel/Makefile.am | 6 | ||||
-rw-r--r-- | sca-cpp/trunk/kernel/lambda-test.cpp | 77 |
4 files changed, 87 insertions, 3 deletions
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac index cb15a820ce..1ad840627e 100644 --- a/sca-cpp/trunk/configure.ac +++ b/sca-cpp/trunk/configure.ac @@ -25,11 +25,15 @@ AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([tar-ustar]) AC_PREFIX_DEFAULT(/usr/local/tuscany/sca) -# Use GCC 4.5 if available +# Require GCC 4.5 +AC_MSG_CHECKING([for gcc-4.5]) if test -x "/usr/bin/gcc-4.5"; then CXX=/usr/bin/g++-4.5 CPP=/usr/bin/cpp-4.5 CC=/usr/bin/gcc-4.5 + AC_MSG_RESULT(/usr/bin/gcc-4.5) +else + AC_MSG_ERROR([could not find gcc-4.5]) fi # Check for required programs. diff --git a/sca-cpp/trunk/etc/git-exclude b/sca-cpp/trunk/etc/git-exclude index 3158aa3f4f..46aec05fc0 100644 --- a/sca-cpp/trunk/etc/git-exclude +++ b/sca-cpp/trunk/etc/git-exclude @@ -74,6 +74,7 @@ kernel-test string-test mem-test hash-test +lambda-test parallel-test xml-test xsd-test diff --git a/sca-cpp/trunk/kernel/Makefile.am b/sca-cpp/trunk/kernel/Makefile.am index f7db7821a3..203dfbd269 100644 --- a/sca-cpp/trunk/kernel/Makefile.am +++ b/sca-cpp/trunk/kernel/Makefile.am @@ -28,6 +28,8 @@ libdynlib_test_la_SOURCES = dynlib-test.cpp kernel_test_SOURCES = kernel-test.cpp +lambda_test_SOURCES = lambda-test.cpp + mem_test_SOURCES = mem-test.cpp parallel_test_SOURCES = parallel-test.cpp @@ -40,6 +42,6 @@ xsd_test_LDFLAGS = -lxml2 hash_test_SOURCES = hash-test.cpp -noinst_PROGRAMS = string-test kernel-test hash-test mem-test parallel-test xml-test xsd-test -TESTS = string-test kernel-test hash-test mem-test parallel-test xml-test +noinst_PROGRAMS = string-test kernel-test lambda-test hash-test mem-test parallel-test xml-test xsd-test +TESTS = string-test kernel-test lambda-test hash-test mem-test parallel-test xml-test diff --git a/sca-cpp/trunk/kernel/lambda-test.cpp b/sca-cpp/trunk/kernel/lambda-test.cpp new file mode 100644 index 0000000000..de702b778a --- /dev/null +++ b/sca-cpp/trunk/kernel/lambda-test.cpp @@ -0,0 +1,77 @@ +/* + * 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. + */ + +/* $Rev$ $Date$ */ + +/** + * Test C++0x lambda expressions. + */ + +#include <assert.h> +#include "function.hpp" +#include "sstream.hpp" +#include "fstream.hpp" + +namespace tuscany { + +const lambda<const int(const int)> inc(const int i) { + return [=](const int x)->const int { + return x + i; + }; +} + +const int square(const int x) { + return x * x; +} + +int mapLambda(const lambda<const int(const int)> f, int v) { + return f(v); +} + +bool testLambda() { + const lambda<const int(const int)> sq = square; + assert(sq(2) == 4); + assert(mapLambda(square, 2) == 4); + assert(mapLambda(sq, 2) == 4); + assert(mapLambda([](const int x)->const int { return x * x; }, 2) == 4); + + const lambda<int(int)> incf = inc(10); + assert(incf(1) == 11); + assert(mapLambda(incf, 1) == 11); + assert(mapLambda(inc(10), 1) == 11); + + lambda<const int(const int)> l; + l = incf; + assert(l(1) == 11); + l = square; + assert(l(2) == 4); + return true; +} + +} + +int main() { + tuscany::cout << "Testing..." << tuscany::endl; + + tuscany::testLambda(); + + tuscany::cout << "OK" << tuscany::endl; + + return 0; +} |