zorba-coders team mailing list archive

[Till Westmann <till.westmann@xxxxxxxxxx>]

Till Westmann has proposed merging lp:~zorba-coders/zorba/feature-fix-internal-audit-constants into lp:zorba.

Commit message:
change name of generated constants to avoid conflicts

Requested reviews:
  Till Westmann (tillw)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-fix-internal-audit-constants/+merge/157676

If we create an audit property with the last segment being "path" we get a conflict for the generated c++ constants. This conflict is avoided with this change.
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-fix-internal-audit-constants/+merge/157676
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/api/auditprops_cpp.xq'
--- src/api/auditprops_cpp.xq	2013-04-03 22:52:25 +0000
+++ src/api/auditprops_cpp.xq	2013-04-08 15:44:24 +0000
@@ -28,7 +28,7 @@
 declare function local:group-path($group-spec as xs:string*) as xs:string
 {
 let $name := string-join($group-spec ! upper-case(.), "_")
-let $path := $name || "_PATH"
+let $path := $name || "_"
 return
   'const char* '
     || $path || "[]"

=== modified file 'src/api/pregenerated/auditprops.cpp'
--- src/api/pregenerated/auditprops.cpp	2013-04-03 22:52:25 +0000
+++ src/api/pregenerated/auditprops.cpp	2013-04-08 15:44:24 +0000
@@ -1,5 +1,5 @@
-const char* XQUERY_COMPILATION_PATH[] = { "xquery", "compilation" };
-const PropertyGroupImpl XQUERY_COMPILATION(2, XQUERY_COMPILATION_PATH);
+const char* XQUERY_COMPILATION_[] = { "xquery", "compilation" };
+const PropertyGroupImpl XQUERY_COMPILATION(2, XQUERY_COMPILATION_);
 const PropertyImpl XQUERY_COMPILATION_FILENAME(XQUERY_COMPILATION, "filename", 0, Property::STRING);
 const PropertyImpl XQUERY_COMPILATION_PARSE_DURATION(XQUERY_COMPILATION, "parse-duration", 1, Property::INT);
 const PropertyImpl XQUERY_COMPILATION_TRANSLATION_DURATION(XQUERY_COMPILATION, "translation-duration", 2, Property::INT);