Merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba

[Till Westmann]

fix compilation without ZORBA_WITH_JSON

fix compilation without ZORBA_WITH_JSON

[Till Westmann (tillw)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1067028-no-json-2012-10-15T20-46-42.007Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1067028-no-json-2012-10-15T20-46-42.007Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in src/compiler/rewriter/rules/type_rules.cpp

[lp:~zorba-coders/zorba/bug-1067028-no-json]

11101. By Chris Hillery on 2012-12-14

Merge from trunk.

11102. By Chris Hillery on 2012-12-14

Added ZORBA_WITH_JSON preprocessor guard for json-doc().

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1067028-no-json-2012-12-14T10-29-02.137Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1067028-no-json-2012-12-14T10-29-02.137Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2012-10-08 12:09:36 +0000
+++ src/api/serialization/serializer.cpp	2012-12-14 10:28:22 +0000
@@ -2482,8 +2482,10 @@
     case PARAMETER_VALUE_XHTML: m = "xhtml"; break;
     case PARAMETER_VALUE_TEXT: m = "text"; break;
     case PARAMETER_VALUE_BINARY: m = "binary"; break;
+#ifdef ZORBA_WITH_JSON
     case PARAMETER_VALUE_JSON: m = "json"; break;
     case PARAMETER_VALUE_JSON_XML_HYBRID: m = "json-xml-hybrid"; break;
+#endif
     default: ZORBA_ASSERT(false);
   }
 }

=== modified file 'src/compiler/rewriter/rules/type_rules.cpp'
--- src/compiler/rewriter/rules/type_rules.cpp	2012-12-12 07:36:20 +0000
+++ src/compiler/rewriter/rules/type_rules.cpp	2012-12-14 10:28:22 +0000
@@ -129,6 +129,7 @@
         return NULL;
     }
 
+#ifdef ZORBA_WITH_JSON
     if (fo->get_func()->getKind() == FunctionConsts::OP_ZORBA_JSON_BOX_1)
     {
       expr* arg = fo->get_arg(0);
@@ -147,6 +148,7 @@
 
       return NULL;
     }
+#endif
 
     break;
   }

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp	2012-10-15 13:39:36 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.cpp	2012-12-14 10:28:22 +0000
@@ -141,7 +141,7 @@
 }
 
 #endif
-
+#ifdef ZORBA_WITH_JSON
 PlanIter_t fn_jsoniq_json_doc::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -151,6 +151,8 @@
 {
   return new JSONDocIterator(sctx, loc, argv);
 }
+
+#endif
 #ifdef ZORBA_WITH_JSON
 PlanIter_t op_zorba_json_item_accessor::codegen(
   CompilerCB*,
@@ -480,6 +482,8 @@
 #endif
 
 
+#ifdef ZORBA_WITH_JSON
+
 
       {
     DECL_WITH_KIND(sctx, fn_jsoniq_json_doc,
@@ -491,6 +495,8 @@
   }
 
 
+#endif
+
 
 #ifdef ZORBA_WITH_JSON
 

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.h'
--- src/functions/pregenerated/func_jsoniq_functions.h	2012-10-15 13:39:36 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.h	2012-12-14 10:28:22 +0000
@@ -236,7 +236,7 @@
   CODEGEN_DECL();
 };
 #endif
-
+#ifdef ZORBA_WITH_JSON
 
 //fn-jsoniq:json-doc
 class fn_jsoniq_json_doc : public function
@@ -255,6 +255,7 @@
 
   CODEGEN_DECL();
 };
+#endif
 #ifdef ZORBA_WITH_JSON
 
 //op-zorba:json-item-accessor

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.cpp'
--- src/runtime/json/pregenerated/jsoniq_functions.cpp	2012-11-29 01:16:16 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.cpp	2012-12-14 10:28:22 +0000
@@ -357,6 +357,7 @@
 // </JSONArrayFlattenIterator>
 
 #endif
