Merge branch 'cooking' into diagnostics

Conflicts:
	Makefile
	parser.c
	test.c

diff --cc Makefile
index f6f4a8fa87b9c5224bcd7daa01590f51eee017b7,4444566cd93d7c4417e6ea7fc5085203fe4014d3..d9fe08a0cc31b3bf837d5ee52bc80b8066af8d0c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -228,26 -142,11 +142,12 @@@ install-doc
  # DO NOT DELETE
  
  util.o: gmqcc.h opts.def
- code.o: gmqcc.h opts.def
- ast.o: gmqcc.h opts.def ast.h ir.h
- ir.o: gmqcc.h opts.def ir.h
+ fs.o: gmqcc.h opts.def
  conout.o: gmqcc.h opts.def
- ftepp.o: gmqcc.h opts.def lexer.h
  opts.o: gmqcc.h opts.def
- fs.o: gmqcc.h opts.def
- utf8.o: gmqcc.h opts.def
- correct.o: gmqcc.h opts.def
- stat.o: gmqcc.h opts.def
 +diag.o: gmqcc.h opts.def lexer.h
  pak.o: gmqcc.h opts.def
+ stat.o: gmqcc.h opts.def
  test.o: gmqcc.h opts.def
  main.o: gmqcc.h opts.def lexer.h
  lexer.o: gmqcc.h opts.def lexer.h

diff --cc gmqcc.h
Simple merge

diff --cc include.mk
index 0000000000000000000000000000000000000000,d8ee6fe33d49577dff0cffa71c475005e31bb313..0fa586a9863be7d242d6f6b8a6803a8cee91c1b6
mode 000000,100644..100644
--- /dev/null
--- 2/include.mk
+++ b/include.mk
@@@ -1,0 -1,109 +1,109 @@@
 -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
+ # 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 +=
+ LIBS    += -lm
+ 
+ #objects
++OBJ_C = main.o lexer.o parser.o diag.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.def
Simple merge

diff --cc parser.c
index 2a233a1dae218e8100024724d64a7bd33fbbc4d9,159c7c93dc35185b6a5b73391ff2b5fe75fb410e..7adf0638a9b5d08fa1541e2c2323908680d201c3
--- 1/parser.c
--- 2/parser.c
+++ b/parser.c
@@@ -1967,14 -2065,12 +2082,14 @@@ static bool parse_sya_operand(parser_t 
                      correct_free(&corr);
  
                      if (correct) {
-                         parseerror(parser, "unexpected ident: %s (did you mean %s?)", parser_tokval(parser), correct);
 +                        parser->diagnostic = DIAGNOSTIC_UNEXPECTED_IDENT;
+                         parseerror(parser, "unexpected identifier: %s (did you mean %s?)", parser_tokval(parser), correct);
                          mem_d(correct);
                          return false;
                      }
                  }
-                 parseerror(parser, "unexpected ident: %s", parser_tokval(parser));
 +                parser->diagnostic = DIAGNOSTIC_UNEXPECTED_IDENT;
+                 parseerror(parser, "unexpected identifier: %s", parser_tokval(parser));
                  return false;
              }
          }

diff --cc test.c
Simple merge

diff --cc tests/diag/unexp.tmpl
index 177e2a0ec64730d867d166630f03e1db62a494f5,0000000000000000000000000000000000000000..9166d2489989c0a2eac93ee2e480f070936ef592
mode 100644,000000..100644
--- 1/tests/diag/unexp.tmpl
--- /dev/null
+++ b/tests/diag/unexp.tmpl
@@@ -1,7 -1,0 +1,7 @@@
- M: unexpected ident: c
 +I: unexp.qc
 +D: test diagnostics: unexpected identifier
 +T: -diagnostic
 +C: -std=gmqcc
++M: unexpected identifier: c
 +M:     2:  switch(c) {
 +M:                ^