zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
Fixed bug #1188095 (do correct normalization for fn:string-length()))

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/171047

Fixed bug #1188095 (do correct normalization for fn:string-length()))
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/171047
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-06-24 07:56:21 +0000
+++ src/compiler/translator/translator.cpp	2013-06-24 10:01:28 +0000
@@ -11985,7 +11985,15 @@
     resultExpr = CREATE(wrapper)(theRootSctx, theUDF, loc, ve);
     break;        
   }
-  case FunctionConsts::FN_STRING_LENGTH_0: 
+  case FunctionConsts::FN_STRING_LENGTH_0:
+  {
+    arguments.push_back(dotRef(loc));
+
+    arguments[0] = generate_fn_body(BUILTIN_FUNC(FN_STRING_1), arguments, loc);
+    
+    f = theSctx->lookup_fn(f->getName(), 1, loc);
+    break;
+  } 
   case FunctionConsts::FN_NORMALIZE_SPACE_0:
   case FunctionConsts::FN_ROOT_0:
   case FunctionConsts::FN_BASE_URI_0:

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-06-24 08:15:37 +0000
+++ test/fots/CMakeLists.txt	2013-06-24 10:01:28 +0000
@@ -164,8 +164,6 @@
 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 1188088)
 EXPECTED_FOTS_FAILURE (fn-serialize serialize-xml-007a 1188122)
 EXPECTED_FOTS_FAILURE (fn-serialize serialize-xml-008 1188122)
-EXPECTED_FOTS_FAILURE (fn-string-length fn-string-length-22 1188095)
-EXPECTED_FOTS_FAILURE (fn-string-length fn-string-length-24 1188095)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-038 1123835)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-039 1123835)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-042 1123835)