Ignore:
Timestamp:
Jun 30, 2015, 3:12:47 PM (4 years ago)
Author:
nmedfort
Message:

Temporary check-in for dynamic unicode class compilation.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/compiler.cpp

    r4622 r4626  
    2828#include "UCD/precompiled_derivedcoreproperties.h"
    2929#include "UCD/precompiled_proplist.h"
    30 
    31 #include "resolve_properties.cpp"
    32 
    33 #include "llvm/Support/CommandLine.h"
     30#include "resolve_properties.h"
     31#include <llvm/Support/CommandLine.h>
    3432#include <re/printer_re.h>
    3533#include <pablo/printer_pablos.h>
    36 
    37 
    38 cl::OptionCategory cRegexOutputOptions("Regex Dump Options",
     34#include <iostream>
     35
     36static cl::OptionCategory cRegexOutputOptions("Regex Dump Options",
    3937                                      "These options control printing of intermediate regular expression structures.");
    4038
    41 cl::OptionCategory dPabloDumpOptions("Pablo Dump Options",
     39static cl::OptionCategory dPabloDumpOptions("Pablo Dump Options",
    4240                                      "These options control printing of intermediate Pablo code.");
    4341
     
    5351
    5452
    55 cl::OptionCategory cPabloOptimizationsOptions("Pablo Optimizations",
     53static cl::OptionCategory cPabloOptimizationsOptions("Pablo Optimizations",
    5654                                              "These options control Pablo optimization passes.");
    5755
     
    107105        std::cerr << "RemoveNullableSuffix:" << std::endl << Printer_RE::PrintRE(re_ast) << std::endl;
    108106    }
    109    
    110     resolveProperties(re_ast);
    111    
     107
     108    if (IsPregeneratedUnicodeEnabled()) {
     109        resolveProperties(re_ast);
     110    }
    112111   
    113112    CC_NameMap nameMap;
     
    183182
    184183    PabloCompiler pablo_compiler(basisBits);
    185    
    186     install_property_gc_fn_ptrs(pablo_compiler);
    187     install_property_sc_fn_ptrs(pablo_compiler);
    188     install_property_scx_fn_ptrs(pablo_compiler);
    189     install_property_blk_fn_ptrs(pablo_compiler);
    190     install_property_DerivedCoreProperties_fn_ptrs(pablo_compiler);
    191     install_property_PropList_fn_ptrs(pablo_compiler);
    192 
     184    if (IsPregeneratedUnicodeEnabled()) {
     185        install_property_gc_fn_ptrs(pablo_compiler);
     186        install_property_sc_fn_ptrs(pablo_compiler);
     187        install_property_scx_fn_ptrs(pablo_compiler);
     188        install_property_blk_fn_ptrs(pablo_compiler);
     189        install_property_DerivedCoreProperties_fn_ptrs(pablo_compiler);
     190        install_property_PropList_fn_ptrs(pablo_compiler);
     191    }
    193192    try {
    194193        CompiledPabloFunction retVal = pablo_compiler.compile(main);
Note: See TracChangeset for help on using the changeset viewer.