zorba-coders team mailing list archive

[Till Westmann <till.westmann@xxxxxxxxxx>]

Till Westmann has proposed merging lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #1067028 in Zorba: "compilation fails without ZORBA_WITH_JSON"
  https://bugs.launchpad.net/zorba/+bug/1067028

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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-10-15 19:29: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-10-10 13:05:50 +0000
+++ src/compiler/rewriter/rules/type_rules.cpp	2012-10-15 19:29:22 +0000
@@ -127,6 +127,7 @@
         return NULL;
     }
 
+#ifdef ZORBA_WITH_JSON
     if (fo->get_func()->getKind() == FunctionConsts::OP_ZORBA_JSON_BOX_1)
     {
       expr* arg = fo->get_arg(0);
@@ -145,6 +146,7 @@
 
       return NULL;
     }
+#endif
   }
 
   cast_base_expr* pe = NULL;