You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/06/19 07:31:03 UTC
[groovy] branch GROOVY_3_0_X updated: update documentation to use
gender neutral pronouns where applicable (closes #1283)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 8741a9b update documentation to use gender neutral pronouns where applicable (closes #1283)
8741a9b is described below
commit 8741a9bb10614135e4118f70994592bc22bf63e6
Author: Jenn Strater <je...@gmail.com>
AuthorDate: Thu Jun 18 23:18:54 2020 -0500
update documentation to use gender neutral pronouns where applicable (closes #1283)
and fix some typos along the way
---
.../runtime/metaclass/MetaClassRegistryImpl.java | 2 +-
.../v8/IndyGuardsFiltersAndSignatures.java | 2 +-
src/spec/doc/core-closures.adoc | 2 +-
src/spec/doc/type-checking-extensions.adoc | 2 +-
src/test/groovy/GStringTest.groovy | 24 +++++++++++-----------
.../groovy/groovysh/AllCompletersTest.groovy | 2 +-
.../main/java/groovy/json/StringEscapeUtils.java | 8 ++++----
.../groovy/groovy/json/JsonSlurperLaxTest.groovy | 4 ++--
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
index 791323d..a35640b 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
@@ -264,7 +264,7 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
/**
* if oldMc is null, newMc will replace whatever meta class was used before.
- * if oldMc is not null, then newMc will be used only if he stored mc is
+ * if oldMc is not null, then newMc will be used only if the stored mc is
* the same as oldMc
*/
private void setMetaClass(Class theClass, MetaClass oldMc, MetaClass newMc) {
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java
index 3daf152..ffdcc62 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/IndyGuardsFiltersAndSignatures.java
@@ -124,7 +124,7 @@ public class IndyGuardsFiltersAndSignatures {
protected static final MethodHandle NULL_REF = MethodHandles.constant(Object.class, null);
/**
- * This method is called by he handle to realize the bean constructor
+ * This method is called by the handle to realize the bean constructor
* with property map.
*/
public static Object setBeanProperties(MetaClass mc, Object bean, Map properties) {
diff --git a/src/spec/doc/core-closures.adoc b/src/spec/doc/core-closures.adoc
index 8624b9b..9ea914e 100644
--- a/src/spec/doc/core-closures.adoc
+++ b/src/spec/doc/core-closures.adoc
@@ -428,7 +428,7 @@ include::{projectdir}/src/spec/test/ClosuresSpecTest.groovy[tags=gstring_mutatio
<6> so when we evaluate the string, it returns _Sam_
<7> if we change `p` to _Lucy_
<8> the string still evaluates to _Sam_ because it was the *value* of `p` when the `GString` was created
-<9> so if we mutate _Sam_ to change his name to _Lucy_
+<9> so if we mutate _Sam_ to change the name to _Lucy_
<10> this time the `GString` is correctly mutated
So if you don't want to rely on mutating objects or wrapping objects, you *must* use closures in `GString` by explicitly
diff --git a/src/spec/doc/type-checking-extensions.adoc b/src/spec/doc/type-checking-extensions.adoc
index fc91911..8c281f2 100644
--- a/src/spec/doc/type-checking-extensions.adoc
+++ b/src/spec/doc/type-checking-extensions.adoc
@@ -60,7 +60,7 @@ before running the script (adding imports, applying AST transforms,
extending a base script,…). Often, user written scripts come to
production without testing because the DSL logic comes to a point
where *any* user may write code using the DSL syntax. In the end, a user
-may just ignore that what he writes is actually *code*. This adds some
+may just ignore that what they write is actually *code*. This adds some
challenges for the DSL implementer, such as securing execution of user
code or, in this case, early reporting of errors.
diff --git a/src/test/groovy/GStringTest.groovy b/src/test/groovy/GStringTest.groovy
index d334db9..90fb455 100644
--- a/src/test/groovy/GStringTest.groovy
+++ b/src/test/groovy/GStringTest.groovy
@@ -99,18 +99,18 @@ class GStringTest extends GroovyTestCase {
check(/$name\?/, "Bob\\?")
check(/$name$/, "Bob\$")
- def guy = [name: name]
- check("${guy.name}", "Bob")
- check("$guy.name", "Bob")
- check("$guy.name.", "Bob.")
- check("$guy.name...", "Bob...")
- check("$guy.name?", "Bob?")
- check(/$guy.name/, "Bob")
- check(/$guy.name./, "Bob.")
- check(/$guy.name.../, "Bob...")
- check(/$guy.name?/, "Bob?")
- check(/$guy.name\?/, "Bob\\?")
- check(/$guy.name$/, "Bob\$")
+ def person = [name: name]
+ check("${person.name}", "Bob")
+ check("$person.name", "Bob")
+ check("$person.name.", "Bob.")
+ check("$person.name...", "Bob...")
+ check("$person.name?", "Bob?")
+ check(/$person.name/, "Bob")
+ check(/$person.name./, "Bob.")
+ check(/$person.name.../, "Bob...")
+ check(/$person.name?/, "Bob?")
+ check(/$person.name\?/, "Bob\\?")
+ check(/$person.name$/, "Bob\$")
}
void testWithTwoVariables() {
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AllCompletersTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AllCompletersTest.groovy
index 4533712..1482906 100644
--- a/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AllCompletersTest.groovy
+++ b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AllCompletersTest.groovy
@@ -45,7 +45,7 @@ class AllCompletersTest extends GroovyTestCase {
* code copied from Jline console Handler,
* need this logic to ensure completers are combined in the right way
* The Jline contract is that completers are tried in sequence, and as
- * soon as one returns something else than -1, his canidates are used and following
+ * soon as one returns something other than -1, the candidates are used and the following
* completers ignored.
*
*/
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java b/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java
index 059c5a1..a73efa6 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java
@@ -74,8 +74,8 @@ public class StringEscapeUtils {
* <p>
* Example:
* <pre>
- * input string: He didn't say, "Stop!"
- * output string: He didn't say, \"Stop!\"
+ * input string: They didn't say, "Stop!"
+ * output string: They didn't say, \"Stop!\"
* </pre>
*
* @param str String to escape values in, may be null
@@ -114,8 +114,8 @@ public class StringEscapeUtils {
* <p>
* Example:
* <pre>
- * input string: He didn't say, "Stop!"
- * output string: He didn\'t say, \"Stop!\"
+ * input string: They didn't say, "Stop!"
+ * output string: They didn\'t say, \"Stop!\"
* </pre>
*
* @param str String to escape values in, may be null
diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy
index 2a11c6a..8316e7d 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy
@@ -95,7 +95,7 @@ class JsonSlurperLaxTest extends JsonSlurperTest {
flag : true,
flag2 : false,
strings : [we, are, string, here, us, roar],
- he said : '"fire all your guns at once baby, and explode into the night"',
+ they said : '"fire all your guns at once baby, and explode into the night"',
"going deeper" : [
"nestedArrays", // needs comments
"anotherThing" // commented
@@ -116,7 +116,7 @@ class JsonSlurperLaxTest extends JsonSlurperTest {
assert map.flag == true
assert map.flag2 == false
assert map.strings == ["we", "are", "string", "here", "us", "roar"]
- assert map["he said"] == '"fire all your guns at once baby, and explode into the night"'
+ assert map["they said"] == '"fire all your guns at once baby, and explode into the night"'
assert map.the == "end"
}