Changeset faf8857
- Timestamp:
- Dec 17, 2015, 1:03:33 PM (9 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc
- Children:
- c23f807
- Parents:
- 5e0fa1f
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
configure
r5e0fa1f rfaf8857 2999 2999 cfa_incdir="${cfa_prefix}/include" 3000 3000 else 3001 cfa_incdir=${ $includedir}3001 cfa_incdir=${includedir} 3002 3002 fi 3003 3003 -
configure.ac
r5e0fa1f rfaf8857 41 41 cfa_incdir="${cfa_prefix}/include" 42 42 else 43 cfa_incdir=${ $includedir}43 cfa_incdir=${includedir} 44 44 fi 45 45 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.]) -
src/Makefile.in
r5e0fa1f rfaf8857 413 413 esac; \ 414 414 done; \ 415 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \415 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 416 416 $(am__cd) $(top_srcdir) && \ 417 $(AUTOMAKE) -- gnusrc/Makefile417 $(AUTOMAKE) --foreign src/Makefile 418 418 .PRECIOUS: Makefile 419 419 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/driver/Makefile.in
r5e0fa1f rfaf8857 195 195 esac; \ 196 196 done; \ 197 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/driver/Makefile'; \197 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \ 198 198 $(am__cd) $(top_srcdir) && \ 199 $(AUTOMAKE) -- gnusrc/driver/Makefile199 $(AUTOMAKE) --foreign src/driver/Makefile 200 200 .PRECIOUS: Makefile 201 201 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/examples/Makefile.in
r5e0fa1f rfaf8857 191 191 esac; \ 192 192 done; \ 193 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/examples/Makefile'; \193 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \ 194 194 $(am__cd) $(top_srcdir) && \ 195 $(AUTOMAKE) -- gnusrc/examples/Makefile195 $(AUTOMAKE) --foreign src/examples/Makefile 196 196 .PRECIOUS: Makefile 197 197 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/libcfa/Makefile.in
r5e0fa1f rfaf8857 220 220 esac; \ 221 221 done; \ 222 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/libcfa/Makefile'; \222 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcfa/Makefile'; \ 223 223 $(am__cd) $(top_srcdir) && \ 224 $(AUTOMAKE) -- gnusrc/libcfa/Makefile224 $(AUTOMAKE) --foreign src/libcfa/Makefile 225 225 .PRECIOUS: Makefile 226 226 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/main.cc
r5e0fa1f rfaf8857 10 10 // Created On : Fri May 15 23:12:02 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Dec 17 07:26:03201513 // Update Count : 17 112 // Last Modified On : Thu Dec 17 12:59:06 2015 13 // Update Count : 179 14 14 // 15 15 … … 187 187 // read in the builtins and the prelude 188 188 if ( ! nopreludep ) { // include gcc builtins 189 // -l is for initial build and builtins.cf is not in the lib directory yetso access it here.190 FILE * builtins = fopen( libcfap ? CFA_PREFIX "/src/libcfa" "/builtins.cf" : "libcfa/builtins.cf", "r" );189 // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here. 190 FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" ); 191 191 if ( builtins == NULL ) { 192 192 std::cerr << "Error: can't open builtins" << std::endl; … … 197 197 198 198 if ( ! libcfap ) { 199 // read the prelude in, if we'renot generating the cfa library199 // read the prelude in, if not generating the cfa library 200 200 FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" ); 201 201 if ( prelude == NULL ) { … … 208 208 } // if 209 209 210 if ( libcfap ) { 211 parse( input, LinkageSpec::Intrinsic ); 212 } else { 213 parse( input, LinkageSpec::Cforall, grammarp ); 214 } 210 parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp ); 215 211 216 212 if ( parsep ) {
Note: See TracChangeset
for help on using the changeset viewer.