Skip to content

Commit 269f1eb

Browse files
thomasp85thomasp85
committed
Use list2
1 parent 65d8db5 commit 269f1eb

24 files changed

+66
-66
lines changed

‎R/arc.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ stat_arc <- function(mapping = NULL, data = NULL, geom = 'arc',
108108
layer(
109109
stat = StatArc, data = data, mapping = mapping, geom = geom,
110110
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
111-
params = list(na.rm = na.rm, n = n, ...)
111+
params = list2(na.rm = na.rm, n = n, ...)
112112
)
113113
}
114114
#' @rdname ggforce-extensions
@@ -126,7 +126,7 @@ geom_arc <- function(mapping = NULL, data = NULL, stat = 'arc',
126126
layer(
127127
data = data, mapping = mapping, stat = stat, geom = GeomArc,
128128
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
129-
params = list(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
129+
params = list2(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
130130
)
131131
}
132132
#' @rdname ggforce-extensions
@@ -148,7 +148,7 @@ stat_arc2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate',
148148
layer(
149149
stat = StatArc2, data = data, mapping = mapping, geom = geom,
150150
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
151-
params = list(na.rm = na.rm, n = n, ...)
151+
params = list2(na.rm = na.rm, n = n, ...)
152152
)
153153
}
154154
#' @rdname geom_arc
@@ -160,7 +160,7 @@ geom_arc2 <- function(mapping = NULL, data = NULL, stat = 'arc2',
160160
layer(
161161
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
162162
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
163-
params = list(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
163+
params = list2(arrow = arrow, n = n, lineend = lineend, na.rm = na.rm, ...)
164164
)
165165
}
166166
#' @rdname ggforce-extensions
@@ -189,7 +189,7 @@ stat_arc0 <- function(mapping = NULL, data = NULL, geom = 'arc0',
189189
layer(
190190
stat = StatArc0, data = data, mapping = mapping, geom = geom,
191191
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
192-
params = list(na.rm = na.rm, ...)
192+
params = list2(na.rm = na.rm, ...)
193193
)
194194
}
195195
#' @rdname ggforce-extensions
@@ -235,7 +235,7 @@ geom_arc0 <- function(mapping = NULL, data = NULL, stat = 'arc0',
235235
layer(
236236
data = data, mapping = mapping, stat = stat, geom = GeomArc0,
237237
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
238-
params = list(
238+
params = list2(
239239
arrow = arrow, ncp = ncp, lineend = lineend, na.rm = na.rm,
240240
...
241241
)

‎R/arc_bar.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ stat_arc_bar <- function(mapping = NULL, data = NULL, geom = 'arc_bar',
121121
layer(
122122
stat = StatArcBar, data = data, mapping = mapping, geom = geom,
123123
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
124-
params = list(na.rm = na.rm, n = n, ...)
124+
params = list2(na.rm = na.rm, n = n, ...)
125125
)
126126
}
127127
#' @rdname ggforce-extensions
@@ -160,7 +160,7 @@ stat_pie <- function(mapping = NULL, data = NULL, geom = 'arc_bar',
160160
layer(
161161
stat = StatPie, data = data, mapping = mapping, geom = geom,
162162
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
163-
params = list(na.rm = na.rm, n = n, sep = sep, ...)
163+
params = list2(na.rm = na.rm, n = n, sep = sep, ...)
164164
)
165165
}
166166
#' @rdname ggforce-extensions
@@ -180,7 +180,7 @@ geom_arc_bar <- function(mapping = NULL, data = NULL, stat = 'arc_bar',
180180
layer(
181181
data = data, mapping = mapping, stat = stat, geom = GeomArcBar,
182182
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
183-
params = list(na.rm = na.rm, n = n, expand = expand, radius = radius, ...)
183+
params = list2(na.rm = na.rm, n = n, expand = expand, radius = radius, ...)
184184
)
185185
}
186186

‎R/autodensity.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ geom_autodensity <- function(mapping = NULL, data = NULL,
2727
position = position,
2828
show.legend = show.legend,
2929
inherit.aes = inherit.aes,
30-
params = list(
30+
params = list2(
3131
bw = bw,
3232
adjust = adjust,
3333
kernel = kernel,

‎R/autohistogram.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ geom_autohistogram <- function(mapping = NULL, data = NULL,
4949
position = position,
5050
show.legend = show.legend,
5151
inherit.aes = inherit.aes,
52-
params = list(
52+
params = list2(
5353
bins = bins,
5454
na.rm = na.rm,
5555
...

‎R/autopoint.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ geom_autopoint <- function(mapping = NULL, data = NULL,
4545
position = position,
4646
show.legend = show.legend,
4747
inherit.aes = inherit.aes,
48-
params = list(
48+
params = list2(
4949
na.rm = na.rm,
5050
...
5151
)

‎R/bezier.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ stat_bezier <- function(mapping = NULL, data = NULL, geom = 'path',
131131
layer(
132132
stat = StatBezier, data = data, mapping = mapping, geom = geom,
133133
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
134-
params = list(na.rm = na.rm, n = n, ...)
134+
params = list2(na.rm = na.rm, n = n, ...)
135135
)
136136
}
137137
#' @rdname geom_bezier
@@ -143,7 +143,7 @@ geom_bezier <- function(mapping = NULL, data = NULL, stat = 'bezier',
143143
layer(
144144
data = data, mapping = mapping, stat = stat, geom = GeomPath,
145145
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
146-
params = list(
146+
params = list2(
147147
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
148148
...
149149
)
@@ -201,7 +201,7 @@ stat_bezier2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate',
201201
layer(
202202
stat = StatBezier2, data = data, mapping = mapping, geom = geom,
203203
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
204-
params = list(na.rm = na.rm, n = n, ...)
204+
params = list2(na.rm = na.rm, n = n, ...)
205205
)
206206
}
207207
#' @rdname geom_bezier
@@ -213,7 +213,7 @@ geom_bezier2 <- function(mapping = NULL, data = NULL, stat = 'bezier2',
213213
layer(
214214
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
215215
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
216-
params = list(
216+
params = list2(
217217
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
218218
...
219219
)
@@ -280,7 +280,7 @@ stat_bezier0 <- function(mapping = NULL, data = NULL, geom = 'bezier0',
280280
layer(
281281
stat = StatBezier0, data = data, mapping = mapping, geom = geom,
282282
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
283-
params = list(na.rm = na.rm, ...)
283+
params = list2(na.rm = na.rm, ...)
284284
)
285285
}
286286
#' @rdname geom_bezier
@@ -292,6 +292,6 @@ geom_bezier0 <- function(mapping = NULL, data = NULL, stat = 'bezier0',
292292
layer(
293293
data = data, mapping = mapping, stat = stat, geom = GeomBezier0,
294294
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
295-
params = list(arrow = arrow, lineend = lineend, na.rm = na.rm, ...)
295+
params = list2(arrow = arrow, lineend = lineend, na.rm = na.rm, ...)
296296
)
297297
}

‎R/bspline.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ stat_bspline <- function(mapping = NULL, data = NULL, geom = 'path',
125125
layer(
126126
stat = StatBspline, data = data, mapping = mapping, geom = geom,
127127
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
128-
params = list(na.rm = na.rm, n = n, type = type, ...)
128+
params = list2(na.rm = na.rm, n = n, type = type, ...)
129129
)
130130
}
131131
#' @rdname geom_bspline
@@ -137,7 +137,7 @@ geom_bspline <- function(mapping = NULL, data = NULL, stat = 'bspline',
137137
layer(
138138
data = data, mapping = mapping, stat = stat, geom = GeomPath,
139139
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
140-
params = list(
140+
params = list2(
141141
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
142142
type = type, ...
143143
)
@@ -190,7 +190,7 @@ stat_bspline2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate'
190190
layer(
191191
stat = StatBspline2, data = data, mapping = mapping, geom = geom,
192192
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
193-
params = list(na.rm = na.rm, n = n, type = type, ...)
193+
params = list2(na.rm = na.rm, n = n, type = type, ...)
194194
)
195195
}
196196
#' @rdname geom_bspline
@@ -202,7 +202,7 @@ geom_bspline2 <- function(mapping = NULL, data = NULL, stat = 'bspline2',
202202
layer(
203203
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
204204
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
205-
params = list(
205+
params = list2(
206206
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
207207
type = type, ...
208208
)
@@ -242,7 +242,7 @@ stat_bspline0 <- function(mapping = NULL, data = NULL, geom = 'bspline0',
242242
layer(
243243
stat = StatIdentity, data = data, mapping = mapping, geom = geom,
244244
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
245-
params = list(na.rm = na.rm, type = type, ...)
245+
params = list2(na.rm = na.rm, type = type, ...)
246246
)
247247
}
248248
#' @rdname geom_bspline
@@ -254,7 +254,7 @@ geom_bspline0 <- function(mapping = NULL, data = NULL, stat = 'identity',
254254
layer(
255255
data = data, mapping = mapping, stat = stat, geom = GeomBspline0,
256256
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
257-
params = list(
257+
params = list2(
258258
arrow = arrow, lineend = lineend, na.rm = na.rm, type = type,
259259
...
260260
)

‎R/bspline_closed.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ stat_bspline_closed <- function(mapping = NULL, data = NULL, geom = 'shape',
7171
layer(
7272
stat = StatBspline, data = data, mapping = mapping, geom = geom,
7373
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
74-
params = list(na.rm = na.rm, n = n, ...)
74+
params = list2(na.rm = na.rm, n = n, ...)
7575
)
7676
}
7777
#' @rdname geom_bspline_closed
@@ -82,7 +82,7 @@ geom_bspline_closed <- function(mapping = NULL, data = NULL, stat = 'bspline',
8282
layer(
8383
data = data, mapping = mapping, stat = stat, geom = GeomShape,
8484
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
85-
params = list(na.rm = na.rm, n = n, type = 'closed', ...)
85+
params = list2(na.rm = na.rm, n = n, type = 'closed', ...)
8686
)
8787
}
8888
#' @rdname ggforce-extensions
@@ -118,6 +118,6 @@ geom_bspline_closed0 <- function(mapping = NULL, data = NULL, stat = 'identity',
118118
layer(
119119
data = data, mapping = mapping, stat = stat, geom = GeomBsplineClosed0,
120120
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
121-
params = list(na.rm = na.rm, ...)
121+
params = list2(na.rm = na.rm, ...)
122122
)
123123
}

‎R/circle.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ stat_circle <- function(mapping = NULL, data = NULL, geom = 'circle',
8787
layer(
8888
stat = StatCircle, data = data, mapping = mapping, geom = geom,
8989
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
90-
params = list(na.rm = na.rm, n = n, ...)
90+
params = list2(na.rm = na.rm, n = n, ...)
9191
)
9292
}
9393
#' @rdname ggforce-extensions
@@ -107,6 +107,6 @@ geom_circle <- function(mapping = NULL, data = NULL, stat = 'circle',
107107
layer(
108108
data = data, mapping = mapping, stat = stat, geom = GeomCircle,
109109
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
110-
params = list(n = n, na.rm = na.rm, ...)
110+
params = list2(n = n, na.rm = na.rm, ...)
111111
)
112112
}

‎R/diagonal.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ stat_diagonal <- function(mapping = NULL, data = NULL, geom = 'path',
130130
layer(
131131
stat = StatDiagonal, data = data, mapping = mapping, geom = geom,
132132
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
133-
params = list(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
133+
params = list2(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
134134
)
135135
}
136136
#' @rdname geom_diagonal
@@ -142,7 +142,7 @@ geom_diagonal <- function(mapping = NULL, data = NULL, stat = 'diagonal',
142142
layer(
143143
data = data, mapping = mapping, stat = stat, geom = GeomPath,
144144
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
145-
params = list(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
145+
params = list2(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
146146
)
147147
}
148148
#' @rdname ggforce-extensions
@@ -178,7 +178,7 @@ stat_diagonal2 <- function(mapping = NULL, data = NULL,
178178
layer(
179179
stat = StatDiagonal2, data = data, mapping = mapping, geom = geom,
180180
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
181-
params = list(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
181+
params = list2(na.rm = na.rm, orientation = orientation, n = n, strength = strength, ...)
182182
)
183183
}
184184
#' @rdname geom_diagonal
@@ -190,7 +190,7 @@ geom_diagonal2 <- function(mapping = NULL, data = NULL, stat = 'diagonal2',
190190
layer(
191191
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
192192
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
193-
params = list(
193+
params = list2(
194194
arrow = arrow, lineend = lineend, na.rm = na.rm, orientation = orientation,
195195
n = n, strength = strength, ...
196196
)
@@ -236,7 +236,7 @@ stat_diagonal0 <- function(mapping = NULL, data = NULL, geom = 'bezier0',
236236
layer(
237237
stat = StatDiagonal0, data = data, mapping = mapping, geom = geom,
238238
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
239-
params = list(na.rm = na.rm, orientation = orientation, strength = strength, ...)
239+
params = list2(na.rm = na.rm, orientation = orientation, strength = strength, ...)
240240
)
241241
}
242242
#' @rdname geom_diagonal
@@ -248,7 +248,7 @@ geom_diagonal0 <- function(mapping = NULL, data = NULL, stat = 'diagonal0',
248248
layer(
249249
data = data, mapping = mapping, stat = stat, geom = GeomBezier0,
250250
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
251-
params = list(
251+
params = list2(
252252
arrow = arrow, lineend = lineend, na.rm = na.rm, orientation = orientation,
253253
strength = strength, ...
254254
)

‎R/diagonal_wide.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ stat_diagonal_wide <- function(mapping = NULL, data = NULL, geom = 'shape',
9696
layer(
9797
stat = StatDiagonalWide, data = data, mapping = mapping, geom = geom,
9898
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
99-
params = list(na.rm = na.rm, orientation = orientation, n = n,
99+
params = list2(na.rm = na.rm, orientation = orientation, n = n,
100100
strength = strength, ...)
101101
)
102102
}
@@ -109,7 +109,7 @@ geom_diagonal_wide <- function(mapping = NULL, data = NULL, stat = 'diagonal_wid
109109
layer(
110110
data = data, mapping = mapping, stat = stat, geom = GeomShape,
111111
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
112-
params = list(na.rm = na.rm, orientation = orientation, n = n,
112+
params = list2(na.rm = na.rm, orientation = orientation, n = n,
113113
strength = strength, ...)
114114
)
115115
}

‎R/ellipse.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ stat_ellip <- function(mapping = NULL, data = NULL, geom = 'circle',
9494
layer(
9595
stat = StatEllip, data = data, mapping = mapping, geom = geom,
9696
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
97-
params = list(na.rm = na.rm, n = n, ...)
97+
params = list2(na.rm = na.rm, n = n, ...)
9898
)
9999
}
100100

@@ -106,6 +106,6 @@ geom_ellipse <- function(mapping = NULL, data = NULL, stat = 'ellip',
106106
layer(
107107
data = data, mapping = mapping, stat = stat, geom = GeomCircle,
108108
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
109-
params = list(n = n, na.rm = na.rm, ...)
109+
params = list2(n = n, na.rm = na.rm, ...)
110110
)
111111
}

‎R/errorbar.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ stat_err <- function(
6767
layer(
6868
stat = StatErr, data = data, mapping = mapping, geom = geom,
6969
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
70-
params = list(na.rm = na.rm, ...)
70+
params = list2(na.rm = na.rm, ...)
7171
)
7272
}

‎R/link.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ stat_link <- function(mapping = NULL, data = NULL, geom = 'path',
107107
layer(
108108
stat = StatLink, data = data, mapping = mapping, geom = geom,
109109
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
110-
params = list(na.rm = na.rm, n = n, ...)
110+
params = list2(na.rm = na.rm, n = n, ...)
111111
)
112112
}
113113
#' @rdname ggforce-extensions
@@ -150,7 +150,7 @@ stat_link2 <- function(mapping = NULL, data = NULL, geom = 'path_interpolate',
150150
layer(
151151
stat = StatLink2, data = data, mapping = mapping, geom = geom,
152152
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
153-
params = list(na.rm = na.rm, n = n, ...)
153+
params = list2(na.rm = na.rm, n = n, ...)
154154
)
155155
}
156156
#' @rdname geom_link
@@ -162,7 +162,7 @@ geom_link <- function(mapping = NULL, data = NULL, stat = 'link',
162162
layer(
163163
data = data, mapping = mapping, stat = stat, geom = GeomPath,
164164
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
165-
params = list(
165+
params = list2(
166166
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
167167
...
168168
)
@@ -177,7 +177,7 @@ geom_link2 <- function(mapping = NULL, data = NULL, stat = 'link2',
177177
layer(
178178
data = data, mapping = mapping, stat = stat, geom = GeomPathInterpolate,
179179
position = position, show.legend = show.legend, inherit.aes = inherit.aes,
180-
params = list(
180+
params = list2(
181181
arrow = arrow, lineend = lineend, na.rm = na.rm, n = n,
182182
...
183183
)

‎R/mark_circle.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ geom_mark_circle <- function(mapping = NULL, data = NULL, stat = 'identity',
290290
position = position,
291291
show.legend = show.legend,
292292
inherit.aes = inherit.aes,
293-
params = list(
293+
params = list2(
294294
na.rm = na.rm,
295295
expand = expand,
296296
radius = radius,

0 commit comments

Comments
 (0)