Skip to content

Commit

Permalink
Remove var/s from proc signatures (#252)
Browse files Browse the repository at this point in the history
* Set up SpacemanDMM settings

* Remove vars from procs
  • Loading branch information
martinlyra authored Oct 22, 2023
1 parent 7c13554 commit 130d7d6
Show file tree
Hide file tree
Showing 1,467 changed files with 6,328 additions and 6,308 deletions.
2 changes: 1 addition & 1 deletion SpacemanDMM.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ final_no_effect = "unset"
as_local_var = "unset"

# Raised by Parser
var_in_proc_parameter = "unset"
var_in_proc_parameter = "error"

# Raised by PreProcessor
duplicate_include = "unset"
Expand Down
2 changes: 1 addition & 1 deletion code/_global_vars/lists/flavor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(music_tracks, list(
"Wake" = /music_track/wake,
))

/proc/setup_music_tracks(var/list/tracks)
/proc/setup_music_tracks(list/tracks)
. = list()
var/track_list = LAZY_LENGTH(tracks) ? tracks : GLOB.music_tracks
for(var/track_name in track_list)
Expand Down
36 changes: 18 additions & 18 deletions code/_helpers/areas.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
List generation helpers
*/
/proc/get_filtered_areas(var/list/predicates = list(GLOBAL_PROC_REF(is_area_with_turf)))
/proc/get_filtered_areas(list/predicates = list(GLOBAL_PROC_REF(is_area_with_turf)))
. = list()
if(!predicates)
return
Expand All @@ -11,7 +11,7 @@
if(all_predicates_true(list(A), predicates))
. += A

/proc/get_area_turfs(var/area/A, var/list/predicates)
/proc/get_area_turfs(area/A, list/predicates)
. = new/list()
A = istype(A) ? A : locate(A)
if(!A)
Expand All @@ -20,7 +20,7 @@
if(!predicates || all_predicates_true(list(T), predicates))
. += T

/proc/get_subarea_turfs(var/area/A, var/list/predicates)
/proc/get_subarea_turfs(area/A, list/predicates)
. = new/list()
A = istype(A) ? A.type : A
if(!A)
Expand All @@ -31,35 +31,35 @@
if(!predicates || all_predicates_true(list(T), predicates))
. += T

/proc/group_areas_by_name(var/list/predicates)
/proc/group_areas_by_name(list/predicates)
. = list()
for(var/area/A in get_filtered_areas(predicates))
group_by(., A.name, A)

/proc/group_areas_by_z_level(var/list/predicates)
/proc/group_areas_by_z_level(list/predicates)
. = list()
for(var/area/A in get_filtered_areas(predicates))
group_by(., num2text(A.z), A)

/*
Pick helpers
*/
/proc/pick_subarea_turf(var/areatype, var/list/predicates)
/proc/pick_subarea_turf(areatype, list/predicates)
var/list/turfs = get_subarea_turfs(areatype, predicates)
if(turfs && turfs.len)
return pick(turfs)

/proc/pick_area_turf(var/areatype, var/list/predicates)
/proc/pick_area_turf(areatype, list/predicates)
var/list/turfs = get_area_turfs(areatype, predicates)
if(turfs && turfs.len)
return pick(turfs)

/proc/pick_area(var/list/predicates)
/proc/pick_area(list/predicates)
var/list/areas = get_filtered_areas(predicates)
if(areas && areas.len)
. = pick(areas)

/proc/pick_area_and_turf(var/list/area_predicates, var/list/turf_predicates)
/proc/pick_area_and_turf(list/area_predicates, list/turf_predicates)
var/area/A = pick_area(area_predicates)
if(!A)
return
Expand All @@ -68,31 +68,31 @@
/*
Predicate Helpers
*/
/proc/is_station_area(var/area/A)
/proc/is_station_area(area/A)
. = isStationLevel(A.z)

/proc/is_contact_area(var/area/A)
/proc/is_contact_area(area/A)
. = isContactLevel(A.z)

/proc/is_player_area(var/area/A)
/proc/is_player_area(area/A)
. = isPlayerLevel(A.z)

/proc/is_not_space_area(var/area/A)
/proc/is_not_space_area(area/A)
. = !istype(A,/area/space)

/proc/is_not_shuttle_area(var/area/A)
/proc/is_not_shuttle_area(area/A)
. = !istype(A,/area/shuttle)

/proc/is_area_with_turf(var/area/A)
/proc/is_area_with_turf(area/A)
. = isnum(A.x)

/proc/is_area_without_turf(var/area/A)
/proc/is_area_without_turf(area/A)
. = !is_area_with_turf(A)

/proc/is_maint_area(var/area/A)
/proc/is_maint_area(area/A)
. = istype(A,/area/maintenance)

/proc/is_coherent_area(var/area/A)
/proc/is_coherent_area(area/A)
return !is_type_in_list(A, GLOB.using_map.area_coherency_test_exempt_areas)

GLOBAL_LIST_INIT(is_station_but_not_space_or_shuttle_area, list(GLOBAL_PROC_REF(is_station_area), GLOBAL_PROC_REF(is_not_space_area), GLOBAL_PROC_REF(is_not_shuttle_area)))
Expand Down
6 changes: 3 additions & 3 deletions code/_helpers/atmospherics.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/proc/analyze_gases(var/obj/A, var/mob/user, advanced)
/obj/proc/analyze_gases(obj/A, mob/user, advanced)
user.visible_message("<span class='notice'>\The [user] has used \an [src] on \the [A].</span>")
A.add_fingerprint(user)

Expand All @@ -11,11 +11,11 @@
print_atmos_analysis(user, result)
return 1

/proc/print_atmos_analysis(user, var/list/result)
/proc/print_atmos_analysis(user, list/result)
for(var/line in result)
to_chat(user, "<span class='notice'>[line]</span>")

/proc/atmosanalyzer_scan(var/atom/target, var/datum/gas_mixture/mixture, advanced)
/proc/atmosanalyzer_scan(atom/target, datum/gas_mixture/mixture, advanced)
. = list()
. += "<span class='notice'>Results of the analysis of \the [target]:</span>"
if(!mixture)
Expand Down
2 changes: 1 addition & 1 deletion code/_helpers/atom_movables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
for(A, A && !istype(A, holder_type), A=A.loc);
return A

/atom/movable/proc/throw_at_random(var/include_own_turf, var/maxrange, var/speed)
/atom/movable/proc/throw_at_random(include_own_turf, maxrange, speed)
var/list/turfs = trange(maxrange, src)
if(!maxrange)
maxrange = 1
Expand Down
2 changes: 1 addition & 1 deletion code/_helpers/builtin_proc_callers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
You cannot call built-in BYOND methods directly using call()(), hence these helpers
*/

/proc/prob_call(var/probability)
/proc/prob_call(probability)
return prob(probability)
10 changes: 5 additions & 5 deletions code/_helpers/cmp.dm
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/proc/cmp_appearance_data(var/datum/appearance_data/a, var/datum/appearance_data/b)
/proc/cmp_appearance_data(datum/appearance_data/a, datum/appearance_data/b)
return b.priority - a.priority

/proc/cmp_camera_ctag_asc(var/obj/machinery/camera/a, var/obj/machinery/camera/b)
/proc/cmp_camera_ctag_asc(obj/machinery/camera/a, obj/machinery/camera/b)
return sorttext(b.c_tag, a.c_tag)

/proc/cmp_camera_ctag_dsc(var/obj/machinery/camera/a, var/obj/machinery/camera/b)
/proc/cmp_camera_ctag_dsc(obj/machinery/camera/a, obj/machinery/camera/b)
return sorttext(a.c_tag, b.c_tag)

/proc/cmp_crew_sensor_modifier(var/crew_sensor_modifier/a, var/crew_sensor_modifier/b)
/proc/cmp_crew_sensor_modifier(crew_sensor_modifier/a, crew_sensor_modifier/b)
return b.priority - a.priority

/proc/cmp_follow_holder(var/datum/follow_holder/a, var/datum/follow_holder/b)
/proc/cmp_follow_holder(datum/follow_holder/a, datum/follow_holder/b)
if(a.sort_order == b.sort_order)
return sorttext(b.get_name(), a.get_name())

Expand Down
4 changes: 2 additions & 2 deletions code/_helpers/datum_pool.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @args : datum type, normal arguments
* Example call: getFromPool(/datum/pipeline, args)
*/
/proc/getFromPool(var/type, ...)
/proc/getFromPool(type, ...)
var/list/B = (args - type)

if(length(masterdatumPool[type]) <= 0)
Expand Down Expand Up @@ -159,5 +159,5 @@
show_browser(usr, jointext(L,""),"window=poolingvariablelogs")

// Shim - this method doesn't natively exist in this implementation.
/proc/IsPooled(var/datum/D)
/proc/IsPooled(datum/D)
return "[D.type]" in masterdatumPool
20 changes: 10 additions & 10 deletions code/_helpers/functional.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/proc/all_predicates_true(var/list/input, var/list/predicates)
/proc/all_predicates_true(list/input, list/predicates)
predicates = istype(predicates) ? predicates : list(predicates)

for(var/i = 1 to predicates.len)
Expand All @@ -10,7 +10,7 @@
return FALSE
return TRUE

/proc/any_predicate_true(var/list/input, var/list/predicates)
/proc/any_predicate_true(list/input, list/predicates)
predicates = istype(predicates) ? predicates : list(predicates)
if(!predicates.len)
return TRUE
Expand All @@ -24,34 +24,34 @@
return TRUE
return FALSE

/proc/is_atom_predicate(var/value, var/feedback_receiver)
/proc/is_atom_predicate(value, feedback_receiver)
. = is_atom(value)
if(!. && feedback_receiver)
to_chat(feedback_receiver, "<span class='warning'>Value must be an atom.</span>")

/proc/is_num_predicate(var/value, var/feedback_receiver)
/proc/is_num_predicate(value, feedback_receiver)
. = isnum(value)
if(!. && feedback_receiver)
to_chat(feedback_receiver, "<span class='warning'>Value must be a numeral.</span>")

/proc/is_text_predicate(var/value, var/feedback_receiver)
/proc/is_text_predicate(value, feedback_receiver)
. = !value || istext(value)
if(!. && feedback_receiver)
to_chat(feedback_receiver, "<span class='warning'>Value must be a text.</span>")

/proc/is_dir_predicate(var/value, var/feedback_receiver)
/proc/is_dir_predicate(value, feedback_receiver)
. = (value in GLOB.alldirs)
if(!. && feedback_receiver)
to_chat(feedback_receiver, "<span class='warning'>Value must be a direction.</span>")

/proc/can_locate(var/atom/container, var/container_thing)
/proc/can_locate(atom/container, container_thing)
return (locate(container_thing) in container)

/proc/can_not_locate(var/atom/container, var/container_thing)
/proc/can_not_locate(atom/container, container_thing)
return !(locate(container_thing) in container) // We could just do !can_locate(container, container_thing) but BYOND is pretty awful when it comes to deep proc calls


/proc/where(var/list/list_to_filter, var/list/predicates, var/list/extra_predicate_input)
/proc/where(list/list_to_filter, list/predicates, list/extra_predicate_input)
. = list()
for(var/entry in list_to_filter)
var/predicate_input
Expand All @@ -63,7 +63,7 @@
if(all_predicates_true(predicate_input, predicates))
. += entry

/proc/map(var/list/list_to_map, var/map_proc)
/proc/map(list/list_to_map, map_proc)
. = list()
for(var/entry in list_to_map)
. += call(map_proc)(entry)
Loading

0 comments on commit 130d7d6

Please sign in to comment.