Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/null-type-fix into
lp:zorba with lp:~zorba-coders/zorba/new-jsoniq as a prerequisite.
Commit message:
Fixing null type syntax.
Requested reviews:
Chris Hillery (ceejatec)
Nicolae Brinza (nbrinza)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/null-type-fix/+merge/163883
Fixing null type syntax.
--
https://code.launchpad.net/~zorba-coders/zorba/null-type-fix/+merge/163883
Your team Zorba Coders is subscribed to branch
lp:~zorba-coders/zorba/new-jsoniq.
=== modified file 'src/compiler/parser/parser.y'
--- src/compiler/parser/parser.y 2013-05-15 10:04:30 +0000
+++ src/compiler/parser/parser.y 2013-05-15 10:04:31 +0000
@@ -5451,6 +5451,12 @@
{
$$ = new GeneralizedAtomicType( LOC(@$), static_cast<QName*>($1) );
}
+#ifdef JSONIQ_PARSER
+| NULL_TOKEN
+ {
+ $$ = new GeneralizedAtomicType( LOC(@$), new QName(LOC(@$), "null") );
+ }
+#endif
;
=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp 2013-04-08 19:44:58 +0000
+++ src/context/root_static_context.cpp 2013-05-15 10:04:31 +0000
@@ -140,6 +140,7 @@
"fn", static_context::W3C_FN_NS,
#ifdef ZORBA_WITH_JSON
"jn", static_context::JSONIQ_FN_NS,
+ "js", static_context::JSONIQ_DM_NS,
#endif
"local", XQUERY_LOCAL_FN_NS,
"xml", XML_NS,
--
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
