Changeset 6de43b6 for src


Ignore:
Timestamp:
Nov 2, 2017, 1:37:57 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
000178a
Parents:
4f748c5
Message:

Fix cfa-cpp flags -L and -N

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • src/main.cc

    r4f748c5 r6de43b6  
    8181        expraltp = false,
    8282        libcfap = false,
    83         preludep = false,
    8483        nopreludep = false,
    8584        noprotop = false,
    … …  
    9493        codegenp = false,
    9594        prettycodegenp = false,
    96         nolinemarks = false;
     95        linemarks = false;
    9796
    9897static void parse_cmdline( int argc, char *argv[], const char *& filename );
    … …  
    341340
    342341                CodeTools::fillLocations( translationUnit );
    343                 CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
     342                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
    344343
    345344                CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
    … …  
    379378
    380379void parse_cmdline( int argc, char * argv[], const char *& filename ) {
    381         enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Preamble, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
     380        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
    382381
    383382        static struct option long_opts[] = {
    … …  
    391390                { "grammar", no_argument, 0, Grammar },
    392391                { "libcfa", no_argument, 0, LibCFA },
    393                 { "preamble", no_argument, 0, Preamble },
     392                { "line-marks", no_argument, 0, Linemarks },
     393                { "no-line-marks", no_argument, 0, Nolinemarks },
    394394                { "no-preamble", no_argument, 0, Nopreamble },
    395395                { "parse", no_argument, 0, Parse },
    … …  
    447447                        libcfap = true;
    448448                        break;
    449                   case 'L':                                                                             // surpress lines marks
    450                         nolinemarks = true;
     449                  case Linemarks:
     450                  case 'L':                                                                             // print lines marks
     451                        linemarks = true;
    451452                        break;
    452453                  case Nopreamble:
    … …  
    454455                        nopreludep = true;
    455456                        break;
    456                   case Preamble:
    457                   case 'N':                                                                             // read preamble
    458                         preludep = true;
     457                  case Nolinemarks:
     458                  case 'N':                                                                             // suppress line marks
     459                        linemarks = false;
    459460                        break;
    460461                  case Prototypes:

  • src/prelude/Makefile.am

    r4f748c5 r6de43b6  
    5757
    5858bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    59         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     59        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6060
    6161maintainer-clean-local :

  • src/prelude/Makefile.in

    r4f748c5 r6de43b6  
    526526
    527527bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    528         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     528        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    529529
    530530maintainer-clean-local :

  • src/tests/Makefile.am

    r4f748c5 r6de43b6  
    107107
    108108declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
    109         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     109        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    110110
    111111gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
    112         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     112        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    113113
    114114extension : extension.c @CFA_BINDIR@/@CFA_NAME@
    115         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     115        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    116116
    117117attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
    118         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     118        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    119119
    120120KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
    121         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     121        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    122122
    123123literals : literals.c @CFA_BINDIR@/@CFA_NAME@
    124         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     124        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    125125
    126126sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
    127         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     127        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    128128
    129129gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@

  • src/tests/Makefile.in

    r4f748c5 r6de43b6  
    860860
    861861declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
    862         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     862        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    863863
    864864gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
    865         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     865        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    866866
    867867extension : extension.c @CFA_BINDIR@/@CFA_NAME@
    868         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     868        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    869869
    870870attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
    871         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     871        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    872872
    873873KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
    874         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     874        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    875875
    876876literals : literals.c @CFA_BINDIR@/@CFA_NAME@
    877         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     877        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    878878
    879879sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
    880         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
     880        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    881881
    882882gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
Note: See TracChangeset for help on using the changeset viewer.