--- a/src/luan/modules/lucene/LuceneIndex.java	Tue Feb 12 21:50:26 2019 -0700
+++ b/src/luan/modules/lucene/LuceneIndex.java	Tue Feb 12 22:33:40 2019 -0700
@@ -69,7 +69,6 @@
 import luan.lib.parser.ParseException;
 import luan.modules.Utils;
 import luan.Luan;
-import luan.LuanState;
 import luan.LuanTable;
 import luan.LuanFunction;
 import luan.LuanCloner;
@@ -103,10 +102,10 @@
 	private int writeCount;
 
 	private final ConcurrentMap<String,Map<String,LuanFunction>> indexedOnlyFields = new ConcurrentHashMap<String,Map<String,LuanFunction>>();
-	private final LuanState luanMine = new LuanState();
+	private final Luan luanMine = new Luan();
 	private final LuanCloner cloner = new LuanCloner(LuanCloner.Type.COMPLETE);
 
-	public LuceneIndex(LuanState luan,String indexDirStr,FieldParser defaultFieldParser,String[] defaultFields)
+	public LuceneIndex(Luan luan,String indexDirStr,FieldParser defaultFieldParser,String[] defaultFields)
 		throws LuanException, IOException
 	{
 		mfp = defaultFieldParser==null ? new MultiFieldParser() : new MultiFieldParser(defaultFieldParser,defaultFields);
@@ -167,7 +166,7 @@
 		return new Term(key,br);
 	}
 
-	public void delete(LuanState luan,String queryStr) throws LuanException, IOException, ParseException {
+	public void delete(Luan luan,String queryStr) throws LuanException, IOException, ParseException {
 		Query query = SaneQueryParser.parseQuery(mfp,queryStr);
 
 		boolean commit = !writeLock.isHeldByCurrentThread();
@@ -188,7 +187,7 @@
 		map.put(field,fn);
 	}
 
-	public void save(LuanState luan,LuanTable doc) throws LuanException, IOException {
+	public void save(Luan luan,LuanTable doc) throws LuanException, IOException {
 		Set indexedOnlySet = new HashSet();
 		Object typeObj = doc.get("type");
 		if( typeObj==null )
@@ -231,7 +230,7 @@
 		}
 	}
 
-	public void update_in_transaction(LuanState luan,LuanFunction fn) throws IOException, LuanException {
+	public void update_in_transaction(Luan luan,LuanFunction fn) throws IOException, LuanException {
 		boolean commit = !writeLock.isHeldByCurrentThread();
 		writeLock.lock();
 		try {
@@ -243,7 +242,7 @@
 		}
 	}
 
-	public void run_in_lock(LuanState luan,LuanFunction fn) throws IOException, LuanException {
+	public void run_in_lock(Luan luan,LuanFunction fn) throws IOException, LuanException {
 		if( writeLock.isHeldByCurrentThread() )
 			throw new RuntimeException();
 		writeLock.lock();
@@ -278,7 +277,7 @@
 		}
 	}
 
-	public synchronized long nextId(LuanState luan) throws LuanException, IOException {
+	public synchronized long nextId(Luan luan) throws LuanException, IOException {
 		if( ++id > idLim ) {
 			idLim += idBatch;
 			LuanTable doc = new LuanTable(luan);
@@ -314,7 +313,7 @@
 		return snapshotDeletionPolicy;
 	}
 
-	public Object snapshot(LuanState luan,LuanFunction fn) throws LuanException, IOException {
+	public Object snapshot(Luan luan,LuanFunction fn) throws LuanException, IOException {
 		IndexCommit ic = snapshotDeletionPolicy.snapshot();
 		try {
 			String dir = fileDir.toString();
@@ -357,7 +356,7 @@
 			this.searcher = searcher;
 		}
 
-		@Override public Object call(LuanState luan,Object[] args) throws LuanException {
+		@Override public Object call(Luan luan,Object[] args) throws LuanException {
 			try {
 				return toTable(luan,searcher.doc(docID));
 			} catch(IOException e) {
@@ -403,7 +402,7 @@
 		close(openSearcher());
 	}
 
-	public int advanced_search( final LuanState luan, String queryStr, LuanFunction fn, Integer n, String sortStr ) throws LuanException, IOException, ParseException {
+	public int advanced_search( final Luan luan, String queryStr, LuanFunction fn, Integer n, String sortStr ) throws LuanException, IOException, ParseException {
 		Utils.checkNotNull(queryStr);
 		Query query = SaneQueryParser.parseQuery(mfp,queryStr);
 		IndexSearcher searcher = threadLocalSearcher.get();
@@ -452,7 +451,7 @@
 		}
 	}
 
-	public Object search_in_transaction(LuanState luan,LuanFunction fn) throws LuanException, IOException {
+	public Object search_in_transaction(Luan luan,LuanFunction fn) throws LuanException, IOException {
 		if( threadLocalSearcher.get() != null )
 			throw new LuanException("can't nest search_in_transaction calls");
 		IndexSearcher searcher = openSearcher();
@@ -557,7 +556,7 @@
 		throw new LuanException("invalid field type for "+ifld);
 	}
 
-	private static LuanTable toTable(LuanState luan,Document doc) throws LuanException {
+	private static LuanTable toTable(Luan luan,Document doc) throws LuanException {
 		if( doc==null )
 			return null;
 		LuanTable table = new LuanTable(luan);
@@ -589,7 +588,7 @@
 		}
 	};
 
-	public LuanFunction highlighter(LuanState luan,String queryStr,LuanFunction formatter,final Integer fragmentSize,String dotdotdot) throws ParseException {
+	public LuanFunction highlighter(Luan luan,String queryStr,LuanFunction formatter,final Integer fragmentSize,String dotdotdot) throws ParseException {
 		Query query = SaneQueryParser.parseQuery(mfp,queryStr);
 		Formatter fmt = new Formatter() {
 			public String highlightTerm(String originalText,TokenGroup tokenGroup) {
@@ -609,7 +608,7 @@
 		final Highlighter hl = new Highlighter(fmt,queryScorer);
 		hl.setTextFragmenter( new NullFragmenter() );
 		return new LuanFunction() {
-			@Override public String call(LuanState luan,Object[] args) throws LuanException {
+			@Override public String call(Luan luan,Object[] args) throws LuanException {
 				String text = (String)args[0];
 				try {
 					if( chooser != null ) {