← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/fix-accesses-dyn-ctx into lp:zorba

 

Federico Cavalieri has proposed merging lp:~zorba-coders/zorba/fix-accesses-dyn-ctx into lp:zorba.

Commit message:
Fixed dynamic context access declaration in the General Functions and Operators on Sequences module

Requested reviews:
  Federico Cavalieri (fcavalieri)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-accesses-dyn-ctx/+merge/200322

Fixed dynamic context access declaration in the General Functions and Operators on Sequences module
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix-accesses-dyn-ctx/+merge/200322
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/functions/pregenerated/func_sequences.h'
--- src/functions/pregenerated/func_sequences.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_sequences.h	2014-01-02 16:17:12 +0000
@@ -633,6 +633,8 @@
 theXQueryVersion = StaticContextConsts::xquery_version_3_0;
   }
 
+  bool accessesDynCtx() const { return true; }
+
   CODEGEN_DECL();
 };
 
@@ -648,6 +650,8 @@
 theXQueryVersion = StaticContextConsts::xquery_version_3_0;
   }
 
+  bool accessesDynCtx() const { return true; }
+
   CODEGEN_DECL();
 };
 
@@ -663,6 +667,10 @@
 theXQueryVersion = StaticContextConsts::xquery_version_3_0;
   }
 
+  bool accessesDynCtx() const { return true; }
+
+  bool isSource() const { return true; }
+
   CODEGEN_DECL();
 };
 
@@ -678,6 +686,10 @@
 theXQueryVersion = StaticContextConsts::xquery_version_3_0;
   }
 
+  bool accessesDynCtx() const { return true; }
+
+  bool isSource() const { return true; }
+
   CODEGEN_DECL();
 };
 
@@ -693,6 +705,10 @@
 theXQueryVersion = StaticContextConsts::xquery_version_3_0;
   }
 
+  bool accessesDynCtx() const { return true; }
+
+  bool isSource() const { return true; }
+
   CODEGEN_DECL();
 };
 

=== modified file 'src/runtime/spec/sequences/sequences.xml'
--- src/runtime/spec/sequences/sequences.xml	2013-09-17 21:12:49 +0000
+++ src/runtime/spec/sequences/sequences.xml	2014-01-02 16:17:12 +0000
@@ -1173,6 +1173,10 @@
     <zorba:signature localname="available-environment-variables" prefix="fn" version="3.0">
       <zorba:output>xs:string*</zorba:output>
     </zorba:signature>
+    
+    <zorba:methods>
+      <zorba:accessesDynCtx returnValue="true"/>
+    </zorba:methods>
 
   </zorba:function>
 
@@ -1181,10 +1185,6 @@
                   brief="the current iterator"/>
   </zorba:state>
 
-  <zorba:methods>
-    <zorba:accessesDynCtx returnValue="true"/>
-  </zorba:methods>
-
 </zorba:iterator>
 
 <!--
@@ -1206,11 +1206,12 @@
       <zorba:param>xs:string</zorba:param>
       <zorba:output>xs:string?</zorba:output>
     </zorba:signature>
+    
+    <zorba:methods>
+      <zorba:accessesDynCtx returnValue="true"/>
+    </zorba:methods>
+    
   </zorba:function>
-
-  <zorba:methods>
-    <zorba:accessesDynCtx returnValue="true"/>
-  </zorba:methods>
   
 </zorba:iterator>
 
@@ -1238,13 +1239,15 @@
       <zorba:param>xs:string</zorba:param>
       <zorba:output>xs:string?</zorba:output>
     </zorba:signature>
+    
+    <zorba:methods>
+      <zorba:accessesDynCtx returnValue="true"/>
+      <zorba:isSource returnValue="true"/>
+    </zorba:methods>
+    
   </zorba:function>
 
-  <zorba:methods>
-    <zorba:accessesDynCtx returnValue="true"/>
-    <zorba:isSource returnValue="true"/>
-  </zorba:methods>
-  
+ 
 </zorba:iterator>
 
 <!--
@@ -1273,13 +1276,13 @@
       <zorba:output>xs:string?</zorba:output>
     </zorba:signature>
 
+    <zorba:methods>
+      <zorba:accessesDynCtx returnValue="true"/>
+      <zorba:isSource returnValue="true"/>
+    </zorba:methods>
+
   </zorba:function>
-
-  <zorba:methods>
-    <zorba:accessesDynCtx returnValue="true"/>
-    <zorba:isSource returnValue="true"/>
-  </zorba:methods>
-  
+ 
 </zorba:iterator>
 
 <!--
@@ -1306,6 +1309,12 @@
         <zorba:param>xs:string</zorba:param>
         <zorba:output>xs:string*</zorba:output>
       </zorba:signature>
+      
+      <zorba:methods>
+        <zorba:accessesDynCtx returnValue="true"/>
+        <zorba:isSource returnValue="true"/>
+      </zorba:methods>
+      
     </zorba:function>
 
     
@@ -1317,11 +1326,6 @@
                   brief="the current iterator"/>
     </zorba:state> 
     
-    <zorba:methods>
-      <zorba:accessesDynCtx returnValue="true"/>
-      <zorba:isSource returnValue="true"/>
-    </zorba:methods>
-
   </zorba:iterator>
 
 </zorba:iterators>


Follow ups