@@ -21,7 +21,6 @@ fun <T> AbstractInterpreter<T>.dataFrame(
21
21
fun <T > AbstractInterpreter<T>.varargString (
22
22
name : ArgumentName ? = null,
23
23
defaultValue : DefaultValue <List <String >> = Absent
24
- ): ExpectedArgumentProvider <List <String >> = arg(name, lens = Interpreter .Value , defaultValue = defaultValue)
25
24
26
25
fun <T > AbstractInterpreter <T >.renameClause(
27
26
name: ArgumentName ? = null
@@ -38,40 +37,40 @@ fun <T> AbstractInterpreter<T>.type(
38
37
fun <T , E : Enum <E >> AbstractInterpreter <T >.enum(
39
38
name: ArgumentName ? = null,
40
39
defaultValue: DefaultValue <E > = Absent
41
- ): ExpectedArgumentProvider <E > = argConvert(name = name, lens = Interpreter . Value , defaultValue = defaultValue) { it: DataFrameCallableId ->
40
+ ): ExpectedArgumentProvider <E > = argConvert(name = name, defaultValue = defaultValue) { it : DataFrameCallableId ->
42
41
val forName : Class <* > = Class .forName("${it.packageName}.${it.className}")
43
42
@Suppress(" UNCHECKED_CAST" )
44
43
java.lang.Enum .valueOf(forName as Class <out Enum <* >>, it.callableName) as E
45
44
}
46
45
47
46
fun <T > AbstractInterpreter <T >.columnAccessor(
48
47
name: ArgumentName ? = null
49
- ): ExpectedArgumentProvider <ColumnAccessorApproximation > = arg(name, lens = Interpreter . Value )
48
+ ): ExpectedArgumentProvider <ColumnAccessorApproximation > = arg(name)
50
49
51
50
fun <T > AbstractInterpreter <T >.dataColumn(
52
51
name: ArgumentName ? = null
53
- ): ExpectedArgumentProvider <SimpleCol > = arg(name, lens = Interpreter . Value )
52
+ ): ExpectedArgumentProvider <SimpleCol > = arg(name)
54
53
55
54
fun <T > AbstractInterpreter <T >.insertClause(
56
55
name: ArgumentName ? = null
57
- ): ExpectedArgumentProvider <InsertClauseApproximation > = arg(name, lens = Interpreter . Value )
56
+ ): ExpectedArgumentProvider <InsertClauseApproximation > = arg(name)
58
57
59
58
internal fun <T > AbstractInterpreter <T >.columnPath(
60
59
name: ArgumentName ? = null
61
- ): ExpectedArgumentProvider <ColumnPathApproximation > = arg(name, lens = Interpreter .Value )
62
60
63
61
internal fun <T > AbstractInterpreter <T >.columnWithPath(
64
62
name: ArgumentName ? = null
65
63
): ExpectedArgumentProvider <ColumnWithPathApproximation > = arg(name, lens = Interpreter .Value )
64
+ ): ExpectedArgumentProvider <ColumnPathApproximation > = arg(name)
66
65
67
66
fun <T > AbstractInterpreter <T >.kproperty(
68
67
name: ArgumentName ? = null
69
- ): ExpectedArgumentProvider <KPropertyApproximation > = arg(name, lens = Interpreter . Value )
68
+ ): ExpectedArgumentProvider <KPropertyApproximation > = arg(name)
70
69
71
70
internal fun <T > AbstractInterpreter <T >.string(
72
71
name: ArgumentName ? = null
73
72
): ExpectedArgumentProvider <String > =
74
- arg(name, lens = Interpreter . Value )
73
+ arg(name)
75
74
76
75
internal fun <T > AbstractInterpreter <T >.dsl(
77
76
name: ArgumentName ? = null
0 commit comments