Merge branch 'cooking' into threading

Conflicts:
	Makefile

diff --cc gmqcc.h
Simple merge

diff --cc include.mk
index 0000000000000000000000000000000000000000,d8ee6fe33d49577dff0cffa71c475005e31bb313..f83f3c097cab458a264d76fbaf102bb69eb959ef
mode 000000,100644..100644
--- /dev/null
--- 2/include.mk
+++ b/include.mk
@@@ -1,0 -1,109 +1,109 @@@
 -LIBS    += -lm
+ # default directories and paths
+ DESTDIR :=
+ OPTIONAL:=
+ PREFIX  := /usr/local
+ BINDIR  := $(PREFIX)/bin
+ DATADIR := $(PREFIX)/share
+ MANDIR  := $(DATADIR)/man
+ 
+ # compiler
+ CC      ?= clang
+ 
+ # linker flags and optional additional libraries if required
+ LDFLAGS +=
 -OBJ_C = main.o lexer.o parser.o fs.o stat.o util.o code.o ast.o ir.o conout.o ftepp.o opts.o utf8.o correct.o
++LIBS    += -lm -lpthread
+ 
+ #objects
++OBJ_C = main.o lexer.o parser.o thread.o fs.o stat.o util.o code.o ast.o ir.o conout.o ftepp.o opts.o utf8.o correct.o
+ OBJ_P = util.o fs.o conout.o opts.o pak.o stat.o
+ OBJ_T = test.o util.o conout.o fs.o stat.o
+ OBJ_X = exec-standalone.o util.o conout.o fs.o stat.o
+ 
+ #gource flags
+ GOURCEFLAGS =                 \
+     --date-format "%d %B, %Y" \
+     --seconds-per-day 0.01    \
+     --auto-skip-seconds 1     \
+     --title "GMQCC"           \
+     --key                     \
+     --camera-mode overview    \
+     --highlight-all-users     \
+     --file-idle-time 0        \
+     --hide progress,mouse     \
+     --stop-at-end             \
+     --max-files 99999999999   \
+     --max-file-lag 0.000001   \
+     --bloom-multiplier 1.3    \
+     --logo doc/html/gmqcc.png \
+     -1280x720
+ 
+ #ffmpeg flags for gource
+ FFMPEGFLAGS=                  \
+     -y                        \
+     -r 60                     \
+     -f image2pipe             \
+     -vcodec ppm               \
+     -i -                      \
+     -vcodec libx264           \
+     -preset ultrafast         \
+     -crf 1                    \
+     -threads 0                \
+     -bf 0
+ 
+ #splint flags
+ SPLINTFLAGS =                 \
+     -redef                    \
+     -noeffect                 \
+     -nullderef                \
+     -usedef                   \
+     -type                     \
+     -mustfreeonly             \
+     -nullstate                \
+     -varuse                   \
+     -mustfreefresh            \
+     -compdestroy              \
+     -compmempass              \
+     -nullpass                 \
+     -onlytrans                \
+     -predboolint              \
+     -boolops                  \
+     -incondefs                \
+     -macroredef               \
+     -retvalint                \
+     -nullret                  \
+     -predboolothers           \
+     -globstate                \
+     -dependenttrans           \
+     -branchstate              \
+     -compdef                  \
+     -temptrans                \
+     -usereleased              \
+     -warnposix                \
+     +charindex                \
+     -kepttrans                \
+     -unqualifiedtrans         \
+     +matchanyintegral         \
+     +voidabstract             \
+     -nullassign               \
+     -unrecog                  \
+     -casebreak                \
+     -retvalbool               \
+     -retvalother              \
+     -mayaliasunique           \
+     -realcompare              \
+     -observertrans            \
+     -abstract                 \
+     -statictrans              \
+     -castfcnptr
+     
+ #always the right rule
+ default: all
+ 
+ #uninstall rule
+ uninstall:
+       rm -f $(DESTDIR)$(BINDIR)/gmqcc
+       rm -f $(DESTDIR)$(BINDIR)/qcvm
+       rm -f $(DESTDIR)$(BINDIR)/gmqpak
+       rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqcc.1
+       rm -f $(DESTDIR)$(MANDIR)/man1/doc/qcvm.1
+       rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqpak.1

diff --cc main.c
Simple merge

diff --cc opts.c
Simple merge

diff --cc opts.def
Simple merge

diff --cc parser.c
index 8bf4086cf6b85f6879a8c51afa28361ece84a9e2,c9f093fdc2e2e7d2177ff55e743956607c01ba88..e5dcf4dbac495875c1514818e7c4ff44bc7f9936
--- 1/parser.c
--- 2/parser.c
+++ b/parser.c
@@@ -6519,11 -6631,10 +6711,12 @@@ bool parser_finish(parser_t *parser, co
          }
      }
  
-     generate_checksum(parser);
+     generate_checksum(parser, ir);
+ 
      if (OPTS_OPTION_BOOL(OPTION_DUMP))
          ir_builder_dump(ir, con_out);
 +
 +#if 0
      for (i = 0; i < vec_size(parser->functions); ++i) {
          if (!ir_function_finalize(parser->functions[i]->ir_func)) {
              con_out("failed to finalize function %s\n", parser->functions[i]->name);