- Timestamp:
- Jun 2, 2015, 2:28:24 PM (10 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:
- 954463b8
- Parents:
- d939274 (diff), c3a4385 (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. - Location:
- src
- Files:
-
- 13 edited
- 9 moved
-
ArgTweak/module.mk (modified) (1 diff)
-
CodeGen/module.mk (modified) (1 diff)
-
Common/module.mk (modified) (1 diff)
-
ControlStruct/module.mk (modified) (1 diff)
-
Designators/module.mk (modified) (1 diff)
-
GenPoly/module.mk (modified) (1 diff)
-
InitTweak/module.mk (modified) (1 diff)
-
Makefile.in (modified) (1 diff)
-
ResolvExpr/module.mk (modified) (1 diff)
-
SymTab/module.mk (modified) (1 diff)
-
SynTree/module.mk (modified) (1 diff)
-
Tuples/module.mk (modified) (1 diff)
-
driver/Makefile.am (moved) (moved from driver/Makefile.am )
-
driver/Makefile.in (moved) (moved from driver/Makefile.in ) (2 diffs)
-
driver/cc1.cc (moved) (moved from driver/cc1.cc )
-
driver/cfa.cc (moved) (moved from driver/cfa.cc )
-
examples/sum.c (modified) (2 diffs)
-
libcfa/Makefile.am (moved) (moved from libcfa/Makefile.am )
-
libcfa/Makefile.in (moved) (moved from libcfa/Makefile.in ) (2 diffs)
-
libcfa/builtins.cf (moved) (moved from libcfa/builtins.cf )
-
libcfa/prelude.cf (moved) (moved from libcfa/prelude.cf )
-
libcfa/ptrdiff_t.c (moved) (moved from libcfa/ptrdiff_t.c )
Legend:
- Unmodified
- Added
- Removed
-
src/ArgTweak/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:50:11 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 #SRC += ArgTweak/Rewriter.cc \ 2 18 # ArgTweak/Mutate.cc -
src/CodeGen/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:50:52 2015 14 ## Update Count : 2 15 ############################################################################### 16 17 #SRC += ArgTweak/Rewriter.cc \ 18 # ArgTweak/Mutate.cc 19 1 20 SRC += CodeGen/Generate.cc \ 2 21 CodeGen/CodeGenerator.cc \ -
src/Common/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:51:23 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += Common/SemanticError.cc \ 2 18 Common/UniqueName.cc -
src/ControlStruct/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:51:45 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += ControlStruct/LabelGenerator.cc \ 2 18 ControlStruct/LabelFixer.cc \ -
src/Designators/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:52:06 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += Designators/Processor.cc -
src/GenPoly/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:52:30 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += GenPoly/Box.cc \ 2 18 GenPoly/GenPoly.cc \ -
src/InitTweak/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:52:49 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += InitTweak/InitModel.cc \ 2 18 InitTweak/InitExpander.cc \ -
src/Makefile.in
rd939274 r4eb1db6 17 17 18 18 ######################## -*- Mode: Makefile-Automake -*- ###################### 19 ############################################################################### 20 21 ######################### -*- Mode: Makefile-Gmake -*- ######################## 22 ############################################################################### 23 24 ######################### -*- Mode: Makefile-Gmake -*- ######################## 25 ############################################################################### 26 27 #SRC += ArgTweak/Rewriter.cc \ 28 # ArgTweak/Mutate.cc 29 30 ######################### -*- Mode: Makefile-Gmake -*- ######################## 31 ############################################################################### 32 33 ######################### -*- Mode: Makefile-Gmake -*- ######################## 34 ############################################################################### 35 36 ######################### -*- Mode: Makefile-Gmake -*- ######################## 37 ############################################################################### 38 39 ######################### -*- Mode: Makefile-Gmake -*- ######################## 40 ############################################################################### 41 42 ######################### -*- Mode: Makefile-Gmake -*- ######################## 43 ############################################################################### 44 45 ######################### -*- Mode: Makefile-Gmake -*- ######################## 46 ############################################################################### 47 48 ######################### -*- Mode: Makefile-Gmake -*- ######################## 49 ############################################################################### 50 51 ######################### -*- Mode: Makefile-Gmake -*- ######################## 52 ############################################################################### 53 54 ######################### -*- Mode: Makefile-Gmake -*- ######################## 19 55 ############################################################################### 20 56 -
src/ResolvExpr/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:53:28 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += ResolvExpr/AlternativeFinder.cc \ 2 18 ResolvExpr/Alternative.cc \ -
src/SymTab/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:53:50 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += SymTab/IdTable.cc \ 2 18 SymTab/Indexer.cc \ -
src/SynTree/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:54:09 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += SynTree/Type.cc \ 2 18 SynTree/VoidType.cc \ -
src/Tuples/module.mk
rd939274 r4eb1db6 1 ######################### -*- Mode: Makefile-Gmake -*- ######################## 2 ## 3 ## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo 4 ## 5 ## The contents of this file are covered under the licence agreement in the 6 ## file "LICENCE" distributed with Cforall. 7 ## 8 ## module.mk -- 9 ## 10 ## Author : Richard C. Bilson 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 1 17:54:33 2015 14 ## Update Count : 1 15 ############################################################################### 16 1 17 SRC += Tuples/Mutate.cc \ 2 18 Tuples/AssignExpand.cc \ -
src/driver/Makefile.in
rd939274 r4eb1db6 38 38 bin_PROGRAMS = cfa$(EXEEXT) 39 39 cc1lib_PROGRAMS = cc1$(EXEEXT) 40 subdir = driver40 subdir = src/driver 41 41 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 42 42 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 195 195 esac; \ 196 196 done; \ 197 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu driver/Makefile'; \197 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/driver/Makefile'; \ 198 198 $(am__cd) $(top_srcdir) && \ 199 $(AUTOMAKE) --gnu driver/Makefile199 $(AUTOMAKE) --gnu src/driver/Makefile 200 200 .PRECIOUS: Makefile 201 201 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
src/examples/sum.c
rd939274 r4eb1db6 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Wed May 27 18:43:46201513 // Update Count : 412 // Last Modified On : Mon Jun 1 20:46:35 2015 13 // Update Count : 18 14 14 // 15 15 … … 42 42 43 43 int main() { 44 const int size = 10, low = 0, High = 10;45 int si = 0, ai[ 10]; // size46 int i;47 for ( i = low; i < High; i+= 1 ) {48 si += i;49 ai[i] = i;44 const int low = 5, High = 15, size = High - low; 45 int si = 0, ai[size]; 46 int v = low; 47 for ( int i = 0; i < size; i += 1, v += 1 ) { 48 si += v; 49 ai[i] = v; 50 50 } 51 51 printf( "sum from %d to %d is %d, check %d\n", 52 52 low, High, sum( size, ai ), si ); 53 53 54 // char ci[ 10];54 // char ci[size]; 55 55 // char c = sum( size, ci ); 56 // float fi[ 10];56 // float fi[size]; 57 57 // float f = sum( size, fi ); 58 58 59 double sd = 0.0, ad[ 10]; // size60 for ( i = low; i < High; i += 1 ) {61 double d = i / (double)size;62 sd += d;63 ad[i] = d;59 double sd = 0.0, ad[size]; 60 double v = low / 10.0; 61 for ( int i = 0; i < size; i += 1, v += 0.1 ) { 62 sd += v; 63 ad[i] = v; 64 64 } 65 65 printf( "sum from %g to %g is %g, check %g\n", 66 low / (double)size, High / (double)size, sum( size, ad ), sd );66 low / 10.0, High / 10.0, sum( size, ad ), sd ); 67 67 } 68 68 -
src/libcfa/Makefile.in
rd939274 r4eb1db6 37 37 PRE_UNINSTALL = : 38 38 POST_UNINSTALL = : 39 subdir = libcfa39 subdir = src/libcfa 40 40 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 41 41 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 219 219 esac; \ 220 220 done; \ 221 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libcfa/Makefile'; \221 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcfa/Makefile'; \ 222 222 $(am__cd) $(top_srcdir) && \ 223 $(AUTOMAKE) --gnu libcfa/Makefile223 $(AUTOMAKE) --gnu src/libcfa/Makefile 224 224 .PRECIOUS: Makefile 225 225 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note:
See TracChangeset
for help on using the changeset viewer.
