Changeset 4990


Ignore:
Timestamp:
Mar 24, 2016, 10:44:56 PM (18 months ago)
Author:
cameron
Message:

Fix for first positional arg not a filename

Location:
icGREP/icgrep-devel/icgrep
Files:
4 edited

Legend:

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

    r4988 r4990  
    111111    pablo::PabloBuilder pBuilder(cc_compiler.getBuilder().getPabloBlock(), cc_compiler.getBuilder());
    112112    const std::vector<pablo::Var *> basis_bits = cc_compiler.getBasisBits();
    113     pablo::PabloAST * alpha = cc_compiler.compileCC(re::makeCC(0x41, 0x5A));  // ASCII A-Z
     113   
     114   
     115    pablo::PabloAST * alpha = cc_compiler.compileCC(re::makeCC(re::makeCC(0x41, 0x5A), re::makeCC(0x61,0x7A)));  // ASCII A-Z
     116   
     117   
     118   
    114119    function->setResult(0, pBuilder.createAssign("b0", basis_bits[0]));
    115120    function->setResult(1, pBuilder.createAssign("b1", basis_bits[1]));
  • icGREP/icgrep-devel/icgrep/icgrep.cpp

    r4979 r4990  
    162162    grepEngine.grepCodeGen(module_name, re_ast);
    163163
    164     initResult(inputFiles, inputFiles.size());
     164    initResult(inputFiles, firstInputFile, inputFiles.size());
    165165    if (Threads <= 1) {
    166166        for (unsigned i = firstInputFile; i != inputFiles.size(); ++i) {
  • icGREP/icgrep-devel/icgrep/toolchain.cpp

    r4989 r4990  
    135135static std::vector<std::string> inputFiles;
    136136
    137 void initResult(std::vector<std::string> filenames, const int n){
    138     if (n > 1) {
     137void initResult(std::vector<std::string> filenames, const int firstName, const int n){
     138    if (n - firstName > 1) {
    139139        ShowFileNames = true;
    140140    }
  • icGREP/icgrep-devel/icgrep/toolchain.h

    r4985 r4990  
    2222void setParsedCodePointSet();
    2323
    24 void initResult(std::vector<std::string> filenames, const int n);
     24void initResult(std::vector<std::string> filenames, const int firstName, const int n);
    2525void PrintResult();
    2626
Note: See TracChangeset for help on using the changeset viewer.