Changeset 34a6b2e for src

Timestamp:

Sep 25, 2018, 5:33:02 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

9ad5ee1

Parents:

461eed2 (diff), a32346b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• SymTab/Demangle.cc (modified) (1 diff)
• cfa.make (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/Makefile.am

@@ -50 +50 @@
 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
 AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
+ARFLAGS     = cr
 
 demangler_SOURCES = SymTab/demangler.cc

src/Makefile.in

@@ -152 +152 @@
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
-ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -582 +581 @@
 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
+ARFLAGS = cr
 demangler_SOURCES = SymTab/demangler.cc
 demangler_LDADD = libdemangle.a     # yywrap

src/SymTab/Demangle.cc

@@ -392 +392 @@
                                 parsers.emplace_back(Encoding::enum_t, [this](Type::Qualifiers tq) { return parseEnum(tq); });
                                 parsers.emplace_back(Encoding::type, [this](Type::Qualifiers tq) { return parseType(tq); });
-                                parsers.emplace_back(Encoding::zero, [this](Type::Qualifiers tq) { return new ZeroType(tq); });
-                                parsers.emplace_back(Encoding::one, [this](Type::Qualifiers tq) { return new OneType(tq); });
+                                parsers.emplace_back(Encoding::zero, [](Type::Qualifiers tq) { return new ZeroType(tq); });
+                                parsers.emplace_back(Encoding::one, [](Type::Qualifiers tq) { return new OneType(tq); });
                         }
 

src/cfa.make

@@ -6 +6 @@
 am__v_CFA_1 =
 
-.cfa.o: $(CFACC) $(CFACPP)
+.cfa.o:
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
         $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

src/main.cc

@@ -172 +172 @@
                         if ( filename == nullptr ) filename = argv[ optind ];
                         // prelude filename comes in differently
-                        if ( libcfap ) filename = "prelude.cf";
+                        if ( libcfap ) filename = "prelude.cfa";
                         optind += 1;
                 } else {                                                                                // no input file name
@@ -199 +199 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
-                                assertf( prelude, "cannot open prelude.cf\n" );
+                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
+                                assertf( prelude, "cannot open prelude.cfa\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );