[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Approved => Merged 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
Validation queue job bug-1067028-no-json-2012-12-14T10-29-02.137Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Needs review => Approved 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Approved => Needs review 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/compiler/rewriter/rules/type_rules.cpp -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Needs review => Approved 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Approved => Needs review 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
Validation queue job bug-1067028-no-json-2012-10-15T20-46-42.007Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Needs review => Approved 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Approved => Needs review 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Description changed to: fix compilation without ZORBA_WITH_JSON 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Commit Message changed to: fix compilation without ZORBA_WITH_JSON 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba has been updated. Status: Needs review => Approved 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. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba
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 +
+++ src/api/serialization/serializer.cpp 2012-10-15 19:29:22 +
@@ -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 +
+++ src/compiler/rewriter/rules/type_rules.cpp 2012-10-15 19:29:22 +
@@ -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;
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
