Merge branch 'symtab'

m-labs · Jan 14, 2012 · 6cd45f7 · 6cd45f7
2 parents 6bc121b + 7496b45
commit 6cd45f7
Show file tree

Hide file tree

Showing 47 changed files with 1,742 additions and 1,395 deletions.
diff --git a/patches/Unchained - A Matter Of Taste (Remix).fnp b/patches/Unchained - A Matter Of Taste (Remix).fnp
@@ -38,16 +38,17 @@ ib_r=0.250000
 ib_g=0.250000
 ib_b=0.250000
 ib_a=0.000000
-per_frame=pulse=above(bass,0.7)//if(above(abs(pulse),9.42),-9.42,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.01);
-per_frame=q1=mid_residual;
-per_frame=q2=bass_residual;
-per_frame=q3=treb_residual;
+per_frame=pulse=above(bass,0.7);
+//if(above(abs(pulse),9.42),-9.42,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.01);
+//per_frame=q1=mid_residual;
+//per_frame=q2=bass_residual;
+//per_frame=q3=treb_residual;
 per_frame=q4=sin(pulse);
 per_frame=q5=cos(pulse);
 per_frame=wave_mystery=-.2+.2*q4;
-per_frame=wave_r=wave_r+.5*bass_residual;
-per_frame=wave_r=wave_g+.5*mid_residual;
-per_frame=wave_r=wave_b+.5*treb_residual;
+//per_frame=wave_r=wave_r+.5*bass_residual;
+//per_frame=wave_r=wave_g+.5*mid_residual;
+//per_frame=wave_r=wave_b+.5*treb_residual;
 per_frame=zoom=zoom-.0035*q1;
 per_frame=decay=decay+.003*sin(pulse);
 per_vertex=anti_rad=(1-rad);

diff --git a/src/Makefile b/src/Makefile
@@ -34,6 +34,7 @@ endif
 
 CFLAGS = -O9 -Wall -Wstrict-prototypes -Wmissing-prototypes \
 	 -Wold-style-declaration -Wold-style-definition \
+	 -Wno-char-subscripts \
 	 -mbarrel-shift-enabled -mmultiply-enabled \
 	 -mdivide-enabled -msign-extend-enabled -fsingle-precision-constant \
 	 -I$(RTEMS_MAKEFILE_PATH)/lib/include -g
@@ -63,7 +64,7 @@ OBJS += $(addprefix renderer/,framedescriptor.o analyzer.o sampler.o \
 	eval.o line.o wave.o font.o osd.o raster.o renderer.o \
 	videoinreconf.o)
 OBJS += $(addprefix compiler/,compiler.o parser_helper.o scanner.o \
-	parser.o unique.o)
+	parser.o symtab.o)
 
 POBJS=$(addprefix $(OBJDIR)/,$(OBJS))
 
@@ -99,7 +100,7 @@ compiler/infra-fnp.h: \
 compiler/parser.h: compiler/parser.c
 obj/compiler/scanner.o: compiler/parser.h
 obj/compiler/parser_helper.o: compiler/parser.h
-obj/compiler/unique.o: compiler/fnp.inc
+obj/compiler/symtab.o: compiler/fnp.inc
 obj/compiler/compiler.o: compiler/infra-fnp.h compiler/parser.h
 
 # boot images for Milkymist One

diff --git a/src/compiler/Makefile b/src/compiler/Makefile
@@ -7,18 +7,24 @@ all:
 # ----- Tests -----------------------------------------------------------------
 
 test tests:     all
-		LANG= sh -c \
-		    'passed=0 && cd test && \
-		    for n in [a-z]*; do \
-		    [ $$n != core ] && SCRIPT=$$n . ./$$n; done; \
-		    echo "Passed all $$passed tests"'
+		LANG= sh -c						\
+		    'passed=0 && failed=0 && cd test &&			\
+		    for n in [a-z]*; do					\
+		    [ $$n != core ] && SCRIPT=$$n . ./$$n; done;	\
+		    if [ $$failed = 0 ]; then				\
+		        echo "Passed all $$passed tests";		\
+		    else						\
+			total=`expr $$passed + $$failed`;		\
+		        echo "Failed $$failed/$$total tests";		\
+			exit 1;						\
+		    fi'
 
 valgrind:
 		VALGRIND="valgrind -q" $(MAKE) tests
 
 leak leaks:
 		VALGRIND="valgrind -q --leak-check=full --show-reachable=yes" \
-		    $(MAKE) tests
+		    FAIL_ON_ERROR=false $(MAKE) tests
 
 # ----- Cleanup ---------------------------------------------------------------