Branch: refs/heads/master
Revision: 0a7b7f8
Author: bradcray
Log Message:
Merge pull request #16944 from bradcray/reword-call-actual-arg-errors
Reword ‘call actual argument’ in resolution error messages and quote types
[trivial, not reviewed]
While working on #16936, I found that I kept tripping over the phrase “call actual argument” in our error messages where, to me, the phrase “actual argument” seems clearer and no less precise. This PR changes that wording. For such resolution errors, I also added single quotes around types to better set them off from the English text of the error message (which is how things have generally evolved over time). Thus where an error might have previously said:
foo.chpl:7: note: because call actual argument #1 with type sync int(64)
this PR changes it to say:
foo.chpl:7: note: because actual argument #1 with type 'sync int(64)'
The PR does not make any attempt to more generally extend the practice of quoting types and code segments in error messages other than the ones generated by this specific code path.
Modified Files:
M compiler/resolution/ResolutionCandidate.cpp
M test/arrays/bradc/arrayOfArrayArg.bad
M test/arrays/diten/privatizedArrayErrorMessage.good
M test/arrays/diten/privatizedDomainErrorMessage.good
M test/arrays/marybeth/test_arrayops.good
M test/arrays/promotion/promotedArgToArrayFormal.bad
M test/arrays/views/initArrFieldWithSlice.bad
M test/classes/bradc/syncAsClass.good
M test/classes/deitz/inherit-class-record/inherit_mod1.good
M test/classes/deitz/inherit-class-record/inherit_mod2.good
M test/classes/deitz/inherit-class-record/inherit_mod3.good
M test/classes/delete-free/coercions-covariant-const-ref.good
M test/classes/delete-free/coercions-covariant-ref.good
M test/classes/delete-free/default-arg-typeless-error.good
M test/classes/delete-free/owned/owned-record-instantiation-types-user-init-owns-error.good
M test/classes/delete-free/owned/owned-ref-borrow-implicit.good
M test/classes/delete-free/undecorated-generic/no-coercion-management-type2g.good
M test/classes/diten/passSubClassByRef.good
M test/classes/diten/subclassMethodCall.bad
M test/classes/diten/typeMethodWrongReceiverType.good
M test/classes/ferguson/coerce-const-ref.good
M test/classes/ferguson/forwarding/d-except-error.good
M test/classes/ferguson/forwarding/d-only-as-error.good
M test/classes/ferguson/forwarding/d-only-error.good
M test/classes/generic/nestedGenericTypes.bad
M test/classes/initializers/compilerGenerated/arrayField-compInit.bad
M test/classes/initializers/generics/declarations/default_value_bad.good
M test/classes/initializers/phase1/dynamicThis/passToChildType.good
M test/classes/initializers/promotion/copyInitLookalike.good
M test/classes/initializers/records/generics/assignment/typeAliasError.good
M test/classes/initializers/records/generics/explicitAssignment.good
M test/classes/jplevyak/record_type_hierarchy-2.good
M test/classes/jplevyak/record_type_hierarchy-3-error.good
M test/classes/jplevyak/union_type_hierarchy-2.good
M test/classes/jplevyak/union_type_hierarchy-3-error.good
M test/classes/nilability/bang-array.bad
M test/classes/nilability/demo1.good
M test/classes/nilability/demo3.good
M test/classes/nilability/demo4.good
M test/classes/nilability/error-method-on-nilable-borrow.good
M test/classes/nilability/error-method-on-nilable-owned.good
M test/classes/nilability/error-method-on-nilable-shared.good
M test/classes/nilability/error-with-bang-suggestion.good
M test/classes/nilability/multiple-errors.1.good
M test/classes/nilability/multiple-errors.2.good
M test/classes/nilability/multiple-errors.good
M test/classes/vass/no-instance-for-arg-type.bad
M test/classes/vass/ref-like-intents/inout-subclass.good
M test/classes/vass/ref-like-intents/inout-superclass.good
M test/classes/vass/ref-like-intents/out-subclass.good
M test/classes/vass/ref-like-intents/out-superclass.good
M test/classes/vass/ref-like-intents/ref-subclass.good
M test/classes/vass/ref-like-intents/ref-superclass.good
M test/distributions/ferguson/dist-assoc-bulkadd.bad
M test/extern/ferguson/c-array/c-array-bad-coercion.good
M test/extern/fnPtrs/improveErrorForFcfMismatch.bad
M test/extern/fnPtrs/passBadFnsToCChapel-ChapelFcfToC.good
M test/extern/fnPtrs/sugarFcfTypes.bad
M test/extern/fnPtrs/sugarFcfTypes2.bad
M test/functions/bradc/defaultVals/defaultFnValCreatesGeneric.good
M test/functions/bradc/intUint3.good
M test/functions/bradc/paramFnNonParamArgs/paramExample2.good
M test/functions/bradc/queryClassArgGenerics-bad.good
M test/functions/bradc/resolution/badEnumDispatch.good
M test/functions/bradc/resolution/intChoicesDupTypes-errors.good
M test/functions/bradc/resolution/smallIntBoolTests/boolInt-testenum.good
M test/functions/bradc/resolution/smallIntBoolTests/boolToUint-testenum.good
M test/functions/bradc/resolution/smallIntBoolTests/paramNon-withenum.good
M test/functions/bradc/resolution/smallIntBoolTests/realBool.good
M test/functions/bradc/resolution/smallIntBoolTests/realBool2.good
M test/functions/bradc/staticMethods/staticCalledOnWrongType.good
M test/functions/deitz/test_bad_function.good
M test/functions/deitz/test_default_type.good
M test/functions/deitz/test_invalid_param_instantiate.good
M test/functions/deitz/test_overload_type_intent.good
M test/functions/deitz/test_write_type_error.good
M test/functions/diten/coerce_param_imag_to_real.bad
M test/functions/diten/coerce_param_imag_to_real.good
M test/functions/diten/refIntents.bad
M test/functions/diten/unresolvedCallBigParamString.good
M test/functions/ferguson/int32method-not64.good
M test/functions/generic/err-in-insn.good
M test/functions/generic/genericArgDotType2.good
M test/functions/generic/withExternType.bad
M test/functions/lydia/variadic-mix-type-var.bad
M test/functions/nspark/generic-varargs2.bad
M test/functions/promotion/theseShouldPromote.bad
M test/functions/promotion/theseShouldPromote3.bad
M test/functions/resolution/error-expected-param-missing-15928.good
M test/functions/resolution/error-expected-param-missing.good
M test/functions/resolution/error-expected-param-missing2.good
M test/functions/resolution/paramUintDispatchesToInt.bad
M test/functions/resolution/paramUintNoTypeInError.bad
M test/functions/typeMethods/error-message-when-not-applicable.good
M test/functions/varargs/typeToVarArgs.good
M test/functions/varargs/typeToVarArgs2.good
M test/functions/vass/out-intent-desired.bad
M test/functions/vass/subclass-to-ref-formal.good
M test/functions/whereClauses/whereClauseArgMismatch.good
M test/functions/whereClauses/whereClauseCantFold.good
M test/functions/whereClauses/whereClauseParamArgMismatch.good
M test/functions/whereClauses/whereClauseParamArgMismatch2.good
M test/functions/whereClauses/whereClauseParamArgMismatch3.good
M test/library/standard/LinkedLists/bradc/emptySeq3.good
M test/library/standard/Reflection/mix-type-val-args.bad
M test/modules/deitz/test_module_access4.good
M test/param/loop/localParamWithinLoopExpr.bad
M test/param/promoted.runParam.good
M test/param/promoted.runType.good
M test/trivial/deitz/coerce-assign/coerce_inout.good
M test/trivial/deitz/integers/integer_method3.good
M test/types/bool/resolution/resolveQueryTypeW.bad
M test/types/bytes/param/param-errors3.good
M test/types/bytes/param/param-errors4.good
M test/types/enum/bradc/dispatch/dispatchenums.good
M test/types/enum/bradc/dispatch/enumarray.good
M test/types/enum/bradc/dispatch/enumdispatch.good
M test/types/enum/bradc/dispatch/simpletest.good
M test/types/enum/enumsLikeParams2.good
M test/types/integral/int-coerce-arg.good
M test/types/integral/int-coerce-var.good
M test/types/partial/match-param.bad
M test/types/partial/partialTypeFormal.error.good
M test/types/records/ferguson/init-eq-other-only.good
M test/types/records/generic/partial-instantiation-equivalence.bad
M test/types/records/init/copy/initEqualsErrorMessage.good
M test/types/records/init/generic/mismatch.good
M test/types/records/init/generic/mismatch2.good
M test/types/records/split-init/incompatible-type1.good
M test/types/scalar/bradc/uint64FnInt.good
M test/types/string/param-coercions.good
M test/types/sync/vass/ref-sync-3.good
M test/types/sync/vass/ref-sync-4.good
M test/types/sync/vass/ref-sync-5-blank.good
M test/types/sync/vass/ref-sync-5-ref.good
M test/types/sync/vass/ref-sync-6-blank.good
M test/types/sync/vass/ref-sync-6-ref.good
M test/types/tuple/deitz/tupleArguments/test_param_tuple_arg1-error.good
M test/types/tuple/lydia/mix-type-and-var.bad
M test/types/type_variables/deitz/part7/test_error1.good
M test/users/ferguson/aa/class-ref-one.good
M test/users/ferguson/recordassignstring.good
M test/users/kreider/bug_array_of_arrays.bad
M test/users/thom/arrArgBlank-promote.bad
M test/users/thom/arrArgConst-promote.bad
M test/users/thom/arrArgRef-promote.bad
M test/users/thom/passStrRngToNonstrRng.bad
M test/visibility/private/functions/privateOperatorError.good
M test/visibility/private/functions/privateOperatorError2.good
Compare: Comparing 4705cf36462e...0a7b7f85851b · chapel-lang/chapel · GitHub