+#ifdef ZORBA_WITH_JSON
 // <JSONDocIterator>
 SERIALIZABLE_CLASS_VERSIONS(JSONDocIterator)
 
@@ -386,7 +387,7 @@
 
 // </JSONDocIterator>
 
-
+#endif
 #ifdef ZORBA_WITH_JSON
 // <JSONItemAccessorIterator>
 SERIALIZABLE_CLASS_VERSIONS(JSONItemAccessorIterator)

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.h'
--- src/runtime/json/pregenerated/jsoniq_functions.h	2012-11-29 01:16:16 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.h	2012-12-14 10:28:22 +0000
@@ -460,6 +460,7 @@
 
 #endif
 
+#ifdef ZORBA_WITH_JSON
 /**
  * jn:json-doc
  * Author: Zorba Team
@@ -505,6 +506,7 @@
   bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
 };
 
+#endif
 
 #ifdef ZORBA_WITH_JSON
 /**

=== modified file 'src/runtime/spec/json/jsoniq_functions.xml'
--- src/runtime/spec/json/jsoniq_functions.xml	2012-11-29 01:16:16 +0000
+++ src/runtime/spec/json/jsoniq_functions.xml	2012-12-14 10:28:22 +0000
@@ -388,7 +388,8 @@
 /*******************************************************************************
 ********************************************************************************/
 -->
-<zorba:iterator name="JSONDocIterator">
+<zorba:iterator name="JSONDocIterator"
+  preprocessorGuard="#ifdef ZORBA_WITH_JSON">
   
   <zorba:description author="Zorba Team">jn:json-doc</zorba:description>
   

=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2012-10-15 13:39:36 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2012-12-14 10:28:22 +0000
@@ -338,8 +338,9 @@
 #ifdef ZORBA_WITH_JSON
     class JSONArrayFlattenIterator;
 #endif
+#ifdef ZORBA_WITH_JSON
     class JSONDocIterator;
-
+#endif
 #ifdef ZORBA_WITH_JSON
     class JSONItemAccessorIterator;
 #endif
@@ -1190,9 +1191,10 @@
     virtual void beginVisit ( const JSONArrayFlattenIterator& ) = 0;
     virtual void endVisit   ( const JSONArrayFlattenIterator& ) = 0;
 #endif
+#ifdef ZORBA_WITH_JSON
     virtual void beginVisit ( const JSONDocIterator& ) = 0;
     virtual void endVisit   ( const JSONDocIterator& ) = 0;
-
+#endif
 #ifdef ZORBA_WITH_JSON
     virtual void beginVisit ( const JSONItemAccessorIterator& ) = 0;
     virtual void endVisit   ( const JSONItemAccessorIterator& ) = 0;

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2012-10-15 13:39:36 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2012-12-14 10:28:22 +0000
@@ -1973,7 +1973,7 @@
 // </JSONArrayFlattenIterator>
 
 #endif
-
+#ifdef ZORBA_WITH_JSON
 // <JSONDocIterator>
 void PrinterVisitor::beginVisit ( const JSONDocIterator& a) {
   thePrinter.startBeginVisit("JSONDocIterator", ++theId);
@@ -1987,6 +1987,7 @@
 }
 // </JSONDocIterator>
 
+#endif
 #ifdef ZORBA_WITH_JSON
 // <JSONItemAccessorIterator>
 void PrinterVisitor::beginVisit ( const JSONItemAccessorIterator& a) {

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2012-10-15 13:39:36 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2012-12-14 10:28:22 +0000
@@ -522,8 +522,10 @@
     void endVisit  ( const JSONArrayFlattenIterator& );
 #endif
 
+#ifdef ZORBA_WITH_JSON
     void beginVisit( const JSONDocIterator& );
     void endVisit  ( const JSONDocIterator& );
+#endif
 
 #ifdef ZORBA_WITH_JSON
     void beginVisit( const JSONItemAccessorIterator& );