Merge RP1A.200303.001

Change-Id: I13dc2b0af77aada2f4332eeea39f3f76f3e6e754
diff --git a/lex.c b/lex.c
index 1c23212..81d1cc2 100644
--- a/lex.c
+++ b/lex.c
@@ -30,7 +30,7 @@
 #include "ytab.h"
 
 extern YYSTYPE	yylval;
-extern int	infunc;
+extern bool	infunc;
 
 int	lineno	= 1;
 int	bracecnt = 0;
diff --git a/makefile b/makefile
index 735436c..95aee3e 100644
--- a/makefile
+++ b/makefile
@@ -22,6 +22,7 @@
 # THIS SOFTWARE.
 # ****************************************************************/
 
+CFLAGS = -fsanitize=address -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
 CFLAGS = -g
 CFLAGS =
 CFLAGS = -O2