diff src/luan/modules/StringLuan.java @ 1563:8fbcc4747091

remove LuanFunction.luan
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 09 Nov 2020 01:37:57 -0700
parents b89212fd04b5
children f7e2df85fc0a
line wrap: on
line diff
--- a/src/luan/modules/StringLuan.java	Sun Nov 08 16:50:59 2020 -0700
+++ b/src/luan/modules/StringLuan.java	Mon Nov 09 01:37:57 2020 -0700
@@ -129,8 +129,8 @@
 		Utils.checkNotNull(s);
 		Utils.checkNotNull(pattern,2);
 		final Matcher m = Pattern.compile(pattern).matcher(s);
-		return new LuanFunction(false) {
-			@Override public Object call(Object[] args) {
+		return new LuanFunction() {
+			@Override public Object call(Luan luan,Object[] args) {
 				if( !m.find() )
 					return null;
 				final int n = m.groupCount();
@@ -168,7 +168,7 @@
 				String match = m.groupCount()==0 ? m.group() : m.group(1);
 				Object val = t.get(luan,match);
 				if( val != null ) {
-					String replacement = Luan.luanToString(val);
+					String replacement = luan.luanToString(val);
 					m.appendReplacement(sb,replacement);
 				}
 				i++;
@@ -191,9 +191,9 @@
 						args[j] = m.group(j+1);
 					}
 				}
-				Object val = Luan.first( fn.call(args) );
+				Object val = Luan.first( fn.call(luan,args) );
 				if( val != null ) {
-					String replacement = Luan.luanToString(val);
+					String replacement = luan.luanToString(val);
 					m.appendReplacement(sb,replacement);
 				}
 				i++;