svn commit: r935247 - in /tuscany/sca-cpp/trunk: configure.ac etc/git-exclude kernel/Makefile.am kernel/lambda-test.cpp

[js...@apache.org]

Author: jsdelfino
Date: Sat Apr 17 20:21:32 2010
New Revision: 935247

URL: http://svn.apache.org/viewvc?rev=935247&view=rev
Log:
Add a test for lambda expressions with gcc-4.5 and change build script to require gcc-4.5.

Added:
    tuscany/sca-cpp/trunk/kernel/lambda-test.cpp
Modified:
    tuscany/sca-cpp/trunk/configure.ac
    tuscany/sca-cpp/trunk/etc/git-exclude
    tuscany/sca-cpp/trunk/kernel/Makefile.am

Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=935247&r1=935246&r2=935247&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Sat Apr 17 20:21:32 2010
@@ -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.

Modified: tuscany/sca-cpp/trunk/etc/git-exclude
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/etc/git-exclude?rev=935247&r1=935246&r2=935247&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/etc/git-exclude (original)
+++ tuscany/sca-cpp/trunk/etc/git-exclude Sat Apr 17 20:21:32 2010
@@ -74,6 +74,7 @@ kernel-test
 string-test
 mem-test
 hash-test
+lambda-test
 parallel-test
 xml-test
 xsd-test

Modified: tuscany/sca-cpp/trunk/kernel/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/Makefile.am?rev=935247&r1=935246&r2=935247&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/kernel/Makefile.am Sat Apr 17 20:21:32 2010
@@ -28,6 +28,8 @@ libdynlib_test_la_SOURCES = dynlib-test.
 
 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
 

Added: tuscany/sca-cpp/trunk/kernel/lambda-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/lambda-test.cpp?rev=935247&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/lambda-test.cpp (added)
+++ tuscany/sca-cpp/trunk/kernel/lambda-test.cpp Sat Apr 17 20:21:32 2010
@@ -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;
+}