Merge remote-tracking branch 'up/master' into p2

and fixup removed Num class

.gitignore

@@ -55,8 +55,8 @@
 /doc/ref
 /doc/html
 /doc/latex
-/README.md
 /doc/footer.inc
+/README.md
 /tools/bisect*.sh
 /lib32
 /web

config.mak

@@ -142,7 +142,7 @@ ifneq ($(shell ./tools/config.sh "${CC}" icc),0)
 	ICC = 1
         #DEFINES += -DCGOTO
 	DEBUGFLAGS += -falign-functions=16
-# 177: label "l414" was declared but never referenced in syntax-p5.c sets fail case
+# 177: label "l414" was declared but never referenced in syntax.c sets fail case
 # 186: pointless comparison of unsigned integer with zero in PN_TYPECHECK
 # 188: enumerated type mixed with another type (treating P->flags as int)
 	WARNINGS += -Wno-sign-compare -Wno-pointer-arith -diag-remark 177,186,188

core/objmodel.c

@@ -683,7 +683,7 @@ void potion_lobby_init(Potion *P) {
   potion_init_class_reference(P, potion_str(P, "Lick"),         PN_VTABLE(PN_TLICK));
   potion_init_class_reference(P, potion_str(P, "Error"),        PN_VTABLE(PN_TERROR));
   potion_init_class_reference(P, potion_str(P, "Continuation"), PN_VTABLE(PN_TCONT));
-#if defined(P2)
+#ifdef P2
   potion_init_class_reference(P, potion_str(P, "Num"),          PN_VTABLE(PN_TDECIMAL));
 #endif