Ignore:
Timestamp:
Nov 7, 2018, 8:15:20 PM (11 months ago)
Author:
cameron
Message:

Restructuring step: liminate RE:::Vector

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/re/re_alt.h

    r5866 r6195  
    99
    1010#include "re_re.h"
     11#include <util/slab_allocator.h>
     12#include <vector>
    1113#include <re/re_cc.h>
    1214#include <re/re_seq.h>
     
    1719namespace re {
    1820
    19 class Alt : public Vector {
     21class Alt : public RE, public std::vector<RE*, ProxyAllocator<RE *>> {
    2022public:
    2123    static inline bool classof(const RE * re) {
     
    2830    friend Alt * makeAlt();
    2931    template<typename iterator> friend RE * makeAlt(iterator, iterator);
    30     Alt()
    31     : Vector(ClassTypeId::Alt) {
    32 
    33     }
     32    Alt() : RE(ClassTypeId::Alt), std::vector<RE*, ProxyAllocator<RE *>>(mAllocator) {}
    3433    Alt(iterator begin, iterator end)
    35     : Vector(ClassTypeId::Alt, begin, end) {
    36 
    37     }
     34    : RE(ClassTypeId::Alt), std::vector<RE*, ProxyAllocator<RE *>>(begin, end, mAllocator) { }
    3835};
    3936
Note: See TracChangeset for help on using the changeset viewer.