From 8a87b3f1ffe54df5b53cca9ae2d02250031c0afe Mon Sep 17 00:00:00 2001
From: Quentin Carbonneaux <quentin.carbonneaux@yale.edu>
Date: Fri, 4 Mar 2016 15:44:50 -0500
Subject: make bshas() inline

---
 lisc/lisc.h | 8 +++++++-
 lisc/util.c | 7 -------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lisc/lisc.h b/lisc/lisc.h
index 813f9b2..12ea1ea 100644
--- a/lisc/lisc.h
+++ b/lisc/lisc.h
@@ -482,7 +482,6 @@ void dumpts(BSet *, Tmp *, FILE *);
 void bsinit(BSet *, uint);
 void bszero(BSet *);
 uint bscount(BSet *);
-int bshas(BSet *, uint);
 void bsset(BSet *, uint);
 void bsclr(BSet *, uint);
 void bscopy(BSet *, BSet *);
@@ -492,6 +491,13 @@ void bsdiff(BSet *, BSet *);
 int bsequal(BSet *, BSet *);
 int bsiter(BSet *, uint *);
 
+static inline int
+bshas(BSet *bs, uint elt)
+{
+	assert(elt < bs->nt * NBit);
+	return (bs->t[elt/NBit] & BIT(elt%NBit)) != 0;
+}
+
 /* parse.c */
 extern OpDesc opdesc[NOp];
 void parse(FILE *, char *, void (Dat *), void (Fn *));
diff --git a/lisc/util.c b/lisc/util.c
index cccbcf6..fc9884a 100644
--- a/lisc/util.c
+++ b/lisc/util.c
@@ -245,13 +245,6 @@ bsmax(BSet *bs)
 	return bs->nt * NBit;
 }
 
-int
-bshas(BSet *bs, uint elt)
-{
-	assert(elt < bsmax(bs));
-	return (bs->t[elt/NBit] & BIT(elt%NBit)) != 0;
-}
-
 void
 bsset(BSet *bs, uint elt)
 {
-- 
cgit 1.4.1