Changeset 72514aa


Ignore:
Timestamp:
Jan 29, 2019, 5:02:11 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer
Children:
1e7e44f
Parents:
692be4e
Message:

Fixed bad merge on some files

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r692be4e r72514aa  
    153153                dir (BuildDir) {
    154154                        //Append bench results
    155                         sh "${SrcDir}/jenkins.sh ${GitNewRef} ${Architecture} ${BuildDir}/bench.json"
     155                        sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
    156156                }
    157157        }
  • src/Makefile.am

    r692be4e r72514aa  
    2020
    2121SRC = main.cc \
    22       MakeLibCfa.cc \
    23       CompilationState.cc
     22                        MakeLibCfa.cc \
     23                        CompilationState.cc
    2424
    2525MAINTAINERCLEANFILES =
    26 MOSTLYCLEANFILES =
     26MOSTLYCLEANFILES = Parser/gcc-flags.h
    2727
    28 # Is there a way to use a variable for the directory names?
     28Parser/gcc-flags.h :
     29        ${AM_V_GEN}$(CC) -dM -E - < /dev/null | sed 's/define /define __GCC__/' > $(@)
     30
     31Parser/lex.ll : Parser/gcc-flags.h
    2932
    3033include CodeGen/module.mk
     
    5962noinst_LIBRARIES = libdemangle.a
    6063libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.cc \
    61   SynTree/Type.cc \
    62   SynTree/VoidType.cc \
    63   SynTree/BasicType.cc \
    64   SynTree/PointerType.cc \
    65   SynTree/ArrayType.cc \
    66   SynTree/ReferenceType.cc \
    67   SynTree/FunctionType.cc \
    68   SynTree/ReferenceToType.cc \
    69   SynTree/TupleType.cc \
    70   SynTree/TypeofType.cc \
    71   SynTree/AttrType.cc \
    72   SynTree/VarArgsType.cc \
    73   SynTree/ZeroOneType.cc \
    74   SynTree/Constant.cc \
    75   SynTree/Expression.cc \
    76   SynTree/TupleExpr.cc \
    77   SynTree/CommaExpr.cc \
    78   SynTree/TypeExpr.cc \
    79   SynTree/ApplicationExpr.cc \
    80   SynTree/AddressExpr.cc \
    81   SynTree/Statement.cc \
    82   SynTree/CompoundStmt.cc \
    83   SynTree/DeclStmt.cc \
    84   SynTree/Declaration.cc \
    85   SynTree/DeclarationWithType.cc \
    86   SynTree/ObjectDecl.cc \
    87   SynTree/FunctionDecl.cc \
    88   SynTree/AggregateDecl.cc \
    89   SynTree/NamedTypeDecl.cc \
    90   SynTree/TypeDecl.cc \
    91   SynTree/Initializer.cc \
    92   SynTree/TypeSubstitution.cc \
    93   SynTree/Attribute.cc \
    94   SynTree/DeclReplacer.cc \
    95   CompilationState.cc \
    96   CodeGen/CodeGenerator.cc \
    97   CodeGen/FixMain.cc \
    98   CodeGen/GenType.cc \
    99   CodeGen/OperatorTable.cc \
    100   Common/Assert.cc \
    101   Common/Eval.cc \
    102   Common/SemanticError.cc \
    103   Common/UniqueName.cc \
    104   Concurrency/Keywords.cc \
    105   ControlStruct/ForExprMutator.cc \
    106   ControlStruct/LabelFixer.cc \
    107   ControlStruct/LabelGenerator.cc \
    108   ControlStruct/MLEMutator.cc \
    109   ControlStruct/Mutate.cc \
    110   GenPoly/GenPoly.cc \
    111   GenPoly/Lvalue.cc \
    112   InitTweak/GenInit.cc \
    113   InitTweak/InitTweak.cc \
    114   Parser/LinkageSpec.cc \
    115   ResolvExpr/AdjustExprType.cc \
    116   ResolvExpr/Alternative.cc \
    117   ResolvExpr/AlternativeFinder.cc \
    118   ResolvExpr/ExplodedActual.cc \
    119   ResolvExpr/CastCost.cc \
    120   ResolvExpr/CommonType.cc \
    121   ResolvExpr/ConversionCost.cc \
    122   ResolvExpr/CurrentObject.cc \
    123   ResolvExpr/FindOpenVars.cc \
    124   ResolvExpr/Occurs.cc \
    125   ResolvExpr/PolyCost.cc \
    126   ResolvExpr/PtrsAssignable.cc \
    127   ResolvExpr/PtrsCastable.cc \
    128   ResolvExpr/RenameVars.cc \
    129   ResolvExpr/ResolveAssertions.cc \
    130   ResolvExpr/Resolver.cc \
    131   ResolvExpr/ResolveTypeof.cc \
    132   ResolvExpr/SpecCost.cc \
    133   ResolvExpr/TypeEnvironment.cc \
    134   ResolvExpr/Unify.cc \
    135   SymTab/Autogen.cc \
    136   SymTab/FixFunction.cc \
    137   SymTab/Indexer.cc \
    138   SymTab/Mangler.cc \
    139   SymTab/Validate.cc \
    140   Tuples/Explode.cc \
    141   Tuples/TupleAssignment.cc \
    142   Tuples/TupleExpansion.cc \
    143   Validate/HandleAttributes.cc
     64        SynTree/Type.cc \
     65        SynTree/VoidType.cc \
     66        SynTree/BasicType.cc \
     67        SynTree/PointerType.cc \
     68        SynTree/ArrayType.cc \
     69        SynTree/ReferenceType.cc \
     70        SynTree/FunctionType.cc \
     71        SynTree/ReferenceToType.cc \
     72        SynTree/TupleType.cc \
     73        SynTree/TypeofType.cc \
     74        SynTree/AttrType.cc \
     75        SynTree/VarArgsType.cc \
     76        SynTree/ZeroOneType.cc \
     77        SynTree/Constant.cc \
     78        SynTree/Expression.cc \
     79        SynTree/TupleExpr.cc \
     80        SynTree/CommaExpr.cc \
     81        SynTree/TypeExpr.cc \
     82        SynTree/ApplicationExpr.cc \
     83        SynTree/AddressExpr.cc \
     84        SynTree/Statement.cc \
     85        SynTree/CompoundStmt.cc \
     86        SynTree/DeclStmt.cc \
     87        SynTree/Declaration.cc \
     88        SynTree/DeclarationWithType.cc \
     89        SynTree/ObjectDecl.cc \
     90        SynTree/FunctionDecl.cc \
     91        SynTree/AggregateDecl.cc \
     92        SynTree/NamedTypeDecl.cc \
     93        SynTree/TypeDecl.cc \
     94        SynTree/Initializer.cc \
     95        SynTree/TypeSubstitution.cc \
     96        SynTree/Attribute.cc \
     97        SynTree/DeclReplacer.cc \
     98        CompilationState.cc \
     99        CodeGen/CodeGenerator.cc \
     100        CodeGen/FixMain.cc \
     101        CodeGen/GenType.cc \
     102        CodeGen/OperatorTable.cc \
     103        Common/Assert.cc \
     104        Common/Eval.cc \
     105        Common/SemanticError.cc \
     106        Common/UniqueName.cc \
     107        Concurrency/Keywords.cc \
     108        ControlStruct/ForExprMutator.cc \
     109        ControlStruct/LabelFixer.cc \
     110        ControlStruct/LabelGenerator.cc \
     111        ControlStruct/MLEMutator.cc \
     112        ControlStruct/Mutate.cc \
     113        GenPoly/GenPoly.cc \
     114        GenPoly/Lvalue.cc \
     115        InitTweak/GenInit.cc \
     116        InitTweak/InitTweak.cc \
     117        Parser/LinkageSpec.cc \
     118        ResolvExpr/AdjustExprType.cc \
     119        ResolvExpr/Alternative.cc \
     120        ResolvExpr/AlternativeFinder.cc \
     121        ResolvExpr/ExplodedActual.cc \
     122        ResolvExpr/CastCost.cc \
     123        ResolvExpr/CommonType.cc \
     124        ResolvExpr/ConversionCost.cc \
     125        ResolvExpr/CurrentObject.cc \
     126        ResolvExpr/FindOpenVars.cc \
     127        ResolvExpr/Occurs.cc \
     128        ResolvExpr/PolyCost.cc \
     129        ResolvExpr/PtrsAssignable.cc \
     130        ResolvExpr/PtrsCastable.cc \
     131        ResolvExpr/RenameVars.cc \
     132        ResolvExpr/ResolveAssertions.cc \
     133        ResolvExpr/Resolver.cc \
     134        ResolvExpr/ResolveTypeof.cc \
     135        ResolvExpr/SpecCost.cc \
     136        ResolvExpr/TypeEnvironment.cc \
     137        ResolvExpr/Unify.cc \
     138        SymTab/Autogen.cc \
     139        SymTab/FixFunction.cc \
     140        SymTab/Indexer.cc \
     141        SymTab/Mangler.cc \
     142        SymTab/Validate.cc \
     143        Tuples/Explode.cc \
     144        Tuples/TupleAssignment.cc \
     145        Tuples/TupleExpansion.cc \
     146        Validate/HandleAttributes.cc
    144147
    145148MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
  • src/Makefile.in

    r692be4e r72514aa  
    618618        Virtual/ExpandCasts.cc
    619619MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
    620 MOSTLYCLEANFILES = Parser/parser.hh Parser/parser.output
     620MOSTLYCLEANFILES = Parser/gcc-flags.h Parser/lex.cc Parser/parser.cc \
     621        Parser/parser.hh Parser/parser.output
    621622BUILT_SOURCES = Parser/parser.hh
    622623AM_YFLAGS = -d -t -v
    623 
    624 # Is there a way to use a variable for the directory names?
    625624
    626625# put into lib for now
     
    635634noinst_LIBRARIES = libdemangle.a
    636635libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.cc \
    637   SynTree/Type.cc \
    638   SynTree/VoidType.cc \
    639   SynTree/BasicType.cc \
    640   SynTree/PointerType.cc \
    641   SynTree/ArrayType.cc \
    642   SynTree/ReferenceType.cc \
    643   SynTree/FunctionType.cc \
    644   SynTree/ReferenceToType.cc \
    645   SynTree/TupleType.cc \
    646   SynTree/TypeofType.cc \
    647   SynTree/AttrType.cc \
    648   SynTree/VarArgsType.cc \
    649   SynTree/ZeroOneType.cc \
    650   SynTree/Constant.cc \
    651   SynTree/Expression.cc \
    652   SynTree/TupleExpr.cc \
    653   SynTree/CommaExpr.cc \
    654   SynTree/TypeExpr.cc \
    655   SynTree/ApplicationExpr.cc \
    656   SynTree/AddressExpr.cc \
    657   SynTree/Statement.cc \
    658   SynTree/CompoundStmt.cc \
    659   SynTree/DeclStmt.cc \
    660   SynTree/Declaration.cc \
    661   SynTree/DeclarationWithType.cc \
    662   SynTree/ObjectDecl.cc \
    663   SynTree/FunctionDecl.cc \
    664   SynTree/AggregateDecl.cc \
    665   SynTree/NamedTypeDecl.cc \
    666   SynTree/TypeDecl.cc \
    667   SynTree/Initializer.cc \
    668   SynTree/TypeSubstitution.cc \
    669   SynTree/Attribute.cc \
    670   SynTree/DeclReplacer.cc \
    671   CompilationState.cc \
    672   CodeGen/CodeGenerator.cc \
    673   CodeGen/FixMain.cc \
    674   CodeGen/GenType.cc \
    675   CodeGen/OperatorTable.cc \
    676   Common/Assert.cc \
    677   Common/Eval.cc \
    678   Common/SemanticError.cc \
    679   Common/UniqueName.cc \
    680   Concurrency/Keywords.cc \
    681   ControlStruct/ForExprMutator.cc \
    682   ControlStruct/LabelFixer.cc \
    683   ControlStruct/LabelGenerator.cc \
    684   ControlStruct/MLEMutator.cc \
    685   ControlStruct/Mutate.cc \
    686   GenPoly/GenPoly.cc \
    687   GenPoly/Lvalue.cc \
    688   InitTweak/GenInit.cc \
    689   InitTweak/InitTweak.cc \
    690   Parser/LinkageSpec.cc \
    691   ResolvExpr/AdjustExprType.cc \
    692   ResolvExpr/Alternative.cc \
    693   ResolvExpr/AlternativeFinder.cc \
    694   ResolvExpr/ExplodedActual.cc \
    695   ResolvExpr/CastCost.cc \
    696   ResolvExpr/CommonType.cc \
    697   ResolvExpr/ConversionCost.cc \
    698   ResolvExpr/CurrentObject.cc \
    699   ResolvExpr/FindOpenVars.cc \
    700   ResolvExpr/Occurs.cc \
    701   ResolvExpr/PolyCost.cc \
    702   ResolvExpr/PtrsAssignable.cc \
    703   ResolvExpr/PtrsCastable.cc \
    704   ResolvExpr/RenameVars.cc \
    705   ResolvExpr/ResolveAssertions.cc \
    706   ResolvExpr/Resolver.cc \
    707   ResolvExpr/ResolveTypeof.cc \
    708   ResolvExpr/SpecCost.cc \
    709   ResolvExpr/TypeEnvironment.cc \
    710   ResolvExpr/Unify.cc \
    711   SymTab/Autogen.cc \
    712   SymTab/FixFunction.cc \
    713   SymTab/Indexer.cc \
    714   SymTab/Mangler.cc \
    715   SymTab/Validate.cc \
    716   Tuples/Explode.cc \
    717   Tuples/TupleAssignment.cc \
    718   Tuples/TupleExpansion.cc \
    719   Validate/HandleAttributes.cc
     636        SynTree/Type.cc \
     637        SynTree/VoidType.cc \
     638        SynTree/BasicType.cc \
     639        SynTree/PointerType.cc \
     640        SynTree/ArrayType.cc \
     641        SynTree/ReferenceType.cc \
     642        SynTree/FunctionType.cc \
     643        SynTree/ReferenceToType.cc \
     644        SynTree/TupleType.cc \
     645        SynTree/TypeofType.cc \
     646        SynTree/AttrType.cc \
     647        SynTree/VarArgsType.cc \
     648        SynTree/ZeroOneType.cc \
     649        SynTree/Constant.cc \
     650        SynTree/Expression.cc \
     651        SynTree/TupleExpr.cc \
     652        SynTree/CommaExpr.cc \
     653        SynTree/TypeExpr.cc \
     654        SynTree/ApplicationExpr.cc \
     655        SynTree/AddressExpr.cc \
     656        SynTree/Statement.cc \
     657        SynTree/CompoundStmt.cc \
     658        SynTree/DeclStmt.cc \
     659        SynTree/Declaration.cc \
     660        SynTree/DeclarationWithType.cc \
     661        SynTree/ObjectDecl.cc \
     662        SynTree/FunctionDecl.cc \
     663        SynTree/AggregateDecl.cc \
     664        SynTree/NamedTypeDecl.cc \
     665        SynTree/TypeDecl.cc \
     666        SynTree/Initializer.cc \
     667        SynTree/TypeSubstitution.cc \
     668        SynTree/Attribute.cc \
     669        SynTree/DeclReplacer.cc \
     670        CompilationState.cc \
     671        CodeGen/CodeGenerator.cc \
     672        CodeGen/FixMain.cc \
     673        CodeGen/GenType.cc \
     674        CodeGen/OperatorTable.cc \
     675        Common/Assert.cc \
     676        Common/Eval.cc \
     677        Common/SemanticError.cc \
     678        Common/UniqueName.cc \
     679        Concurrency/Keywords.cc \
     680        ControlStruct/ForExprMutator.cc \
     681        ControlStruct/LabelFixer.cc \
     682        ControlStruct/LabelGenerator.cc \
     683        ControlStruct/MLEMutator.cc \
     684        ControlStruct/Mutate.cc \
     685        GenPoly/GenPoly.cc \
     686        GenPoly/Lvalue.cc \
     687        InitTweak/GenInit.cc \
     688        InitTweak/InitTweak.cc \
     689        Parser/LinkageSpec.cc \
     690        ResolvExpr/AdjustExprType.cc \
     691        ResolvExpr/Alternative.cc \
     692        ResolvExpr/AlternativeFinder.cc \
     693        ResolvExpr/ExplodedActual.cc \
     694        ResolvExpr/CastCost.cc \
     695        ResolvExpr/CommonType.cc \
     696        ResolvExpr/ConversionCost.cc \
     697        ResolvExpr/CurrentObject.cc \
     698        ResolvExpr/FindOpenVars.cc \
     699        ResolvExpr/Occurs.cc \
     700        ResolvExpr/PolyCost.cc \
     701        ResolvExpr/PtrsAssignable.cc \
     702        ResolvExpr/PtrsCastable.cc \
     703        ResolvExpr/RenameVars.cc \
     704        ResolvExpr/ResolveAssertions.cc \
     705        ResolvExpr/Resolver.cc \
     706        ResolvExpr/ResolveTypeof.cc \
     707        ResolvExpr/SpecCost.cc \
     708        ResolvExpr/TypeEnvironment.cc \
     709        ResolvExpr/Unify.cc \
     710        SymTab/Autogen.cc \
     711        SymTab/FixFunction.cc \
     712        SymTab/Indexer.cc \
     713        SymTab/Mangler.cc \
     714        SymTab/Validate.cc \
     715        Tuples/Explode.cc \
     716        Tuples/TupleAssignment.cc \
     717        Tuples/TupleExpansion.cc \
     718        Validate/HandleAttributes.cc
    720719
    721720all: $(BUILT_SOURCES)
     
    15591558
    15601559
     1560Parser/gcc-flags.h :
     1561        ${AM_V_GEN}$(CC) -dM -E - < /dev/null | sed 's/define /define __GCC__/' > $(@)
     1562
     1563Parser/lex.ll : Parser/gcc-flags.h
     1564
    15611565# Tell versions [3.59,3.63) of GNU make to not export all variables.
    15621566# Otherwise a system limit (for SysV at least) may be exceeded.
  • src/Parser/module.mk

    r692be4e r72514aa  
    3131       Parser/parserutility.cc
    3232
    33 MOSTLYCLEANFILES += Parser/parser.hh Parser/parser.output
     33MOSTLYCLEANFILES += Parser/lex.cc Parser/parser.cc Parser/parser.hh Parser/parser.output
Note: See TracChangeset for help on using the changeset viewer.