Permalink
Browse files

Merge branch 'symtab'

  • Loading branch information...
2 parents 6bc121b + 7496b45 commit 6cd45f7bb8abaed204628ec8566fa1690b84bf97 @wpwrak wpwrak committed Jan 14, 2012
Showing with 1,742 additions and 1,395 deletions.
  1. +8 −7 patches/Unchained - A Matter Of Taste (Remix).fnp
  2. +3 −2 src/Makefile
  3. +12 −6 src/compiler/Makefile
  4. +39 −236 src/compiler/compiler.c
  5. +2 −3 src/compiler/compiler.h
  6. +158 −238 src/compiler/fnp.ids
  7. +15 −7 src/compiler/idgen
  8. +269 −203 src/compiler/parser.y
  9. +91 −37 src/compiler/parser_helper.c
  10. +15 −8 src/compiler/parser_helper.h
  11. +11 −3 src/compiler/parser_itf.h
  12. +7 −3 src/compiler/ptest/Makefile
  13. +78 −27 src/compiler/ptest/ptest.c
  14. +4 −4 src/compiler/scanner.h
  15. +10 −6 src/compiler/scanner.re
  16. +158 −0 src/compiler/symtab.c
  17. +44 −0 src/compiler/symtab.h
  18. +6 −1 src/compiler/test/Common
  19. +73 −0 src/compiler/test/Patches
  20. +15 −15 src/compiler/test/arith
  21. +2 −2 src/compiler/test/codegen
  22. +47 −47 src/compiler/test/comment
  23. +12 −12 src/compiler/test/cond
  24. +34 −0 src/compiler/test/dualuse
  25. +51 −0 src/compiler/test/eqnum
  26. +11 −11 src/compiler/test/error
  27. +18 −18 src/compiler/test/fcond
  28. +53 −53 src/compiler/test/fold
  29. +3 −3 src/compiler/test/image
  30. +48 −0 src/compiler/test/initial
  31. +43 −43 src/compiler/test/location
  32. +39 −29 src/compiler/test/not
  33. +32 −0 src/compiler/test/nsyms
  34. +18 −18 src/compiler/test/number
  35. +7 −68 src/compiler/test/patches
  36. +42 −42 src/compiler/test/prec
  37. +56 −56 src/compiler/test/relop
  38. +19 −9 src/compiler/test/sections
  39. +23 −23 src/compiler/test/wrap
  40. +79 −0 src/compiler/test/wsection
  41. +77 −0 src/compiler/test/wundef
  42. +0 −135 src/compiler/unique.c
  43. +0 −18 src/compiler/unique.h
  44. +3 −1 src/gui/monitor.c
  45. +2 −0 src/renderer/eval.c
  46. +1 −0 src/renderer/framedescriptor.h
  47. +4 −1 src/renderer/sampler.c
@@ -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);
View
@@ -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
View
@@ -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 ---------------------------------------------------------------
Oops, something went wrong.

0 comments on commit 6cd45f7

Please sign in to comment.