Merge lp:~zorba-coders/zorba/xquery_visitor into lp:zorba

[William Candillon]

Add support for function items test in the print xquery visitor.

Add support for function items test in the print xquery visitor.

[William Candillon (wcandillon)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xquery_visitor-2012-05-21T19-09-00.923Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/xquery_visitor into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job xquery_visitor-2012-05-21T19-09-00.923Z is finished.
  The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xquery_visitor-2012-05-21T19-53-16.437Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xquery_visitor-2012-05-21T19-53-16.437Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/parsetree/parsenode_print_xquery_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xquery_visitor.cpp	2012-05-03 12:31:51 +0000
+++ src/compiler/parsetree/parsenode_print_xquery_visitor.cpp	2012-05-21 19:07:37 +0000
@@ -1869,11 +1869,42 @@
 
       os << "{";
       n.getExprSingle()->accept(*this);
-      os << '}';
+      os << "}";
       return 0;
     }
     DEFAULT_END_VISIT (CatchExpr);
 
+    void* begin_visit(const AnyFunctionTest& n)
+    {
+      os << "function (*)";
+      return 0;
+    }
+    DEFAULT_END_VISIT (AnyFunctionTest);
+    
+    void* begin_visit(const TypedFunctionTest& n)
+    {
+      os << "function (";
+      n.getArgumentTypes()->accept(*this); 
+      os << ") as ";
+      n.getReturnType()->accept(*this); 
+      return 0; 
+    }
+    DEFAULT_END_VISIT (TypedFunctionTest);
+    
+    void* begin_visit(const TypeList& n)
+    {
+      for (size_t i = 0; i < n.size(); ++i)
+      {
+        if (i > 0)
+        {
+          os << ", ";
+        }
+        const SequenceType* e_p = n[i];
+        e_p->accept(*this);
+      }
+      return 0;
+    }
+    DEFAULT_END_VISIT (TypeList);
 
   /* full-text-related */
   DEFAULT_VISIT (FTAnd);
@@ -1921,9 +1952,6 @@
 
     DEFAULT_VISIT (LiteralFunctionItem);
     DEFAULT_VISIT (InlineFunction);
-    DEFAULT_VISIT (AnyFunctionTest);
-    DEFAULT_VISIT (TypeList);
-    DEFAULT_VISIT (TypedFunctionTest);
     DEFAULT_VISIT (DynamicFunctionInvocation);
 
   DEFAULT_VISIT (ParseErrorNode);