Add regex support in policy schema

components/policy/core/common/schema.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_POLICY_CORE_COMMON_SCHEMA_H_
 #define COMPONENTS_POLICY_CORE_COMMON_SCHEMA_H_
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "components/policy/policy_export.h"
 
 namespace policy {
 namespace internal {
 
 struct POLICY_EXPORT SchemaData;
@@ skipping 31 matching lines @@
 
 // Describes the expected type of one policy. Also recursively describes the
 // types of inner elements, for structured types.
 // Objects of this class refer to external, immutable data and are cheap to
 // copy.
 class POLICY_EXPORT Schema {
  public:
   // Used internally to store shared data.
   class InternalStorage;
 
+  typedef std::vector<Schema> SchemaList;

[Joao da Silva, 2014/04/02 09:51:11]

Put this outside the class. It will require a forward declaration:

class Schema;

typedef std::vector<Schema> SchemaList;

class POLICY_EXPORT Schema { ... }

[binjin, 2014/04/03 10:13:37]

Done.

+
   // Builds an empty, invalid schema.
   Schema();
 
   // Makes a copy of |schema| that shares the same internal storage.
   Schema(const Schema& schema);
 
   ~Schema();
 
   Schema& operator=(const Schema& schema);
 
@@ skipping 71 matching lines @@
   // otherwise invalid memory will be read. A CHECK is currently enforcing this.
 
   // Returns an iterator that goes over the named properties of this schema.
   // The returned iterator is at the beginning.
   Iterator GetPropertiesIterator() const;
 
   // Returns the Schema for the property named |key|. If |key| is not a known
   // property name then the returned Schema is not valid.
   Schema GetKnownProperty(const std::string& key) const;
 
+  // Returns all Schemas from pattern properties that matchs |key|, might be

[Joao da Silva, 2014/04/02 09:51:11]

[...] that match |key|. May be empty.

[binjin, 2014/04/03 10:13:37]

Done.

+  // empty.
+  SchemaList GetPatternProperties(const std::string& key) const;
+
   // Returns the Schema for additional properties. If additional properties are
   // not allowed for this Schema then the Schema returned is not valid.
   Schema GetAdditionalProperties() const;
 
   // Returns the Schema for |key| if it is a known property, otherwise returns
   // the Schema for additional properties.
+  // DEPRECATED: This function didn't consider patternProperties, use
+  // GetMatchingProperties() instead.
   Schema GetProperty(const std::string& key) const;

[Joao da Silva, 2014/04/02 09:51:11]

Leave a TODO to remove this.

[binjin, 2014/04/03 10:13:37]

Done.

 
+  // Returns all Schemas that are supposed to be validate against for |key|,
+  // might be empty.

[Joao da Silva, 2014/04/02 09:51:11]

Returns all Schemas that are supposed to be validated against for |key|. May be
empty.

[binjin, 2014/04/03 10:13:37]

Done.

+  SchemaList GetMatchingProperties(const std::string& key) const;
+
   // Returns the Schema for items of an array.
   // This method should be called only if type() == TYPE_LIST,
   // otherwise invalid memory will be read. A CHECK is currently enforcing this.
   Schema GetItems() const;
 
  private:
   // Builds a schema pointing to the inner structure of |storage|,
   // rooted at |node|.
   Schema(const scoped_refptr<const InternalStorage>& storage,
          const internal::SchemaNode* node);
 
   bool ValidateIntegerRestriction(int index, int value) const;
   bool ValidateStringRestriction(int index, const char* str) const;
 
   scoped_refptr<const InternalStorage> storage_;
   const internal::SchemaNode* node_;
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_SCHEMA_H_