zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/78671

removed obsolete files and code
-- 
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/78671
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'include/zorba/static_context_consts.h'
--- include/zorba/static_context_consts.h	2011-06-29 19:05:22 +0000
+++ include/zorba/static_context_consts.h	2011-10-07 21:29:28 +0000
@@ -60,21 +60,6 @@
  */
 typedef enum { validate_skip, validate_lax, validate_strict } validation_mode_t;
 
-/** \brief Update property of a collection as defined
- *         in the XQuery Data Definition Facility
- */
-typedef enum { coll_const, coll_append_only, coll_queue, coll_mutable } collection_update_property_t;
-
-/** \brief Order property of a collection as defined
- *         in the XQuery Data Definition Facility
- */
-typedef enum { coll_ordered, coll_unordered } collection_order_property_t;
-
-/** \brief Node modifier of a collection as defined
- *         in the XQuery Data Definition Facility
- */
-typedef enum { coll_node_const, coll_node_mutable } collection_node_modifier_t;
-
 /** \brief Maintenance mode of an index as defined
  *         in the XQuery Data Definition Facility
  */

=== removed file 'src/store/naive/node_vector.cpp'
--- src/store/naive/node_vector.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/node_vector.cpp	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "zorbautils/fatal.h"
-
-#include "store/naive/node_vector.h"
-
-
-namespace zorba 
-{
-
-namespace simplestore 
-{
-
-NodeVector dummyVector;
-
-
-void NodeVector::insert(XmlNode* n, long pos)
-{
-  if (pos < 0 || pos >= (long)size())
-  {
-    theNodes.push_back(n);
-  }
-  else
-  {
-    theNodes.insert(theNodes.begin() + pos, n);
-  }
-}
-
-
-void NodeVector::remove(ulong pos)
-{
-  ZORBA_FATAL(pos < size(),  "pos = " << pos << " size = " << size());
-
-  theNodes.erase(theNodes.begin() + pos);
-}
-
-
-NodeVector::iterator NodeVector::remove(XmlNode* n)
-{
-  NodeVector::iterator pos = std::find(theNodes, n);
-
-  if (pos != theNodes.end())
-  {
-    theNodes.erase(pos);
-  }
-  return pos;
-}
-
-
-void NodeVector::compact()
-{
-  if (theNodes.capacity() > theNodes.size())
-  {
-    std::vector<XmlNode*> tmp(theNodes.size());
-    tmp = theNodes;
-    theNodes.swap(tmp);
-  }
-}
-
-}
-}
-/* vim:set et sw=2 ts=2: */

=== removed file 'src/store/naive/node_vector.h'
--- src/store/naive/node_vector.h	2011-06-14 17:26:33 +0000
+++ src/store/naive/node_vector.h	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ZORBA_SIMPLE_STORE_NODE_VECTOR
-#define ZORBA_SIMPLE_STORE_NODE_VECTOR
-
-#include <vector>
-
-#include "store/naive/shared_types.h"
-
-namespace zorba 
-{
-
-namespace simplestore 
-{
-
-
-class XmlNode;
-
-
-/*******************************************************************************
-  NodeVector is used to store the children or the attributes of element and
-  document nodes.
-********************************************************************************/
-class NodeVector
-{
-public:
-  typedef std::vector<XmlNode*>::iterator iterator;
-
-public:
-  std::vector<XmlNode*> theNodes;
-
-public:
-  NodeVector() { }
-
-  NodeVector(vsize_t size) : theNodes(size) { }
-
-  bool empty() const { return theNodes.empty(); }
-
-  void clear() { theNodes.clear(); }
-
-  vsize_t size() const { return theNodes.size(); }
-
-  void resize(vsize_t size) { theNodes.resize(size); }
-
-  XmlNode* get(vsize_t pos) const { return theNodes[pos]; } 
-
-  void set(XmlNode* n, vsize_t pos) { theNodes[pos] = n; }
-
-  void push_back(XmlNode* n) { theNodes.push_back(n); }
-
-  void insert(XmlNode* n, vsize_t pos);
-
-  void remove(vsize_t pos);
-
-  iterator remove(XmlNode* n);
-
-  void compact();
-
-private:
-  NodeVector(const NodeVector& v);
-  NodeVector& operator=(const NodeVector& v);
-};
-
-
-}
-}
-
-#endif
-
-/*
- * Local variables:
- * mode: c++
- * End:
- */
-/* vim:set et sw=2 ts=2: */

=== modified file 'src/store/naive/simple_index.h'
--- src/store/naive/simple_index.h	2011-09-30 14:06:33 +0000
+++ src/store/naive/simple_index.h	2011-10-07 21:29:28 +0000
@@ -38,7 +38,6 @@
 class IndexCompareFunction
 {
   friend class HashIndex;
-  friend class STLMapIndex;
 
 private:
   ulong                              theNumColumns;