Ignore:
Timestamp:
Jan 16, 2018, 4:22:13 PM (16 months ago)
Author:
nmedfort
Message:

Added PabloBlock/Builder? createScope() methods + minor code changes.

Location:
icGREP/icgrep-devel/icgrep/re
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/re/re_compiler.cpp

    r5835 r5836  
    194194        NameMap nestedMap(mCompiledName);
    195195        mCompiledName = &nestedMap;
    196         PabloBuilder nested = PabloBuilder::Create(pb);
     196        auto nested = pb.createScope();
    197197        MarkerType m1 = compileSeqTail(current, end, 0, marker, nested);
    198198        nested.createAssign(m, markerVar(m1));
     
    317317    if (/*j > IfInsertionGap*/ false) {
    318318        Var * repeated = pb.createVar("repeated", pb.createZeroes());
    319         PabloBuilder nested = PabloBuilder::Create(pb);
     319        auto nested = pb.createScope();
    320320        NameMap nestedMap(mCompiledName);
    321321        mCompiledName = &nestedMap;
     
    407407    }
    408408    Var * m = pb.createVar("m", pb.createZeroes());
    409     PabloBuilder nested = PabloBuilder::Create(pb);
     409    auto nested = pb.createScope();
    410410    NameMap nestedMap(mCompiledName);
    411411    mCompiledName = &nestedMap;
     
    473473    }
    474474    Var * const m1a = pb.createVar("m", pb.createZeroes());
    475     PabloBuilder nested = PabloBuilder::Create(pb);
     475    auto nested = pb.createScope();
    476476    NameMap nestedMap(mCompiledName);
    477477    mCompiledName = &nestedMap;
     
    517517        Var * whileAccum = pb.createVar("accum", base);
    518518        mWhileTest = pb.createZeroes();
    519         PabloBuilder wb = PabloBuilder::Create(pb);
     519        auto wb = pb.createScope();
    520520        NameMap nestedMap(mCompiledName);
    521521        mCompiledName = &nestedMap;
  • icGREP/icgrep-devel/icgrep/re/re_name_resolve.h

    r5786 r5836  
    11#ifndef RE_NAME_RESOLVE_H
    22#define RE_NAME_RESOLVE_H
    3 
    4 #include <UCD/ucd_compiler.hpp>
    53
    64namespace re {
Note: See TracChangeset for help on using the changeset viewer.