Ignore:
Timestamp:
Nov 11, 2017, 6:12:46 PM (19 months ago)
Author:
cameron
Message:

More changes in preparation for LLVM 3.9, 4.0

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

Legend:

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

    r5720 r5732  
    6262
    6363    RE_Compiler(pablo::PabloKernel * kernel, cc::CC_Compiler & ccCompiler, bool local = false);
    64     LLVM_ATTRIBUTE_UNUSED_RESULT RE * compileUnicodeNames(RE * re);
    65     LLVM_ATTRIBUTE_UNUSED_RESULT pablo::PabloAST * compile(RE * re);
     64    RE * compileUnicodeNames(RE * re);
     65    pablo::PabloAST * compile(RE * re);
    6666
    6767    static LLVM_ATTRIBUTE_NORETURN void UnsupportedRE(std::string errmsg);
  • icGREP/icgrep-devel/icgrep/re/re_name_resolve.cpp

    r5728 r5732  
    3030
    3131struct NameResolver {
    32     RE * resolve(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT {
     32    RE * resolve(RE * re) {
    3333        if (Name * name = dyn_cast<Name>(re)) {
    3434            auto f = mMemoizer.find(name);
  • icGREP/icgrep-devel/icgrep/re/re_name_resolve.h

    r5646 r5732  
    99    class Name;
    1010
    11     RE * resolveNames(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT;
     11    RE * resolveNames(RE * re);
    1212
    1313}
  • icGREP/icgrep-devel/icgrep/re/re_nullable.h

    r5646 r5732  
    1111class RE_Nullable {
    1212public:
    13     static RE * removeNullablePrefix(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT;
    14     static RE * removeNullableSuffix(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT;
    15     static RE * removeNullableAssertion(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT;
    16     static RE * removeNullableAfterAssertion(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT;
     13    static RE * removeNullablePrefix(RE * re);
     14    static RE * removeNullableSuffix(RE * re);
     15    static RE * removeNullableAssertion(RE * re);
     16    static RE * removeNullableAfterAssertion(RE * re);
    1717    static bool isNullable(const RE * re);
    1818    static bool hasNullablePrefix(const RE * re);
  • icGREP/icgrep-devel/icgrep/re/re_parser.h

    r5679 r5732  
    4040    static LLVM_ATTRIBUTE_NORETURN void ParseFailure(std::string errmsg);
    4141
    42     static RE * parse(const std::string &input_string, ModeFlagSet initialFlags, RE_Syntax syntax = RE_Syntax::PCRE, bool ByteMode = false) LLVM_ATTRIBUTE_UNUSED_RESULT;
     42    static RE * parse(const std::string &input_string, ModeFlagSet initialFlags, RE_Syntax syntax = RE_Syntax::PCRE, bool ByteMode = false);
    4343
    4444protected:
  • icGREP/icgrep-devel/icgrep/re/re_simplifier.h

    r5646 r5732  
    1010class RE_Simplifier {
    1111public:
    12     static RE * simplify(RE * re) LLVM_ATTRIBUTE_UNUSED_RESULT;
     12    static RE * simplify(RE * re);
    1313};
    1414
  • icGREP/icgrep-devel/icgrep/re/re_toolchain.cpp

    r5646 r5732  
    11/*
    2  *  Copyright (c) 2015 International Characters.
     2 *  Copyright (c) 2017 International Characters.
    33 *  This software is licensed to the public under the Open Software License 3.0.
    44 *  icgrep is a trademark of International Characters.
    55 */
    66
     7#include <toolchain/toolchain.h>
    78#include <re/re_toolchain.h>
    89#include <cc/cc_compiler.h>            // for CC_Compiler
     
    3334                            clEnumVal(ShowAllREs, "Print all regular expression passes"),
    3435                            clEnumVal(ShowStrippedREs, "Print REs with nullable prefixes/suffixes removed"),
    35                             clEnumVal(ShowSimplifiedREs, "Print final simplified REs"),
    36                             clEnumValEnd), cl::cat(RegexOptions));
     36                            clEnumVal(ShowSimplifiedREs, "Print final simplified REs")
     37                            CL_ENUM_VAL_SENTINEL), cl::cat(RegexOptions));
    3738
    3839static cl::bits<RE_AlgorithmFlags>
     
    4142                              clEnumVal(DisableMatchStar, "disable MatchStar optimization"),
    4243                              clEnumVal(DisableUnicodeMatchStar, "disable Unicode MatchStar optimization"),
    43                               clEnumVal(DisableUnicodeLineBreak, "disable Unicode line breaks - use LF only"),
    44                               clEnumValEnd),
    45                    cl::cat(RegexOptions));
     44                              clEnumVal(DisableUnicodeLineBreak, "disable Unicode line breaks - use LF only")
     45                              CL_ENUM_VAL_SENTINEL), cl::cat(RegexOptions));
    4646
    4747bool AlgorithmOptionIsSet(RE_AlgorithmFlags flag) {
  • icGREP/icgrep-devel/icgrep/re/re_toolchain.h

    r5646 r5732  
    2929const llvm::cl::OptionCategory * re_toolchain_flags();
    3030
    31 RE * regular_expression_passes(RE * re_ast) LLVM_ATTRIBUTE_UNUSED_RESULT;
     31RE * regular_expression_passes(RE * re_ast);
    3232
    33 pablo::PabloAST * re2pablo_compiler(pablo::PabloKernel * kernel, RE * re_ast) LLVM_ATTRIBUTE_UNUSED_RESULT;
     33pablo::PabloAST * re2pablo_compiler(pablo::PabloKernel * kernel, RE * re_ast);
    3434   
    3535}
Note: See TracChangeset for help on using the changeset viewer.