This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 6f2460f fix typos mostly in comments
6f2460f is described below
commit 6f2460f0e4f231d1952b514f6467f5fe5563ee98
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Mar 18 09:30:47 2019 +1000
fix typos mostly in comments
---
.../antlr2/org/codehaus/groovy/antlr/java/java.g | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/antlr2/org/codehaus/groovy/antlr/java/java.g
b/src/main/antlr2/org/codehaus/groovy/antlr/java/java.g
index 96046a5..cfa2607 100644
--- a/src/main/antlr2/org/codehaus/groovy/antlr/java/java.g
+++ b/src/main/antlr2/org/codehaus/groovy/antlr/java/java.g
@@ -129,7 +129,7 @@ import antlr.LexerSharedInputState;
* Note that the grammar is stricter now; e.g., this(...) must
* be the first statement.
*
- * Trinary ?: operator wasn't working as array name:
+ * Ternary ?: operator wasn't working as array name:
* (isBig ? bigDigits : digits)[i];
*
* Checked parser/tree parser on source for
@@ -148,7 +148,7 @@ import antlr.LexerSharedInputState;
* Changes by Matt Quail to support generics (as per JDK1.5/JSR14)
* Notes:
* o We only allow the "extends" keyword and not the "implements"
- * keyword, since thats what JSR14 seems to imply.
+ * keyword, since that's what JSR14 seems to imply.
* o Thanks to Monty Zukowski for his help on the antlr-interest
* mail list.
* o Thanks to Alan Eliasen for testing the grammar over his
@@ -185,7 +185,7 @@ import antlr.LexerSharedInputState;
* Bug fixes as identified by Michael Stahl; clean up of tabs/spaces
* and other refactorings
* o Fixed typeParameters omission in identPrimary and newStatement
- * o Replaced GT reconcilliation code with simple semantic predicate
+ * o Replaced GT reconciliation code with simple semantic predicate
* o Adapted enum/assert keyword checking support from Michael Stahl's
java15 grammar
* o Refactored typeDefinition production and field productions to
reduce duplication
*
@@ -565,10 +565,10 @@ annotations {Token first = LT(1);}
;
annotationArguments
- : annotationMemberValueInitializer | anntotationMemberValuePairs
+ : annotationMemberValueInitializer | annotationMemberValuePairs
;
-anntotationMemberValuePairs
+annotationMemberValuePairs
: annotationMemberValuePair ( COMMA! annotationMemberValuePair )*
;
@@ -617,7 +617,7 @@ superClassClause! {Token first = LT(1);}
// Definition of a Java class
classDefinition![AST modifiers] {Token first = LT(1);}
: "class" IDENT
- // it _might_ have type paramaters
+ // it _might_ have type parameters
(tp:typeParameters)?
// it _might_ have a superclass...
sc:superClassClause
@@ -632,7 +632,7 @@ classDefinition![AST modifiers] {Token first = LT(1);}
// Definition of a Java Interface
interfaceDefinition![AST modifiers] {Token first = LT(1);}
: "interface" IDENT
- // it _might_ have type paramaters
+ // it _might_ have type parameters
(tp:typeParameters)?
// it might extend some other interfaces
ie:interfaceExtends
@@ -774,7 +774,7 @@ enumConstantBlock
;
//An enum constant field is just like a class field but without
-//the posibility of a constructor definition or a static initializer
+//the possibility of a constructor definition or a static initializer
enumConstantField! {Token first = LT(1);}
: mods:modifiers
( td:typeDefinitionInternal[#mods]
@@ -1047,7 +1047,7 @@ variableLengthParameterDeclaration! {Token first =
LT(1);}
parameterModifier {Token first = LT(1);}
//final can appear amongst annotations in any order - greedily consume
any preceding
- //annotations to shut nond-eterminism warnings off
+ //annotations to shut non-determinism warnings off
: (options{greedy=true;} : annotation)* (f:"final")? (annotation)*
{#parameterModifier =
#(create(MODIFIERS,"MODIFIERS",first,LT(1)), #parameterModifier);}
;
@@ -1058,7 +1058,7 @@ parameterModifier {Token first = LT(1);}
// Inside a class definition without "static":
// it is an instance initializer
// As the body of a method
-// As a completely indepdent braced block of code inside a method
+// As a completely independent braced block of code inside a method
// it starts a new scope for variable definitions
compoundStatement
@@ -1084,7 +1084,7 @@ statement
// side-effects.
| expression SEMI!
- //TODO: what abour interfaces, enums and annotations
+ //TODO: what about interfaces, enums and annotations
// class definition
| m:modifiers! classDefinition[#m]
@@ -1282,12 +1282,12 @@ multicatch
//
// the last two are not usually on a precedence chart; I put them in
// to point out that new has a higher precedence than '.', so you
-// can validy use
+// can validly use
// new Frame().show()
//
// Note that the above precedence levels map to the rules below...
// Once you have a precedence chart, writing the appropriate rules as below
-// is usually very straightfoward
+// is usually very straightforward
@@ -1412,7 +1412,7 @@ unaryExpression
unaryExpressionNotPlusMinus
: BNOT^ unaryExpression
| LNOT^ unaryExpression
- | ( // subrule allows option to shut off warnings
+ | ( // sub-rule allows option to shut off warnings
options {
// "(int" ambig with postfixExpr due to lack of
sequence
// info in linear approximate LL(k). It's ok.
Shut up.
@@ -1516,7 +1516,7 @@ identPrimary
// off. See below. (The "false" predicate makes
it non-issue)
warnWhenFollowAmbig=false;
}
- // we have a new nondeterminism because of
+ // we have a new non-determinism because of
// typeArguments... only a syntactic predicate will
help...
// The problem is that this loop here conflicts with
// DOT typeArguments "super" in postfixExpression (k=2)
