From 1da2103504b746e805aa40c96b531415f286be4c Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Thu, 25 Apr 1991 16:47:47 +0000
Subject: [PATCH] Delinted a bit

---
 lang/m2/comp/LLlex.c    | 1 -
 lang/m2/comp/chk_expr.c | 4 +++-
 lang/m2/comp/type.c     | 2 +-
 lang/m2/comp/walk.c     | 8 +++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lang/m2/comp/LLlex.c b/lang/m2/comp/LLlex.c
index ef24d7846..e047bd776 100644
--- a/lang/m2/comp/LLlex.c
+++ b/lang/m2/comp/LLlex.c
@@ -29,7 +29,6 @@
 #include	"type.h"
 #include	"warning.h"
 
-extern long str2long();
 extern char *getwdir();
 
 t_token		dot,
diff --git a/lang/m2/comp/chk_expr.c b/lang/m2/comp/chk_expr.c
index 8fa31e000..aca253b7c 100644
--- a/lang/m2/comp/chk_expr.c
+++ b/lang/m2/comp/chk_expr.c
@@ -86,6 +86,7 @@ MkCoercion(pnd, tp)
 				break;
 			default:
 				crash("MkCoercion");
+				/*NOTREACHED*/
 			}
 			if (flt_status == FLT_OVFL) {
 				wmess = "conversion";
@@ -912,7 +913,8 @@ ChkBinOper(expp)
 
 	/* First, check BOTH operands */
 
-	retval = ChkExpression(&(exp->nd_LEFT)) & ChkExpression(&(exp->nd_RIGHT));
+	retval = ChkExpression(&(exp->nd_LEFT));
+	retval &= ChkExpression(&(exp->nd_RIGHT));
 
 	tpl = BaseType(exp->nd_LEFT->nd_type);
 	tpr = BaseType(exp->nd_RIGHT->nd_type);
diff --git a/lang/m2/comp/type.c b/lang/m2/comp/type.c
index cb806b87f..715cbefa0 100644
--- a/lang/m2/comp/type.c
+++ b/lang/m2/comp/type.c
@@ -719,7 +719,7 @@ ForceForwardTypeDef(df)
 		node_error(nd, "\"%s\" is not a type", df1->df_idf->id_text);
 	}
 	while (df1 && df1->df_kind == D_FORWTYPE) {
-		t_def *df2 = df1->df_forw_def;
+		df2 = df1->df_forw_def;
 		df1->df_type = df->df_type;
 		SolveForwardTypeRefs(df1);
 		free_def(df1);
diff --git a/lang/m2/comp/walk.c b/lang/m2/comp/walk.c
index b7fe1cd60..31f844e03 100644
--- a/lang/m2/comp/walk.c
+++ b/lang/m2/comp/walk.c
@@ -901,10 +901,12 @@ DoForInit(nd)
 	register t_def *df;
 	t_type *base_tp;
 	t_type *tpl, *tpr;
+	int r;
 
-	if (!( ChkVariable(&(nd->nd_LEFT), D_USED|D_DEFINED) &
-	       ChkExpression(&(right->nd_LEFT)) &
-	       ChkExpression(&(right->nd_RIGHT)))) return 0;
+	r = ChkVariable(&(nd->nd_LEFT), D_USED|D_DEFINED);
+	r &= ChkExpression(&(right->nd_LEFT));
+	r &= ChkExpression(&(right->nd_RIGHT));
+	if (!r) return 0;
 
 	df = nd->nd_LEFT->nd_def;
 	if (df->df_kind == D_FIELD) {
-- 
2.34.1